Merge branch '2022' of...

Merge branch '2022' of https://gitlab.version.fz-juelich.de/hps-public/easybuild-repository into 2022

Golden_Repo/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb

@@ -16,8 +16,6 @@ description = """
  hardware so as to exploit it accordingly and efficiently.
 """
 
-site_contacts = 'sc@fz-juelich.de'
-
 toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 # need to build with -fno-tree-vectorize to avoid segfaulting lstopo on Intel Skylake
 # cfr. https://github.com/open-mpi/hwloc/issues/315

Overlays/jurecabooster_overlay/h/hwloc/hwloc-2.5.0-GCCcore-11.2.0.eb

+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '2.5.0'
+
+homepage = 'https://www.open-mpi.org/projects/hwloc/'
+
+description = """
+ The Portable Hardware Locality (hwloc) software package provides a portable
+ abstraction (across OS, versions, architectures, ...) of the hierarchical
+ topology of modern architectures, including NUMA memory nodes, sockets, shared
+ caches, cores and simultaneous multithreading. It also gathers various system
+ attributes such as cache and memory information as well as the locality of I/O
+ devices such as network interfaces, InfiniBand HCAs or GPUs. It primarily
+ aims at helping applications with gathering information about modern computing
+ hardware so as to exploit it accordingly and efficiently.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+# need to build with -fno-tree-vectorize to avoid segfaulting lstopo on Intel Skylake
+# cfr. https://github.com/open-mpi/hwloc/issues/315
+toolchainopts = {'vectorize': False}
+
+source_urls = ['https://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+checksums = ['38aa8102faec302791f6b4f0d23960a3ffa25af3af6af006c64dbecac23f852c']
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+dependencies = [
+    ('numactl', '2.0.14', '', SYSTEM),
+    ('libxml2', '2.9.10'),
+    ('libpciaccess', '0.16'),
+]
+
+configopts = "--enable-libnuma=$EBROOTNUMACTL "
+configopts += "--disable-cairo --disable-gl --disable-libudev "
+
+sanity_check_paths = {
+    'files': ['bin/lstopo', 'include/hwloc/linux.h',
+              'lib/libhwloc.%s' % SHLIB_EXT],
+    'dirs': ['share/man/man3'],
+}
+sanity_check_commands = ['lstopo']
+
+modluafooter = '''
+add_property("arch","gpu")
+'''
+moduleclass = 'system'

Overlays/jurecadc_overlay/b/BullMPI-settings/BullMPI-settings-4.1-CUDA.eb → Overlays/jurecadc_overlay/b/BullMPI-settings/BullMPI-settings-4.1-plain.eb

@@ -2,7 +2,7 @@ easyblock = 'SystemBundle'
 
 name = 'BullMPI-settings'
 version = '4.1'
-versionsuffix = 'CUDA'
+versionsuffix = 'plain'
 
 homepage = ''
 description = 'This module loads the default BullMPI configuration'