From 7da84bec754702cafb42b3c66d468862198a9340 Mon Sep 17 00:00:00 2001
From: Lukas Krupcik <lukas.krupcik@vsb.cz>
Date: Thu, 21 Sep 2023 11:52:57 +0200
Subject: [PATCH] 	modified:  
 archive/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb 	modified:  
 o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0-CUDA-12.2.0.eb 	modified:  
 o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0.eb 	new file:  
 o/OpenMPI/OpenMPI-3.1.6-GCC-10.2.0.eb 	modified:  
 o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb 	new file:  
 o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-13.0.1.eb 	new file:  
 o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2-devel.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-UCX-11.1.0-rc2.eb 
 modified:   o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-test.eb 
 modified:   o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-test.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.11-CUDA-11.4.1.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.2-CUDA-11.2.2.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.9-CUDA-11.4.1.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.6-NVHPC-22.2-CUDA-11.6.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.7-GCC-10.2.0-UCX-1.11.2-CUDA-11.4.1.eb 	modified:  
 o/OpenMPI/OpenMPI-4.0.7-GCC-9.3.0-UCX-1.9.0-CUDA-11.4.1.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.1-AOCC-3.1.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.1-GCC-10.2.0-test.eb 	new file:  
 o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.2-CUDA-11.6.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0-CUDA-11.7.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0-dgx.eb 	modified:  
 o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0.eb 	new file:  
 o/OpenMPI/fix-sys-mount.patch 	deleted:   
 o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-test.eb

---
 .../OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb   |  2 +
 .../OpenMPI-3.1.4-GCC-10.2.0-CUDA-12.2.0.eb   |  6 +-
 o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0.eb         |  8 ++-
 o/OpenMPI/OpenMPI-3.1.6-GCC-10.2.0.eb         | 70 +++++++++++++++++++
 o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb      |  1 +
 o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb          | 62 ++++++++++++++++
 ...OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb |  1 +
 .../OpenMPI-4.0.5-GCC-10.2.0-Java-13.0.1.eb   |  1 +
 ....0-test.eb => OpenMPI-4.0.5-GCC-10.2.0.eb} |  7 +-
 ...I-4.0.5-GCCcore-9.3.0-CUDA-11.2.2-devel.eb |  1 +
 ...OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2.eb |  1 +
 ...5-NVHPC-21.2-CUDA-11.2.2-UCX-11.1.0-rc2.eb |  1 +
 ...enMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-test.eb |  1 +
 .../OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2.eb   |  1 +
 o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-test.eb    |  1 +
 o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2.eb         |  1 +
 o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb      |  6 +-
 .../OpenMPI-4.0.6-NVHPC-21.11-CUDA-11.4.1.eb  |  1 +
 .../OpenMPI-4.0.6-NVHPC-21.2-CUDA-11.2.2.eb   |  1 +
 .../OpenMPI-4.0.6-NVHPC-21.9-CUDA-11.4.1.eb   |  1 +
 .../OpenMPI-4.0.6-NVHPC-22.2-CUDA-11.6.0.eb   |  1 +
 ...4.0.7-GCC-10.2.0-UCX-1.11.2-CUDA-11.4.1.eb |  1 +
 ...I-4.0.7-GCC-9.3.0-UCX-1.9.0-CUDA-11.4.1.eb |  1 +
 o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb         |  1 +
 o/OpenMPI/OpenMPI-4.1.1-AOCC-3.1.0.eb         |  1 +
 o/OpenMPI/OpenMPI-4.1.1-GCC-10.2.0-test.eb    |  1 +
 o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb         | 61 ++++++++++++++++
 .../OpenMPI-4.1.2-NVHPC-22.2-CUDA-11.6.0.eb   |  1 +
 .../OpenMPI-4.1.4-GCC-11.3.0-CUDA-11.7.0.eb   |  1 +
 o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb         |  1 +
 o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb         |  1 +
 .../OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb   |  2 +-
 ...penMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0-dgx.eb |  2 +-
 .../OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0.eb   |  4 +-
 o/OpenMPI/fix-sys-mount.patch                 | 14 ++++
 35 files changed, 257 insertions(+), 10 deletions(-)
 create mode 100644 o/OpenMPI/OpenMPI-3.1.6-GCC-10.2.0.eb
 create mode 100644 o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb
 rename o/OpenMPI/{OpenMPI-4.0.5-GCC-10.2.0-test.eb => OpenMPI-4.0.5-GCC-10.2.0.eb} (92%)
 create mode 100644 o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb
 create mode 100644 o/OpenMPI/fix-sys-mount.patch

diff --git a/archive/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb b/archive/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb
index 19e86846..c0414d89 100644
--- a/archive/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb
+++ b/archive/OpenMPI/OpenMPI-3.1.4-GCC-6.3.0-2.27.eb
@@ -13,6 +13,7 @@ toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
 source_urls = [
     'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_GZ]
+checksums = ['a7c34ad052ea8201ed9e7389994069fe6996403beabdd2d711caf0532808156c']
 
 dependencies = [
     ('hwloc', '1.11.7'),
@@ -27,6 +28,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0-CUDA-12.2.0.eb b/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0-CUDA-12.2.0.eb
index bb92473d..82b5cda3 100644
--- a/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0-CUDA-12.2.0.eb
+++ b/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0-CUDA-12.2.0.eb
@@ -17,7 +17,11 @@ if os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
 source_urls = [
     'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['a7c34ad052ea8201ed9e7389994069fe6996403beabdd2d711caf0532808156c']
+patches = ['fix-sys-mount.patch']
+checksums = [
+   'a7c34ad052ea8201ed9e7389994069fe6996403beabdd2d711caf0532808156c',
+   '2836b7378b33ed3bc6e201136ba29c58f7c892817572d651c0284986f1c7e507'
+]
 
 dependencies = [
     ('hwloc', '1.11.7'),
diff --git a/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0.eb b/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0.eb
index 540ba5be..e7a698dc 100644
--- a/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0.eb
+++ b/o/OpenMPI/OpenMPI-3.1.4-GCC-10.2.0.eb
@@ -14,7 +14,11 @@ toolchain = {'name': 'GCC', 'version': '10.2.0'}
 source_urls = [
     'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['a7c34ad052ea8201ed9e7389994069fe6996403beabdd2d711caf0532808156c']
+patches = ['fix-sys-mount.patch']
+checksums = [
+   'a7c34ad052ea8201ed9e7389994069fe6996403beabdd2d711caf0532808156c',
+   '2836b7378b33ed3bc6e201136ba29c58f7c892817572d651c0284986f1c7e507'
+]
 
 dependencies = [
     ('hwloc', '1.11.7'),
@@ -29,7 +33,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
-configopts += '--disable-builtin-atomics ' # RT35770
+#configopts += '--disable-builtin-atomics ' # RT35770
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-3.1.6-GCC-10.2.0.eb b/o/OpenMPI/OpenMPI-3.1.6-GCC-10.2.0.eb
new file mode 100644
index 00000000..5ed18bac
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-3.1.6-GCC-10.2.0.eb
@@ -0,0 +1,70 @@
+# IT4Innovations
+# LK 2023
+
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '3.1.6'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '10.2.0'}
+
+source_urls = [
+    'http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+patches = ['fix-sys-mount.patch']
+checksums = [
+   '627d350846008dff233ff2acc8542d20000a6abc1daa7277244d060298f88001',
+   '2836b7378b33ed3bc6e201136ba29c58f7c892817572d651c0284986f1c7e507'
+]
+
+dependencies = [
+    ('hwloc', '1.11.7'),
+    ('zlib', '1.2.11'),
+    ('libxml2', '2.9.10'),
+    ('UCX', '1.9.0'),
+]
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--with-slurm ' # Enable slurm
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+configopts += '--with-ucx=$EBROOTUCX '
+#configopts += '--disable-builtin-atomics ' # RT35770
+
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
+
+local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+sanity_check_paths = {
+    'files': [
+        "bin/%s" %
+        binfile for binfile in [
+            "ompi_info", "opal_wrapper", "orterun"]] + [
+                "lib/lib%s.%s" %
+                (libfile, SHLIB_EXT) for libfile in local_libs] + [
+                    "include/%s.h" %
+                    x for x in [
+                        "mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]], 'dirs': [], }
+
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+elif os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+else:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+
+moduleclass = 'mpi'
diff --git a/o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb b/o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb
index 29363c74..956b2560 100644
--- a/o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb
+++ b/o/OpenMPI/OpenMPI-3.1.6-GCCcore-8.3.0.eb
@@ -23,6 +23,7 @@ dependencies = [
 
 configopts = '--with-slurm ' # Enable slurm
 configopts += '--with-ucx=$EBROOTUCX '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb b/o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb
new file mode 100644
index 00000000..b2b6e90e
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-4.0.3-GCC-9.3.0.eb
@@ -0,0 +1,62 @@
+# IT4Innovations
+# LK 2023
+
+name = 'OpenMPI'
+version = '4.0.3'
+
+homepage = 'https://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-3 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '9.3.0'}
+
+source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+patches = [
+    'OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch',
+    'OpenMPI-4.x_fix_pmix_discovery.patch',
+    'fix-sys-mount.patch'
+]
+checksums = [
+    '6346bf976001ad274c7e018d6cc35c92bbb9426d8f7754fac00a17ea5ac8eebc',  # openmpi-4.0.3.tar.gz
+    # OpenMPI-4.0.1_remove-pmix-check-in-pmi-switch.patch
+    'a5737061eb9006e862f30019776adf092d800f681272be7f1575e74b4bfa20fb',
+    '547641fff884c917237d158b0b13bdf387977cf0dddfd7e49e78d5f759a6a31b',  # OpenMPI-4.x_fix_pmix_discovery.patch
+    '2836b7378b33ed3bc6e201136ba29c58f7c892817572d651c0284986f1c7e507'
+]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('hwloc', '2.2.0'),
+    ('libevent', '2.1.11'),
+    ('UCX', '1.8.0'),
+    ('libfabric', '1.11.0'),
+    ('PMIx', '3.1.5'),
+]
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--with-slurm ' # Enable slurm
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+configopts += '--with-ucx=$EBROOTUCX '
+configopts += '--disable-builtin-atomics ' # RT35770
+
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+elif os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+else:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+
+moduleclass = 'mpi'
diff --git a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb
index 782e2189..efab849f 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-1.8.0_221.eb
@@ -30,6 +30,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--enable-mpi-java '  # Java support RT#28536
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-13.0.1.eb b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-13.0.1.eb
index 084bcc02..8c6ac91f 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-13.0.1.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-Java-13.0.1.eb
@@ -34,6 +34,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--enable-mpi-java '  # Java support RT#28536
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-test.eb b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb
similarity index 92%
rename from o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-test.eb
rename to o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb
index 590dd2e8..c5f76f97 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0-test.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-GCC-10.2.0.eb
@@ -5,7 +5,6 @@ easyblock = 'ConfigureMake'
 
 name = 'OpenMPI'
 version = '4.0.5'
-versionsuffix = '-test'
 
 homepage = 'http://www.open-mpi.org/'
 description = """The Open MPI Project is an open source MPI-2 implementation."""
@@ -14,7 +13,11 @@ toolchain = {'name': 'GCC', 'version': '10.2.0'}
 
 source_urls = ['https://github.com/open-mpi/ompi/archive/']
 sources = ['v4.0.5.tar.gz']
-checksums = ['8b36b4447c3ba54ab8c708253836bfae4dde06e7814087d6580e8d6b0b302f70']
+patches = ['fix-sys-mount.patch']
+checksums = [
+   '8b36b4447c3ba54ab8c708253836bfae4dde06e7814087d6580e8d6b0b302f70',
+   '2836b7378b33ed3bc6e201136ba29c58f7c892817572d651c0284986f1c7e507'
+]
 
 dependencies = [
     ('hwloc', '2.2.0'),
diff --git a/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2-devel.eb b/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2-devel.eb
index 1f06b629..0f491a5d 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2-devel.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2-devel.eb
@@ -28,6 +28,7 @@ configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
 configopts += '--enable-debug '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2.eb b/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2.eb
index 3ac16b8a..fc57b40e 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-GCCcore-9.3.0-CUDA-11.2.2.eb
@@ -27,6 +27,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-UCX-11.1.0-rc2.eb b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-UCX-11.1.0-rc2.eb
index dc53c026..615c10f4 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-UCX-11.1.0-rc2.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-UCX-11.1.0-rc2.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-test.eb b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-test.eb
index a095eadd..79ec945a 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-test.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2-test.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2.eb b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2.eb
index 20383bb7..f726c4ba 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-CUDA-11.2.2.eb
@@ -12,6 +12,7 @@ toolchain = {'name': 'NVHPC', 'version': '21.2'}
 
 source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_GZ]
+checksums = ['572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05']
 
 dependencies = [
     ('UCX', '1.9.0', versionsuffix),
diff --git a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-test.eb b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-test.eb
index 9a396fc7..bfdaecea 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-test.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2-test.eb
@@ -27,6 +27,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 #onfigopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTNVHPC/Linux_x86_64/21.2/cuda/11.2 '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2.eb b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2.eb
index fb90c10e..bb145a43 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-NVHPC-21.2.eb
@@ -26,6 +26,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTNVHPC/Linux_x86_64/21.2/cuda/11.2 '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb b/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb
index 9c225e3e..eb302b2a 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-gcccuda-2020b.eb
@@ -11,7 +11,11 @@ toolchain = {'name': 'gcccuda', 'version': '2020b'}
 
 source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05']
+patches = ['fix-sys-mount.patch']
+checksums = [
+   '572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05',
+   '2836b7378b33ed3bc6e201136ba29c58f7c892817572d651c0284986f1c7e507'
+]
 
 builddependencies = [
     ('pkg-config', '0.29.2'),
diff --git a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.11-CUDA-11.4.1.eb b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.11-CUDA-11.4.1.eb
index 61a6bcc2..595d0134 100644
--- a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.11-CUDA-11.4.1.eb
+++ b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.11-CUDA-11.4.1.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.2-CUDA-11.2.2.eb b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.2-CUDA-11.2.2.eb
index 9e16bf22..f11a8c32 100644
--- a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.2-CUDA-11.2.2.eb
+++ b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.2-CUDA-11.2.2.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.9-CUDA-11.4.1.eb b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.9-CUDA-11.4.1.eb
index 02bb75cb..094d3305 100644
--- a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.9-CUDA-11.4.1.eb
+++ b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-21.9-CUDA-11.4.1.eb
@@ -12,6 +12,7 @@ toolchain = {'name': 'NVHPC', 'version': '21.9'}
 
 source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 sources = [SOURCELOWER_TAR_GZ]
+checksums = ['8f2d159d2d846979b1380e9552f56e4365f5ec71d54a05077ddb244719d70fc3']
 
 dependencies = [
     ('UCX', '1.11.2', versionsuffix),
diff --git a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-22.2-CUDA-11.6.0.eb b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-22.2-CUDA-11.6.0.eb
index 57e043e9..24e49625 100644
--- a/o/OpenMPI/OpenMPI-4.0.6-NVHPC-22.2-CUDA-11.6.0.eb
+++ b/o/OpenMPI/OpenMPI-4.0.6-NVHPC-22.2-CUDA-11.6.0.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.7-GCC-10.2.0-UCX-1.11.2-CUDA-11.4.1.eb b/o/OpenMPI/OpenMPI-4.0.7-GCC-10.2.0-UCX-1.11.2-CUDA-11.4.1.eb
index 203921cd..9047710b 100644
--- a/o/OpenMPI/OpenMPI-4.0.7-GCC-10.2.0-UCX-1.11.2-CUDA-11.4.1.eb
+++ b/o/OpenMPI/OpenMPI-4.0.7-GCC-10.2.0-UCX-1.11.2-CUDA-11.4.1.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.0.7-GCC-9.3.0-UCX-1.9.0-CUDA-11.4.1.eb b/o/OpenMPI/OpenMPI-4.0.7-GCC-9.3.0-UCX-1.9.0-CUDA-11.4.1.eb
index 376da833..1b42f688 100644
--- a/o/OpenMPI/OpenMPI-4.0.7-GCC-9.3.0-UCX-1.9.0-CUDA-11.4.1.eb
+++ b/o/OpenMPI/OpenMPI-4.0.7-GCC-9.3.0-UCX-1.9.0-CUDA-11.4.1.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb b/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb
index 523a5b96..bf9222b7 100644
--- a/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.0-GCC-10.2.0.eb
@@ -49,6 +49,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.1.1-AOCC-3.1.0.eb b/o/OpenMPI/OpenMPI-4.1.1-AOCC-3.1.0.eb
index 8d506cfc..43c16cd8 100644
--- a/o/OpenMPI/OpenMPI-4.1.1-AOCC-3.1.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.1-AOCC-3.1.0.eb
@@ -27,6 +27,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.1.1-GCC-10.2.0-test.eb b/o/OpenMPI/OpenMPI-4.1.1-GCC-10.2.0-test.eb
index 0071d960..987c3621 100644
--- a/o/OpenMPI/OpenMPI-4.1.1-GCC-10.2.0-test.eb
+++ b/o/OpenMPI/OpenMPI-4.1.1-GCC-10.2.0-test.eb
@@ -29,6 +29,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb b/o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb
new file mode 100644
index 00000000..099eab33
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-4.1.2-GCC-10.2.0.eb
@@ -0,0 +1,61 @@
+# IT4Innovations
+# LK 2023
+
+name = 'OpenMPI'
+version = '4.1.2'
+
+homepage = 'https://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-3 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '10.2.0'}
+
+source_urls = ['https://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_BZ2]
+checksums = ['9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527']
+
+builddependencies = [
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('hwloc', '2.2.0'),
+    ('libevent', '2.1.12'),
+    ('UCX', '1.9.0'),
+    ('libfabric', '1.11.0'),
+    ('PMIx', '3.1.5'),
+]
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--with-slurm ' # Enable slurm
+configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
+configopts += '--with-ucx=$EBROOTUCX '
+
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
+
+postinstallcmds = [
+    'echo "# By default, for Open MPI 4.0 and later, infiniband ports on a device are not used by default." >> %(installdir)s/etc/openmpi-mca-params.conf',
+    'echo "btl_openib_allow_ib = true" >> %(installdir)s/etc/openmpi-mca-params.conf',
+]
+
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+elif os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+                'OMPI_MCA_orte_base_help_aggregate': '0',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+else:
+   modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+                'SLURM_MPI_TYPE': 'pmix_v4',
+   }
+
+moduleclass = 'mpi'
diff --git a/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.2-CUDA-11.6.0.eb b/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.2-CUDA-11.6.0.eb
index df16bf5d..f709a325 100644
--- a/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.2-CUDA-11.6.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.2-NVHPC-22.2-CUDA-11.6.0.eb
@@ -28,6 +28,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDACORE '
+#configopts += '--with-pmix=/opt/it4i-libs/PMIx/4.2.6 '
 
 import os
 if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
diff --git a/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0-CUDA-11.7.0.eb b/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0-CUDA-11.7.0.eb
index b76044fe..4ec92bc2 100644
--- a/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0-CUDA-11.7.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0-CUDA-11.7.0.eb
@@ -45,6 +45,7 @@ configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
 configopts += '--with-cuda=$EBROOTCUDA '
+#configopts += '--with-pmix=/opt/it4i-libs/PMIx/4.2.6 '
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb b/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
index 695f9b18..1271930e 100644
--- a/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
@@ -41,6 +41,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
+configopts += '--with-pmix=/opt/it4i-libs/PMIx/4.2.6 '
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb b/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb
index 5f9b95f5..0479c305 100644
--- a/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.4-GCC-12.2.0.eb
@@ -61,6 +61,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--with-slurm ' # Enable slurm
 configopts += '--enable-mpi-cxx '  # Enable building the C++ MPI bindings
 configopts += '--with-ucx=$EBROOTUCX '
+configopts += '--with-pmix=/opt/it4i-libs/PMIx/4.2.6 '
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb b/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb
index 2d0f0e67..34c43e7c 100644
--- a/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.4-NVHPC-22.7-CUDA-11.7.0.eb
@@ -67,7 +67,7 @@ configopts += ' --enable-mpi-thread-multiple'
 configopts += ' --with-verbs'
 configopts += ' --enable-mpirun-prefix-by-default'
 configopts += ' --with-hwloc=$EBROOTHWLOC'  # hwloc support
-configopts = '--with-slurm ' # Enable slurm
+configopts += ' --with-slurm' # Enable slurm
 configopts += ' --enable-mpi-cxx'  # Enable building the C++ MPI bindings
 configopts += ' --with-ucx=$EBROOTUCX'
 
diff --git a/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0-dgx.eb b/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0-dgx.eb
index 325bbf0e..80207342 100644
--- a/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0-dgx.eb
+++ b/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0-dgx.eb
@@ -72,7 +72,7 @@ configopts += ' --with-hwloc=$EBROOTHWLOC'  # hwloc support
 configopts += ' --with-slurm ' # Enable slurm
 configopts += ' --enable-mpi-cxx'  # Enable building the C++ MPI bindings
 configopts += ' --with-ucx=$EBROOTUCX'
-configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.2'
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0.eb b/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0.eb
index cf882f59..286a406f 100644
--- a/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0.eb
+++ b/o/OpenMPI/OpenMPI-4.1.5-NVHPC-23.5-CUDA-12.2.0.eb
@@ -70,11 +70,11 @@ configopts += ' --with-verbs'
 configopts += ' --enable-mpirun-prefix-by-default'
 configopts += ' --with-hwloc=$EBROOTHWLOC'  # hwloc support
 #configopts += ' --with-tm=/opt/pbs '  # Enable PBS
-configopts += ' --with-slurm ' # Enable slurm
+configopts += ' --with-slurm' # Enable slurm
 configopts += ' --enable-mpi-cxx'  # Enable building the C++ MPI bindings
 configopts += ' --with-ucx=$EBROOTUCX'
 configopts += ' --with-knem=/opt/knem-1.1.4.90mlnx1'
-configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.2'
+configopts += ' --with-pmix=/opt/it4i-libs/PMIx/4.2.6'
 
 osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
diff --git a/o/OpenMPI/fix-sys-mount.patch b/o/OpenMPI/fix-sys-mount.patch
new file mode 100644
index 00000000..bf17fb25
--- /dev/null
+++ b/o/OpenMPI/fix-sys-mount.patch
@@ -0,0 +1,14 @@
+--- ./ompi/mca/fs/lustre/fs_lustre.c.orig	2023-09-21 11:26:46.234609488 +0200
++++ ./ompi/mca/fs/lustre/fs_lustre.c	2023-09-21 11:27:02.810479444 +0200
+@@ -35,9 +35,9 @@
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+-#ifdef HAVE_SYS_MOUNT_H
++/*#ifdef HAVE_SYS_MOUNT_H
+ #include <sys/mount.h>
+-#endif
++#endif*/
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif