From 136dbe21aa0f0d637e9fd61a43d8a9218966c764 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jwlogin07.juwels>
Date: Thu, 18 Feb 2021 09:22:12 +0100
Subject: [PATCH] JuSUF has UCX 1.9.0 now as default, as opposed to the other
system which still rely on UCX 1.8.1
SoX was missing binutils as depedency, and not hidden, eventhough nobody probably wants to load it directly
---
Golden_Repo/hidden_deps.txt | 1 +
.../o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb | 67 +++++++++++++++++++
...-4.1.0rc1-iccifort-2020.2.254-GCC-9.3.0.eb | 67 +++++++++++++++++++
.../p/pscom/pscom-5.4-default.eb | 50 ++++++++++++++
Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-9.3.0.eb | 4 ++
5 files changed, 189 insertions(+)
create mode 100644 Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
create mode 100644 Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-iccifort-2020.2.254-GCC-9.3.0.eb
create mode 100644 Golden_Repo/jusuf_overlay/p/pscom/pscom-5.4-default.eb
diff --git a/Golden_Repo/hidden_deps.txt b/Golden_Repo/hidden_deps.txt
index a800fbc75..0018d1ac3 100644
--- a/Golden_Repo/hidden_deps.txt
+++ b/Golden_Repo/hidden_deps.txt
@@ -213,6 +213,7 @@ SCons
scrollkeeper
Serf
SIP
+SoX
S-Lang
snappy
spdlog
diff --git a/Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb b/Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
new file mode 100644
index 000000000..ab139ab9b
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-GCC-9.3.0.eb
@@ -0,0 +1,67 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '4.1.0rc1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-3 implementation."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCC', 'version': '9.3.0'}
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+osdependencies = [
+ # needed for --with-verbs
+ ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
+ # needed for --with-pmix
+ ('pmix-devel'),
+]
+
+builddependencies = [
+ ('Autotools', '20200321'),
+]
+
+dependencies = [
+ ('zlib', '1.2.11'),
+ ('hwloc', '2.2.0'),
+ ('UCX', '1.9.0', '', SYSTEM),
+ ('CUDA', '11.0', '', SYSTEM),
+ ('libevent', '2.1.12'),
+]
+
+configopts = '--enable-shared '
+configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support
+configopts += '--with-ucx=$EBROOTUCX '
+configopts += '--with-verbs '
+configopts += '--with-libevent=$EBROOTLIBEVENT '
+configopts += '--without-orte '
+configopts += '--without-psm2 '
+configopts += '--disable-oshmem '
+configopts += '--with-cuda=$EBROOTCUDA '
+configopts += '--with-ime=/opt/ddn/ime '
+configopts += '--with-gpfs '
+
+# to enable SLURM integration (site-specific)
+configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
+
+local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+sanity_check_paths = {
+ 'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
+ ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
+ ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
+ 'dirs': [],
+}
+
+# Add a family for our naming scheme
+modluafooter = '''
+family("mpi")
+add_property("arch","gpu")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
+end
+'''
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-iccifort-2020.2.254-GCC-9.3.0.eb b/Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-iccifort-2020.2.254-GCC-9.3.0.eb
new file mode 100644
index 000000000..155e0c334
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/o/OpenMPI/OpenMPI-4.1.0rc1-iccifort-2020.2.254-GCC-9.3.0.eb
@@ -0,0 +1,67 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '4.1.0rc1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-3 implementation."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'iccifort', 'version': '2020.2.254-GCC-9.3.0'}
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+osdependencies = [
+ # needed for --with-verbs
+ ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
+ # needed for --with-pmix
+ ('pmix-devel'),
+]
+
+builddependencies = [
+ ('Autotools', '20200321'),
+]
+
+dependencies = [
+ ('zlib', '1.2.11'),
+ ('hwloc', '2.2.0'),
+ ('UCX', '1.9.0', '', SYSTEM),
+ ('CUDA', '11.0', '', SYSTEM),
+ ('libevent', '2.1.12'),
+]
+
+configopts = '--enable-shared '
+configopts += '--with-hwloc=$EBROOTHWLOC ' # hwloc support
+configopts += '--with-ucx=$EBROOTUCX '
+configopts += '--with-verbs '
+configopts += '--with-libevent=$EBROOTLIBEVENT '
+configopts += '--without-orte '
+configopts += '--without-psm2 '
+configopts += '--disable-oshmem '
+configopts += '--with-cuda=$EBROOTCUDA '
+configopts += '--with-ime=/opt/ddn/ime '
+configopts += '--with-gpfs '
+
+# to enable SLURM integration (site-specific)
+configopts += '--with-slurm --with-pmix=external --with-libevent=external --with-ompi-pmix-rte'
+
+local_libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+sanity_check_paths = {
+ 'files': ["bin/%s" % local_binfile for local_binfile in ["ompi_info", "opal_wrapper"]] +
+ ["lib/lib%s.%s" % (local_libfile, SHLIB_EXT) for local_libfile in local_libs] +
+ ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
+ 'dirs': [],
+}
+
+# Add a family for our naming scheme
+modluafooter = '''
+family("mpi")
+add_property("arch","gpu")
+if not ( isloaded("mpi-settings") ) then
+ load("mpi-settings")
+end
+'''
+
+moduleclass = 'mpi'
diff --git a/Golden_Repo/jusuf_overlay/p/pscom/pscom-5.4-default.eb b/Golden_Repo/jusuf_overlay/p/pscom/pscom-5.4-default.eb
new file mode 100644
index 000000000..ad61598ba
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/p/pscom/pscom-5.4-default.eb
@@ -0,0 +1,50 @@
+easyblock = 'CMakeMake'
+
+name = 'pscom'
+# Create drop-in replacement version that ensures over-riding behaviour
+version = "5.4-default"
+local_realversion = "5.4.7-1"
+homepage = 'http://www.par-tec.com'
+description = """ParaStation is a robust and efficient cluster middleware, consisting of a high-performance
+communication layer (MPI) and a sophisticated management layer.
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+
+source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
+sources = ['%s.tar.gz' % local_realversion]
+
+builddependencies = [
+ ('popt', '1.16'),
+ ('CUDA', '11.0'),
+ ('CMake', '3.18.0'),
+]
+
+dependencies = [
+ ('UCX', '1.9.0'),
+]
+
+build_type = 'RelWithDebInfo'
+
+preconfigopts = 'export UCP_LDFLAGS="-L$EBROOTUCX/lib" && '
+preconfigopts += 'export CUDA_LDFLAGS="-L$EBROOTNVIDIA/lib64" &&'
+
+configopts = '-DCUDA_ENABLED=ON'
+
+sanity_check_paths = {
+ 'files': [
+ 'include/%(name)s.h',
+ ('lib/libpscom.so', 'lib64/libpscom.so'),
+ ('lib/libpscom4ucp.so', 'lib64/libpscom4ucp.so'),
+ ('lib/libpscom4openib.so', 'lib64/libpscom4openib.so'),
+ ],
+ 'dirs': [],
+}
+
+modextravars = {
+ 'PSCOMVERSION': '%s' % local_realversion,
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-9.3.0.eb b/Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-9.3.0.eb
index 8105e692e..18a9acd58 100644
--- a/Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-9.3.0.eb
+++ b/Golden_Repo/s/SoX/SoX-14.4.2-GCCcore-9.3.0.eb
@@ -15,6 +15,10 @@ source_urls = [SOURCEFORGE_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
checksums = ['b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c']
+builddependencies = {
+ ('binutils', '2.34')
+}
+
sanity_check_paths = {
'files': ['bin/play', 'bin/rec', 'bin/sox', 'bin/soxi', 'include/sox.h',
'lib/libsox.a', 'lib/libsox.%s' % SHLIB_EXT, 'lib/pkgconfig/sox.pc'],
--
GitLab