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

…into nessi-2023.06-Valgrind/3.21.0-gompi/2023a
NorESSI · Jun 17, 2024 · afd4680 · afd4680
2 parents 073ab08 + e53ada5
commit afd4680
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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/test_suite.sh b/test_suite.sh
@@ -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