From dcf8a53aaa29c9bdcc0b8d900d7952c42da85ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Mon, 20 Jul 2020 09:58:00 +0200
Subject: [PATCH] modified: install/CENTOS6LATEST modified:
install/CENTOS7LATEST modified: install/CENTOS7LATESTINTEL modified:
install/CONFIG modified: install/DEBIANLATEST modified:
install/FEDORALATEST modified: install/UBUNTU1804
---
install/CENTOS6LATEST | 31 ++++++++++++++++++++++++++-----
install/CENTOS7LATEST | 30 ++++++++++++++++++++++++++----
install/CENTOS7LATESTINTEL | 31 ++++++++++++++++++++++++++-----
install/CONFIG | 4 ++--
install/DEBIANLATEST | 31 ++++++++++++++++++++++++++-----
install/FEDORALATEST | 32 +++++++++++++++++++++++++++-----
install/UBUNTU1804 | 34 ++++++++++++++++++++++++++++------
7 files changed, 161 insertions(+), 32 deletions(-)
diff --git a/install/CENTOS6LATEST b/install/CENTOS6LATEST
index c542a18..7b3aa4f 100644
--- a/install/CENTOS6LATEST
+++ b/install/CENTOS6LATEST
@@ -53,8 +53,29 @@ mkdir /scratch
%environment
source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+ MODULEPATH=""
+
+ for dir in /apps/modules/*
+ do
+ # Exclude following directories
+ if [[ (${dir##*/} == "all") ]]; then
+ continue
+ fi
+ # In case that it's directory
+ if [ -d "$dir" ]; then
+ if [ -z "$MODULEPATH" ]; then
+ MODULEPATH="$dir"
+ else
+ MODULEPATH="$MODULEPATH:$dir"
+ fi
+ fi
+ done
+
+ # export
+ export MODULEPATH
+fi
+
+ml purge
diff --git a/install/CENTOS7LATEST b/install/CENTOS7LATEST
index 4769426..f828a27 100644
--- a/install/CENTOS7LATEST
+++ b/install/CENTOS7LATEST
@@ -62,7 +62,29 @@ mkdir /scratch
%environment
source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+ MODULEPATH=""
+
+ for dir in /apps/modules/*
+ do
+ # Exclude following directories
+ if [[ (${dir##*/} == "all") ]]; then
+ continue
+ fi
+ # In case that it's directory
+ if [ -d "$dir" ]; then
+ if [ -z "$MODULEPATH" ]; then
+ MODULEPATH="$dir"
+ else
+ MODULEPATH="$MODULEPATH:$dir"
+ fi
+ fi
+ done
+
+ # export
+ export MODULEPATH
+fi
+
+ml purge
diff --git a/install/CENTOS7LATESTINTEL b/install/CENTOS7LATESTINTEL
index 28aa6dd..ba20051 100644
--- a/install/CENTOS7LATESTINTEL
+++ b/install/CENTOS7LATESTINTEL
@@ -44,8 +44,29 @@ mkdir /scratch
%environment
source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+ MODULEPATH=""
+
+ for dir in /apps/modules/*
+ do
+ # Exclude following directories
+ if [[ (${dir##*/} == "all") ]]; then
+ continue
+ fi
+ # In case that it's directory
+ if [ -d "$dir" ]; then
+ if [ -z "$MODULEPATH" ]; then
+ MODULEPATH="$dir"
+ else
+ MODULEPATH="$MODULEPATH:$dir"
+ fi
+ fi
+ done
+
+ # export
+ export MODULEPATH
+fi
+
+ml purge
diff --git a/install/CONFIG b/install/CONFIG
index 932fedc..d48e556 100644
--- a/install/CONFIG
+++ b/install/CONFIG
@@ -1,6 +1,6 @@
-SINGULARITY_BIN_PATH=/apps/all/Singularity/3.5.2/bin
+SINGULARITY_BIN_PATH=/apps/all/Singularity/3.6.0/bin
IMAGE_PATH=/apps/all/OS
MODULEFILE_PATH=/apps/modules
USER_IMAGE=easybuild
EBROOTSQUASHFSMINTOOLS=/apps/all/squashfs-tools/4.3
-PATH=$PATH:/apps/all/Singularity/3.5.2/bin:/apps/all/squashfs-tools/4.3/bin
+PATH=$PATH:/apps/all/Singularity/3.6.0/bin:/apps/all/squashfs-tools/4.3/bin
diff --git a/install/DEBIANLATEST b/install/DEBIANLATEST
index ec39dd2..420f16b 100644
--- a/install/DEBIANLATEST
+++ b/install/DEBIANLATEST
@@ -50,8 +50,29 @@ mkdir /scratch
%environment
source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+ MODULEPATH=""
+
+ for dir in /apps/modules/*
+ do
+ # Exclude following directories
+ if [[ (${dir##*/} == "all") ]]; then
+ continue
+ fi
+ # In case that it's directory
+ if [ -d "$dir" ]; then
+ if [ -z "$MODULEPATH" ]; then
+ MODULEPATH="$dir"
+ else
+ MODULEPATH="$MODULEPATH:$dir"
+ fi
+ fi
+ done
+
+ # export
+ export MODULEPATH
+fi
+
+ml purge
diff --git a/install/FEDORALATEST b/install/FEDORALATEST
index bc5028d..0a403ca 100644
--- a/install/FEDORALATEST
+++ b/install/FEDORALATEST
@@ -33,8 +33,30 @@ python get-pip.py
pip install setuptools --upgrade
%environment
-. /opt/apps/lmod/7.7.7/init/profile
-ml purge --force
-export -f ml
-export -f module
-export -f clearMT
+source /opt/apps/lmod/7.7.7/init/profile
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+ MODULEPATH=""
+
+ for dir in /apps/modules/*
+ do
+ # Exclude following directories
+ if [[ (${dir##*/} == "all") ]]; then
+ continue
+ fi
+ # In case that it's directory
+ if [ -d "$dir" ]; then
+ if [ -z "$MODULEPATH" ]; then
+ MODULEPATH="$dir"
+ else
+ MODULEPATH="$MODULEPATH:$dir"
+ fi
+ fi
+ done
+
+ # export
+ export MODULEPATH
+fi
+
+ml purge
diff --git a/install/UBUNTU1804 b/install/UBUNTU1804
index 79e0b77..31f9b18 100644
--- a/install/UBUNTU1804
+++ b/install/UBUNTU1804
@@ -58,12 +58,34 @@ cd /bin
rm sh && ln -s /bin/bash sh
%environment
-source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
export OMPI_MCA_btl_tcp_if_include=10.33.4.0/24
export OMPI_MCA_orte_base_help_aggregate=0
export OMPI_MCA_btl_openib_if_include=mlx5_0
+
+source /opt/apps/lmod/7.7.7/init/profile
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+ MODULEPATH=""
+
+ for dir in /apps/modules/*
+ do
+ # Exclude following directories
+ if [[ (${dir##*/} == "all") ]]; then
+ continue
+ fi
+ # In case that it's directory
+ if [ -d "$dir" ]; then
+ if [ -z "$MODULEPATH" ]; then
+ MODULEPATH="$dir"
+ else
+ MODULEPATH="$MODULEPATH:$dir"
+ fi
+ fi
+ done
+
+ # export
+ export MODULEPATH
+fi
+
+ml purge
--
GitLab