Merge branch '2023.06-software.eessi.io' into 2023.06-software.eessi.…

…io_a64fx_waLBerla_2023a
EESSI · Oct 15, 2024 · 7575459 · 7575459
2 parents 6c16231 + 3033386
commit 7575459
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml
@@ -1,4 +1,10 @@
 easyconfigs:
+  - ROOT-6.30.06-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526
+        from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467
+        include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601
   - waLBerla-6.1-foss-2023a.eb:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21600

diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml
@@ -1,2 +1,4 @@
 easyconfigs:
   - SciPy-bundle-2023.11-gfbf-2023b.eb
+  - ESPResSo-4.2.2-foss-2023b.eb
+  - pyMBE-0.8.0-foss-2023b.eb
diff --git a/eb_hooks.py b/eb_hooks.py
@@ -91,7 +91,7 @@ def post_ready_hook(self, *args, **kwargs):
     memory_hungry_build = self.name in ['libxc', 'MBX', 'TensorFlow']
     # on A64FX systems, (HBM) memory is typically scarce, so we need to use fewer cores for some builds
     cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
-    memory_hungry_build_a64fx = cpu_target == CPU_TARGET_A64FX and self.name in ['Qt5']
+    memory_hungry_build_a64fx = cpu_target == CPU_TARGET_A64FX and self.name in ['Qt5', 'ROOT']
     if memory_hungry_build or memory_hungry_build_a64fx:
         parallel = self.cfg['parallel']
         if parallel > 1: