From e179d846f65ad2028960ebe5203c066a1e1fa530 Mon Sep 17 00:00:00 2001
From: Easy Build <easybuild@cn1.dgx>
Date: Thu, 19 Sep 2019 08:54:15 +0200
Subject: [PATCH] Thu, 19 Sep 2019 08:54:15 +0200

---
 dgx.csv        | 68 +++++++++++++++++++++++++-------------------------
 get_modules.sh | 11 +++++---
 phi.csv        | 48 +++++++++++++++++------------------
 3 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/dgx.csv b/dgx.csv
index c3c90b1d..3abcad4c 100644
--- a/dgx.csv
+++ b/dgx.csv
@@ -1,34 +1,34 @@
-Autoconf/2.69,5
-Automake/1.16.1,5
-Autotools/20180311,5
-binutils/2.27,5
-binutils/2.27-GCCcore-6.3.0,5
-Bison/3.0.4,5
-CMake/3.14.1,5
-EasyBuild/3.9.4,5
-flex/2.6.3,5
-GCC/6.3.0-2.27,5
-GCCcore/6.3.0,5
-Go/1.12.7,5
-help2man/1.47.4,5
-hwloc/1.11.7-GCC-6.3.0-2.27,5
-hwloc/2.0.3-GCC-6.3.0-2.27,5
-icc/2017.7.259-GCC-6.3.0-2.27,5
-iccifort/2017.7.259-GCC-6.3.0-2.27,5
-ifort/2017.7.259-GCC-6.3.0-2.27,5
-iimpi/2017c,5
-imkl/2017.4.239-iimpi-2017c,5
-impi/2017.4.239-iccifort-2017.7.259-GCC-6.3.0-2.27,5
-intel/2017c,5
-libtool/2.4.6,5
-libxml2/2.9.4,5
-M4/1.4.18,5
-ncurses/6.1,5
-numactl/2.0.11-GCCcore-6.3.0,5
-numactl/2.0.12-GCC-6.3.0-2.27,5
-OpenMPI/2.1.5-GCC-6.3.0-2.27,5
-OpenMPI/3.1.4-GCC-6.3.0-2.27,5
-OpenMPI/4.0.0-GCC-6.3.0-2.27,5
-Singularity/3.3.0,5
-squashfs-tools/4.3,5
-zlib/1.2.11,5
+Autoconf/2.69,16
+Automake/1.16.1,16
+Autotools/20180311,16
+binutils/2.27,16
+binutils/2.27-GCCcore-6.3.0,16
+Bison/3.0.4,16
+CMake/3.14.1,16
+EasyBuild/3.9.4,16
+flex/2.6.3,16
+GCC/6.3.0-2.27,16
+GCCcore/6.3.0,16
+Go/1.12.7,16
+help2man/1.47.4,16
+hwloc/1.11.7-GCC-6.3.0-2.27,16
+hwloc/2.0.3-GCC-6.3.0-2.27,16
+icc/2017.7.259-GCC-6.3.0-2.27,16
+iccifort/2017.7.259-GCC-6.3.0-2.27,16
+ifort/2017.7.259-GCC-6.3.0-2.27,16
+iimpi/2017c,16
+imkl/2017.4.239-iimpi-2017c,16
+impi/2017.4.239-iccifort-2017.7.259-GCC-6.3.0-2.27,16
+intel/2017c,16
+libtool/2.4.6,16
+libxml2/2.9.4,16
+M4/1.4.18,16
+ncurses/6.1,16
+numactl/2.0.11-GCCcore-6.3.0,16
+numactl/2.0.12-GCC-6.3.0-2.27,16
+OpenMPI/2.1.5-GCC-6.3.0-2.27,16
+OpenMPI/3.1.4-GCC-6.3.0-2.27,16
+OpenMPI/4.0.0-GCC-6.3.0-2.27,16
+Singularity/3.3.0,16
+squashfs-tools/4.3,16
+zlib/1.2.11,16
diff --git a/get_modules.sh b/get_modules.sh
index 1a13bd51..113612a2 100755
--- a/get_modules.sh
+++ b/get_modules.sh
@@ -48,12 +48,17 @@ elif [ "$CLUSTER" == "SALOMON" ]; then
 
     export MODULEPATH
 
-    ml --show-hidden -t av 2>&1 | awk '{print $1 ",4"}' | grep -v -e '/,\|:' | sort -u > "$FILENAME".csv
-    ./modules.py > "$FILENAME".md
+    if [ "$MODULEBASE" == "/appsuv/modules" ]; then
+       ml --show-hidden -t av 2>&1 | awk '{print $1 ",4"}' | grep -v -e '/,\|:' | sort -u > "$FILENAME".csv
+       ./modules.py > "$FILENAME".md
+    else
+       ml --show-hidden -t av 2>&1 | awk '{print $1 ",8"}' | grep -v -e '/,\|:' | sort -u > "$FILENAME".csv
+       ./modules.py > "$FILENAME".md
+    fi
 
   done
 elif [ "$CLUSTER" == "DGX" ]; then
-   ml --show-hidden -t av 2>&1 | awk '{print $1 ",5"}' | grep -v -e '/,\|:' | sort -u > dgx.csv
+   ml --show-hidden -t av 2>&1 | awk '{print $1 ",16"}' | grep -v -e '/,\|:' | sort -u > dgx.csv
   ./modules.py > dgx.md
 fi
 
diff --git a/phi.csv b/phi.csv
index eb4db540..b7af687c 100644
--- a/phi.csv
+++ b/phi.csv
@@ -1,24 +1,24 @@
-Bison/3.0.4,4
-bzip2/1.0.6,4
-cURL/7.53.1,4
-devel_environment/1.0,4
-expat/2.2.5,4
-flex/2.6.4,4
-gettext/0.19.8,4
-GMP/6.0.0,4
-HDF5/1.10.0-intel-2017b,4
-HDF5/1.10.0-patch1-intel-2017b-mic-parallel,4
-icc/2017.5.239-GCC-6.3.0-2.27,4
-iccifort/2017.5.239-GCC-6.3.0-2.27,4
-ifort/2017.5.239-GCC-6.3.0-2.27,4
-iimpi/2017b,4
-imkl/2017.4.239-iimpi-2017b,4
-impi/2017.4.239-iccifort-2017.5.239-GCC-6.3.0-2.27,4
-intel/2017b,4
-libreadline/7.0,4
-M4/1.4.18,4
-ncurses/6.0,4
-Octave/3.8.2,4
-OpenSSL/1.0.0a-intel-2017b,4
-Tcl/8.6.6,4
-zlib/1.2.11,4
+Bison/3.0.4,8
+bzip2/1.0.6,8
+cURL/7.53.1,8
+devel_environment/1.0,8
+expat/2.2.5,8
+flex/2.6.4,8
+gettext/0.19.8,8
+GMP/6.0.0,8
+HDF5/1.10.0-intel-2017b,8
+HDF5/1.10.0-patch1-intel-2017b-mic-parallel,8
+icc/2017.5.239-GCC-6.3.0-2.27,8
+iccifort/2017.5.239-GCC-6.3.0-2.27,8
+ifort/2017.5.239-GCC-6.3.0-2.27,8
+iimpi/2017b,8
+imkl/2017.4.239-iimpi-2017b,8
+impi/2017.4.239-iccifort-2017.5.239-GCC-6.3.0-2.27,8
+intel/2017b,8
+libreadline/7.0,8
+M4/1.4.18,8
+ncurses/6.0,8
+Octave/3.8.2,8
+OpenSSL/1.0.0a-intel-2017b,8
+Tcl/8.6.6,8
+zlib/1.2.11,8
-- 
GitLab