From 88b5c5d1351ddabf534593d42fe5c2a120d52f7a Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jwlogin05.juwels>
Date: Thu, 3 Aug 2023 17:24:41 +0200
Subject: [PATCH] Force IntelMPI and ParaStationMPI to use pspmi

update nvidia-driver in JWC and JWB
---
 Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb         | 1 +
 Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb          | 1 +
 .../juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb  | 1 +
 .../juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb   | 4 ++--
 .../n/nvidia-driver/nvidia-driver-default.eb                  | 4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
index f1f055730..e12b9ee80 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
@@ -20,6 +20,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_HARD_ABORT': '1',
+    'SLURM_MPI_TYPE': 'pspmi',
 }
 
 modluafooter = '''
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
index 3f0f135e7..488202980 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
@@ -16,6 +16,7 @@ modextravars = {
     'PSP_OPENIB': '0',
     'PSP_UCP': '1',
     'PSP_HARD_ABORT': '1',
+    'SLURM_MPI_TYPE': 'pspmi',
 }
 
 moduleclass = 'system'
diff --git a/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb b/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb
index 45793958b..c6c7234dc 100644
--- a/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb
+++ b/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb
@@ -16,6 +16,7 @@ sources = []
 modextravars = {
     'FI_PROVIDER': 'mlx',
     'I_MPI_PMI_VALUE_LENGTH_MAX': '900',
+    'SLURM_MPI_TYPE': 'pspmi',
 }
 
 moduleclass = 'system'
diff --git a/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb b/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb
index 2900da59e..cdf59cd27 100644
--- a/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb
+++ b/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb
@@ -1,6 +1,6 @@
 name = 'nvidia-driver'
 version = 'default'
-realversion = '525.105.17'
+realversion = '535.54.03'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = f"""
@@ -15,7 +15,7 @@ toolchain = SYSTEM
 
 source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
 sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
-checksums = ['c635a21a282c9b53485f19ebb64a0f4b536a968b94d4d97629e0bc547a58142a']
+checksums = ['454764f57ea1b9e19166a370f78be10e71f0626438fb197f726dc3caf05b4082']
 
 # To avoid conflicts between NVML and the kernel driver
 postinstallcmds = ['rm %(installdir)s/lib64/libnvidia-ml.so*']
diff --git a/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb b/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
index 2900da59e..cdf59cd27 100644
--- a/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
+++ b/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
@@ -1,6 +1,6 @@
 name = 'nvidia-driver'
 version = 'default'
-realversion = '525.105.17'
+realversion = '535.54.03'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = f"""
@@ -15,7 +15,7 @@ toolchain = SYSTEM
 
 source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
 sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
-checksums = ['c635a21a282c9b53485f19ebb64a0f4b536a968b94d4d97629e0bc547a58142a']
+checksums = ['454764f57ea1b9e19166a370f78be10e71f0626438fb197f726dc3caf05b4082']
 
 # To avoid conflicts between NVML and the kernel driver
 postinstallcmds = ['rm %(installdir)s/lib64/libnvidia-ml.so*']
-- 
GitLab