From 579102eabe2079230cfd1411624089c85fb9d26e Mon Sep 17 00:00:00 2001
From: Damian Alvarez <d.alvarez@fz-juelich.de>
Date: Wed, 7 Jun 2023 13:01:42 +0200
Subject: [PATCH] To add new versions with a bugfix for ROMIO

---
 .../p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb       | 47 ++++++++++++++++++
 .../p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb       | 47 ++++++++++++++++++
 .../psmpi-5.7.1-1-intel-compilers-2022.1.0.eb | 47 ++++++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb    | 43 +++++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb       | 42 ++++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb    | 43 +++++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb       | 42 ++++++++++++++++
 ...mpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb | 43 +++++++++++++++++
 .../psmpi-5.8.1-1-intel-compilers-2022.1.0.eb | 42 ++++++++++++++++
 .../p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb    | 46 ++++++++++++++++++
 .../p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb       | 45 +++++++++++++++++
 .../p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb       | 45 +++++++++++++++++
 .../psmpi-5.7.1-1-intel-compilers-2022.1.0.eb | 45 +++++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb    | 34 +++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb       | 33 +++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb    | 34 +++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb       | 33 +++++++++++++
 ...mpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb | 34 +++++++++++++
 .../psmpi-5.8.1-1-intel-compilers-2022.1.0.eb | 33 +++++++++++++
 .../p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb       | 48 +++++++++++++++++++
 .../p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb       | 48 +++++++++++++++++++
 .../psmpi-5.7.1-1-intel-compilers-2022.1.0.eb | 48 +++++++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb    | 39 +++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb       | 38 +++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb    | 39 +++++++++++++++
 .../p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb       | 38 +++++++++++++++
 ...mpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb | 39 +++++++++++++++
 .../psmpi-5.8.1-1-intel-compilers-2022.1.0.eb | 38 +++++++++++++++
 28 files changed, 1153 insertions(+)
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
 create mode 100644 Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
 create mode 100644 Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
 create mode 100644 Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb

diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
new file mode 100644
index 000000000..f7f5a4d96
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -0,0 +1,47 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.1-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.1-1_singleton-fix.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
new file mode 100644
index 000000000..cc4d0835a
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -0,0 +1,47 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.1-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.1-1_singleton-fix.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 000000000..f06d71481
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,47 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+    # psmpi-5.7.1-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.1-1_singleton-fix.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 000000000..70f804c55
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,43 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
new file mode 100644
index 000000000..6936bf35a
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
@@ -0,0 +1,42 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
new file mode 100644
index 000000000..d1fa44810
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
@@ -0,0 +1,43 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
new file mode 100644
index 000000000..29e5a4243
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
@@ -0,0 +1,42 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
new file mode 100644
index 000000000..41daa4e50
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
@@ -0,0 +1,43 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 000000000..74b179c63
--- /dev/null
+++ b/Golden_Repo/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,42 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+    # psmpi-5.5.0-1_ime.patch
+    'c2418b9511560dca197242508de9c7b6b117122912b6d3a4aa18398834f465ff',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi-5.5.0-1_ime.patch'
+]
+
+mpich_opts = '--enable-static --with-file-system=ime+ufs+gpfs --enable-romio'
+
+preconfigopts = 'export CFLAGS="-I/opt/ddn/ime/include $CFLAGS" && '
+preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 000000000..ee88e31c8
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,46 @@
+name = 'psmpi'
+version = '5.7.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
new file mode 100644
index 000000000..5d26f62e0
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -0,0 +1,45 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
new file mode 100644
index 000000000..2b8f13ff0
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -0,0 +1,45 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 000000000..8ee4350c7
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,45 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch'
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 000000000..d60612056
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,34 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
new file mode 100644
index 000000000..ea4f7babd
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
@@ -0,0 +1,33 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
new file mode 100644
index 000000000..86ead34e6
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
@@ -0,0 +1,34 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
new file mode 100644
index 000000000..3eb8cb38b
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
@@ -0,0 +1,33 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
new file mode 100644
index 000000000..1dba7676b
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
@@ -0,0 +1,34 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 000000000..9a5fce231
--- /dev/null
+++ b/Overlays/deep_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,33 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
new file mode 100644
index 000000000..e9109f9a7
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-GCC-11.3.0.eb
@@ -0,0 +1,48 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.1-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.1-1_singleton-fix.patch'
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
new file mode 100644
index 000000000..e9d5c2c1c
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-NVHPC-23.1.eb
@@ -0,0 +1,48 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.1-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.1-1_singleton-fix.patch'
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 000000000..ea66d1a77
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.7.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,48 @@
+name = 'psmpi'
+version = '5.7.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.1 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/ParaStation/psmpi/archive/']
+checksums = [
+    # psmpi-5.7.1-1.tar.gz
+    'fe6fee71ff7586295347c4d06e1be872adcbe136119152c5a0983bad643e967b',
+    '978eb3223c978477c40987f745c07fda26ccbad2f468616faf92f0d71b81a156',  # psmpi_shebang.patch
+    # psmpi-5.7.1-1_singleton-fix.patch
+    '5ab46de53f6025367f444e77cd3374fe36a0728cde38c72db55603ebc08b50a2',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+patches = [
+    'psmpi_shebang.patch',
+    # We don't have IME in HDFML so we skip this
+    # 'psmpi-5.5.0-1_ime.patch',
+    'psmpi-5.7.1-1_singleton-fix.patch'
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
new file mode 100644
index 000000000..f3bb6e997
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0-mt.eb
@@ -0,0 +1,39 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
new file mode 100644
index 000000000..0653692a9
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-GCC-11.3.0.eb
@@ -0,0 +1,38 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'GCC', 'version': '11.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
new file mode 100644
index 000000000..11aeb7505
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1-mt.eb
@@ -0,0 +1,39 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
new file mode 100644
index 000000000..e82080e74
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-NVHPC-23.1.eb
@@ -0,0 +1,38 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'NVHPC', 'version': '23.1'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
new file mode 100644
index 000000000..9a3c8beae
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0-mt.eb
@@ -0,0 +1,39 @@
+name = 'psmpi'
+version = '5.8.1-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = True
+
+cuda = True
+
+moduleclass = 'mpi'
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
new file mode 100644
index 000000000..8b1e3ff65
--- /dev/null
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.8.1-1-intel-compilers-2022.1.0.eb
@@ -0,0 +1,38 @@
+name = 'psmpi'
+version = '5.8.1-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 4.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with
+various batch systems for tighter process control.
+"""
+
+toolchain = {'name': 'intel-compilers', 'version': '2022.1.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://gitlab.jsc.fz-juelich.de/ParTec/psmpi/uploads/762714c8eec01fe59239a52798a70e1c/']
+checksums = [
+    # psmpi-5.8.1-1.tar.gz
+    '54dee42a2eb6ac26d43f5e0371ddc1e75225512365749b3d03856543b6a7366d',
+]
+
+dependencies = [
+    ('pscom', '5.6-default'),
+    # needed due to the inclusion of hwloc
+    ('libxml2', '2.9.13'),
+    # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
+    ('CUDA', '11.7', '', SYSTEM)
+]
+
+# 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" && '
+# preconfigopts += 'export LDFLAGS="$LDFLAGS -L/opt/ddn/ime/lib -lim_client" && '
+mpich_opts = '--enable-static --with-file-system=ufs+gpfs --enable-romio'
+
+threaded = False
+
+cuda = True
+
+moduleclass = 'mpi'
-- 
GitLab