From 24a62ff2385b87ffe9f3affa8c9b64f9e1070cde Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@juwels00.ib.juwels.fzj.de>
Date: Mon, 5 Oct 2020 17:40:56 +0200
Subject: [PATCH] Reorganization of the repo and mpi-settings
---
.../o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb | 8 +++----
.../p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb | 8 +++----
.../psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb | 8 +++----
...default.eb => psmpi-settings-5.4-plain.eb} | 2 +-
.../n/nvidia-driver/nvidia-driver-default.eb | 19 +++++++++++++++
.../psmpi-settings/psmpi-settings-5.4-CUDA.eb | 24 -------------------
.../psmpi-settings-5.4-default.eb | 24 -------------------
...lt.eb => OpenMPI-settings-4.1-UCX-CUDA.eb} | 2 +-
.../o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb | 4 ++--
...default.eb => psmpi-settings-5.4-plain.eb} | 2 +-
.../p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb | 4 ++--
.../psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb | 4 ++--
12 files changed, 40 insertions(+), 69 deletions(-)
rename Golden_Repo/{juwelsbooster_overlay => hdfml_overlay}/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb (91%)
rename Golden_Repo/{juwelsbooster_overlay => hdfml_overlay}/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb (85%)
rename Golden_Repo/{juwelsbooster_overlay => hdfml_overlay}/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb (85%)
rename Golden_Repo/jusuf_overlay/p/psmpi-settings/{psmpi-settings-5.4-default.eb => psmpi-settings-5.4-plain.eb} (92%)
create mode 100644 Golden_Repo/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
delete mode 100644 Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
delete mode 100644 Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
rename Golden_Repo/o/OpenMPI-settings/{OpenMPI-settings-4.1-default.eb => OpenMPI-settings-4.1-UCX-CUDA.eb} (97%)
rename Golden_Repo/p/psmpi-settings/{psmpi-settings-5.4-default.eb => psmpi-settings-5.4-plain.eb} (91%)
diff --git a/Golden_Repo/juwelsbooster_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb b/Golden_Repo/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
similarity index 91%
rename from Golden_Repo/juwelsbooster_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
rename to Golden_Repo/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
index 691932922..651084d95 100644
--- a/Golden_Repo/juwelsbooster_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
+++ b/Golden_Repo/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
@@ -41,8 +41,8 @@ configopts += '--without-orte '
configopts += '--without-psm2 '
configopts += '--disable-oshmem '
configopts += '--with-cuda=$EBROOTCUDA '
-# We don't have yet the RPMs for CentOS8
-# configopts += '--with-ime=/opt/ddn/ime '
+# No IME in HDFML
+#configopts += '--with-ime=/opt/ddn/ime '
configopts += '--with-gpfs '
# to enable SLURM integration (site-specific)
@@ -60,8 +60,8 @@ sanity_check_paths = {
modluafooter = '''
family("mpi")
add_property("arch","gpu")
-if not ( isloaded("mpi-settings/default") ) then
- load("mpi-settings/default")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
end
'''
diff --git a/Golden_Repo/juwelsbooster_overlay/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb b/Golden_Repo/hdfml_overlay/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
similarity index 85%
rename from Golden_Repo/juwelsbooster_overlay/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
rename to Golden_Repo/hdfml_overlay/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
index 92d7a069e..22be88e1e 100644
--- a/Golden_Repo/juwelsbooster_overlay/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
+++ b/Golden_Repo/hdfml_overlay/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
@@ -23,11 +23,11 @@ dependencies = [
patches = [
'psmpi_shebang.patch',
- # We don't have yet the IME packages for CentOS8, so we need to skip this
+ # We don't have IME in HDFML so we skip this
# 'psmpi-5.4.6-1_ime.patch'
]
-# We don't have yet the IME packages for CentOS8, so we need to skip this
+# We don't have IME in HDFML so we skip this
# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
#
# preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
@@ -45,8 +45,8 @@ modaltsoftname = 'ParaStationMPI'
modluafooter = '''
add_property("arch","gpu")
family("mpi")
-if not ( isloaded("mpi-settings/default") ) then
- load("mpi-settings/default")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
end
'''
diff --git a/Golden_Repo/juwelsbooster_overlay/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb b/Golden_Repo/hdfml_overlay/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
similarity index 85%
rename from Golden_Repo/juwelsbooster_overlay/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
rename to Golden_Repo/hdfml_overlay/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
index 297967030..e43ad8496 100644
--- a/Golden_Repo/juwelsbooster_overlay/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
+++ b/Golden_Repo/hdfml_overlay/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
@@ -23,11 +23,11 @@ dependencies = [
patches = [
'psmpi_shebang.patch',
- # We don't have yet the IME packages for CentOS8, so we need to skip this
+ # We don't have IME in HDFML so we skip this
# 'psmpi-5.4.6-1_ime.patch'
]
-# We don't have yet the IME packages for CentOS8, so we need to skip this
+# We don't have IME in HDFML so we skip this
# mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
#
# preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
@@ -45,8 +45,8 @@ modaltsoftname = 'ParaStationMPI'
modluafooter = '''
add_property("arch","gpu")
family("mpi")
-if not ( isloaded("mpi-settings/default") ) then
- load("mpi-settings/default")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
end
'''
diff --git a/Golden_Repo/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
similarity index 92%
rename from Golden_Repo/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
rename to Golden_Repo/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
index c69606d53..bc3fa5d98 100644
--- a/Golden_Repo/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
+++ b/Golden_Repo/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
@@ -2,7 +2,7 @@ easyblock = 'SystemBundle'
name = 'psmpi-settings'
version = '5.4'
-versionsuffix = 'default'
+versionsuffix = 'plain'
homepage = ''
description = """This is a module to load the default ParaStationMPI configuration"""
diff --git a/Golden_Repo/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb b/Golden_Repo/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
new file mode 100644
index 000000000..25770af08
--- /dev/null
+++ b/Golden_Repo/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
@@ -0,0 +1,19 @@
+name = 'nvidia-driver'
+version = 'default'
+realversion = '450.80.02'
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """This is a set of libraries normally installed by the NVIDIA driver installer."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
+sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
+
+modluafooter = '''
+add_property("arch","gpu")
+'''
+
+moduleclass = 'system'
diff --git a/Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb b/Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
deleted file mode 100644
index 8aee53650..000000000
--- a/Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'psmpi-settings'
-version = '5.4'
-versionsuffix = 'CUDA'
-
-homepage = ''
-description = """This is a module to load the default ParaStationMPI configuration"""
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
- 'PSP_CUDA': '1',
- 'PSP_SHM': '0',
- 'PSP_UCP': '1',
- 'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
deleted file mode 100644
index 383e0cefe..000000000
--- a/Golden_Repo/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
+++ /dev/null
@@ -1,24 +0,0 @@
-easyblock = 'SystemBundle'
-
-name = 'psmpi-settings'
-version = '5.4'
-versionsuffix = 'default'
-
-homepage = ''
-description = """This is a module to load the default ParaStationMPI configuration"""
-
-site_contacts = 'd.alvarez@fz-juelich.de'
-
-toolchain = SYSTEM
-
-source_urls = []
-
-sources = []
-modextravars = {
- 'PSP_CUDA': '1',
- 'PSP_SHM': '0',
- 'PSP_UCP': '1',
- 'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
-}
-
-moduleclass = 'system'
diff --git a/Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-default.eb b/Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-UCX-CUDA.eb
similarity index 97%
rename from Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-default.eb
rename to Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-UCX-CUDA.eb
index 798d1552c..a3747fb23 100644
--- a/Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-default.eb
+++ b/Golden_Repo/o/OpenMPI-settings/OpenMPI-settings-4.1-UCX-CUDA.eb
@@ -2,7 +2,7 @@ easyblock = 'SystemBundle'
name = 'OpenMPI-settings'
version = '4.1'
-versionsuffix = 'default'
+versionsuffix = 'UCX-CUDA'
homepage = ''
description = """This is a module to load the default OpenMPI configuration"""
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
index 62923555c..0bea99888 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
@@ -59,8 +59,8 @@ sanity_check_paths = {
modluafooter = '''
family("mpi")
add_property("arch","gpu")
-if not ( isloaded("mpi-settings/default") ) then
- load("mpi-settings/default")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
end
'''
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-plain.eb
similarity index 91%
rename from Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-default.eb
rename to Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-plain.eb
index de8c90a4c..bdb810c78 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-default.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-plain.eb
@@ -2,7 +2,7 @@ easyblock = 'SystemBundle'
name = 'psmpi-settings'
version = '5.4'
-versionsuffix = 'default'
+versionsuffix = 'plain'
homepage = ''
description = """This is a module to load the default ParaStationMPI configuration"""
diff --git a/Golden_Repo/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
index e5ed64f59..805422f0c 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.4.7-1-GCC-9.3.0.eb
@@ -42,8 +42,8 @@ modaltsoftname = 'ParaStationMPI'
modluafooter = '''
add_property("arch","gpu")
family("mpi")
-if not ( isloaded("mpi-settings/default") ) then
- load("mpi-settings/default")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
end
'''
diff --git a/Golden_Repo/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
index e174da06e..67dcccb81 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.4.7-1-NVHPC-20.7-GCC-9.3.0.eb
@@ -42,8 +42,8 @@ modaltsoftname = 'ParaStationMPI'
modluafooter = '''
add_property("arch","gpu")
family("mpi")
-if not ( isloaded("mpi-settings/CUDA") ) then
- load("mpi-settings/CUDA")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
end
'''
--
GitLab