Skip to content

Commit 7575459

Browse files
authored
Merge branch '2023.06-software.eessi.io' into 2023.06-software.eessi.io_a64fx_waLBerla_2023a
2 parents 6c16231 + 3033386 commit 7575459

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
easyconfigs:
2+
- ROOT-6.30.06-foss-2023a.eb:
3+
options:
4+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526
5+
from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df
6+
# see https://github.com/easybuilders/easybuild-easyblocks/pull/3467
7+
include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601
28
- waLBerla-6.1-foss-2023a.eb:
39
options:
410
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21600
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
easyconfigs:
22
- SciPy-bundle-2023.11-gfbf-2023b.eb
3+
- ESPResSo-4.2.2-foss-2023b.eb
4+
- pyMBE-0.8.0-foss-2023b.eb

eb_hooks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def post_ready_hook(self, *args, **kwargs):
9191
memory_hungry_build = self.name in ['libxc', 'MBX', 'TensorFlow']
9292
# on A64FX systems, (HBM) memory is typically scarce, so we need to use fewer cores for some builds
9393
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
94-
memory_hungry_build_a64fx = cpu_target == CPU_TARGET_A64FX and self.name in ['Qt5']
94+
memory_hungry_build_a64fx = cpu_target == CPU_TARGET_A64FX and self.name in ['Qt5', 'ROOT']
9595
if memory_hungry_build or memory_hungry_build_a64fx:
9696
parallel = self.cfg['parallel']
9797
if parallel > 1:

0 commit comments

Comments
 (0)