From 6abfb0bd11d2998e80bec60074ba47fb7f6ac638 Mon Sep 17 00:00:00 2001
From: Simon May <simon.may@mpa-garching.mpg.de>
Date: Mon, 30 Jan 2023 23:07:56 +0100
Subject: [PATCH] Fix module-exists.sh, update Intel modules
---
modules/intel.sh | 13 ++++---------
modules/module-exists.sh | 3 +--
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/modules/intel.sh b/modules/intel.sh
index 450658e..f4043d1 100644
--- a/modules/intel.sh
+++ b/modules/intel.sh
@@ -3,15 +3,10 @@
. ~/modules/module-exists.sh
module purge
-if module_exists intel/21.2.0; then
- # Raven
- module load intel/21.2.0
- module load impi/2021.2
-else
- # Freya, Cobra
- module load intel/19.1.3
- module load impi/2019.9
-fi
+
+module load intel/21.7.1
+module load impi/2021.7
+
. ~/modules/common.sh
# if running interactively: set MPI variables; else stop
diff --git a/modules/module-exists.sh b/modules/module-exists.sh
index 1d7534d..391d2ad 100644
--- a/modules/module-exists.sh
+++ b/modules/module-exists.sh
@@ -1,6 +1,5 @@
#!/bin/sh
module_exists() {
- avail=$(module avail "$1" 2>&1)
- [ -n "$avail" ]
+ module avail "$1" 2>&1 | grep -q "$1"
}
--
GitLab