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

…into nessi-2023.06-grpcio/1.57.0-GCCcore/12.3.0
NorESSI · Jun 18, 2024 · fd25cdd · fd25cdd
2 parents 45a963b + 32c20ba
commit fd25cdd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 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.1-2023b.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023b.yml
@@ -26,3 +26,6 @@ easyconfigs:
   - IPython-8.17.2-GCCcore-13.2.0.eb
   - Qt5-5.15.13-GCCcore-13.2.0.eb
   - NLTK-3.8.1-foss-2023b.eb
+  - Valgrind-3.23.0-gompi-2023b.eb:
+      options:
+        from-pr: 20792
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
                     }
                 ]

diff --git a/test_suite.sh b/test_suite.sh
@@ -165,7 +165,7 @@ if [[ "${cpuinfo}" =~ (Core\(s\) per socket:[^0-9]*([0-9]+)) ]]; then
 else
     fatal_error "Failed to get the number of cores per socket for the current test hardware with lscpu."
 fi
-cgroup_mem_bytes=$(cat /hostsys/fs/cgroup/memory/slurm/uid_${UID}/job_${SLURM_JOB_ID}/memory.limit_in_bytes)
+# cgroup_mem_bytes=$(cat /hostsys/fs/cgroup/memory/slurm/uid_${UID}/job_${SLURM_JOB_ID}/memory.limit_in_bytes)
 if [[ $? -eq 0 ]]; then
     # Convert to MiB
     cgroup_mem_mib=$((cgroup_mem_bytes/(1024*1024)))
@@ -177,7 +177,8 @@ sed -i "s/__NUM_CPUS__/${cpu_count}/g" $RFM_CONFIG_FILES
 sed -i "s/__NUM_SOCKETS__/${socket_count}/g" $RFM_CONFIG_FILES
 sed -i "s/__NUM_CPUS_PER_CORE__/${threads_per_core}/g" $RFM_CONFIG_FILES
 sed -i "s/__NUM_CPUS_PER_SOCKET__/${cores_per_socket}/g" $RFM_CONFIG_FILES
-sed -i "s/__MEM_PER_NODE__/${cgroup_mem_mib}/g" $RFM_CONFIG_FILES
+# on local systems the change below is not the case, it works on AWS
+# sed -i "s/__MEM_PER_NODE__/${cgroup_mem_mib}/g" $RFM_CONFIG_FILES
 
 # Workaround for https://github.com/EESSI/software-layer/pull/467#issuecomment-1973341966
 export PSM3_DEVICES='self,shm'  # this is enough, since we only run single node for now