Merge branch 'nessi.no-2023.06' of github.com:NorESSI/software-layer …

…into nessi-2023.06-Valgrind/3.21.0-gompi/2023a
NorESSI · Jun 19, 2024 · 08ca89b · 08ca89b
2 parents 6797511 + 88a7add
commit 08ca89b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/bot/test.sh b/bot/test.sh
@@ -206,7 +206,7 @@ else
 fi
 # Bind mount /sys/fs/cgroup so that we can determine the amount of memory available in our cgroup for
 # Reframe configuration
-TEST_STEP_ARGS+=("--extra-bind-paths" "/sys/fs/cgroup:/hostsys/fs/cgroup:ro")
+# TEST_STEP_ARGS+=("--extra-bind-paths" "/sys/fs/cgroup:/hostsys/fs/cgroup:ro")
 
 # prepare arguments to test_suite.sh (specific to test step)
 declare -a TEST_SUITE_ARGS=()

diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml
@@ -6,3 +6,6 @@ easyconfigs:
   - cuDNN-8.9.2.26-CUDA-12.1.1.eb
   - cuTENSOR-2.0.1.2-CUDA-12.1.1.eb
   - Nextflow-23.10.0.eb
+  - EasyBuild-4.9.2.eb:
+      options:
+        from-pr: 20818
diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - grpcio-1.57.0-GCCcore-12.3.0.eb
diff --git a/eb_hooks.py b/eb_hooks.py
@@ -231,6 +231,15 @@ def parse_hook_gpaw_harcoded_path(ec, eprefix):
         raise EasyBuildError("GPAW-specific hook triggered for non-GPAW easyconfig?!")
 
 
+def parse_hook_grpcio_zlib(ec, ecprefix):
+    if ec.name == 'grpcio' and ec.version in ['1.57.0']:
+        exts_list = ec['exts_list']
+        (exts_list[0][2])['preinstallopts'] = "sed -i 's@/usr@%(sysroot)s/usr@g' setup.py && export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=%(parallel)s && export GRPC_PYTHON_CFLAGS=\"-fvisibility=hidden -fno-wrapv -fno-exceptions\" &&GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False GRPC_PYTHON_BUILD_SYSTEM_RE2=True GRPC_PYTHON_BUILD_SYSTEM_ABSL=True"
+        print_msg("Modified the easyconfig to use compat ZLIB with GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False")
+    else:
+        raise EasyBuildError("grpcio-specific hook triggered for a non-grpcio easyconfig?!")
+
+
 def parse_hook_imagemagick_add_dependency(ec, eprefix):
     """Add dependency for PCRE/8.45 for ImageMagick/7.1.0-37"""
     if ec.name == 'ImageMagick':
@@ -937,6 +946,7 @@ def pre_module_hook_librosa_augment_modluafooter(self, *args, **kwargs):
     'CGAL': parse_hook_cgal_toolchainopts_precise,
     'fontconfig': parse_hook_fontconfig_add_fonts,
     'GPAW': parse_hook_gpaw_harcoded_path,
+    'grpcio': parse_hook_grpcio_zlib,
     'ImageMagick': parse_hook_imagemagick_add_dependency,
     'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64,
     'librosa': parse_hook_librosa_custom_ctypes,

diff --git a/reframe_config_bot.py.tmpl b/reframe_config_bot.py.tmpl
@@ -34,11 +34,11 @@ site_configuration = {
                             'options': ['--mem={size}'],
                         }
                     ],
-                    'extras': {
-                        # Make sure to round down, otherwise a job might ask for more mem than is available
-                        # per node
-                        'mem_per_node': __MEM_PER_NODE__,
-                    },
+#                    'extras': {
+#                        # Make sure to round down, otherwise a job might ask for more mem than is available
+#                        # per node
+#                        'mem_per_node': __MEM_PER_NODE__,
+#                    },
                     'max_jobs': 1
                     }
                 ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		easyconfigs:
		- grpcio-1.57.0-GCCcore-12.3.0.eb