Skip to content

Commit 648c04f

Browse files
author
Richard Top
committed
Merge branch '2023.06-software.eessi.io' of ssh://github.com/EESSI/software-layer into eessi-2023.06-Redland/1.0.17-GCC/12.3.0
2 parents 45b28f0 + 9e363d7 commit 648c04f

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

create_lmodsitepackage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
-- If EESSI_PREFIX wasn't defined, we cannot check if this module was from the EESSI environment
2929
-- In that case, we assume it isn't, otherwise EESSI_PREFIX would (probably) have been set
3030
if eessi_prefix == nil then
31-
return False
31+
return false
3232
else
3333
-- NOTE: exact paths for site so may need to be updated later.
3434
-- See https://github.com/EESSI/software-layer/pull/371

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,8 @@ easyconfigs:
1919
# https://github.com/easybuilders/easybuild-easyconfigs/pull/20841
2020
from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649
2121
- R-4.3.2-gfbf-2023a.eb
22+
- Highway-1.0.4-GCCcore-12.3.0.eb
23+
- Brunsli-0.1-GCCcore-12.3.0.eb:
24+
options:
25+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/21366
26+
from-commit: 1736a123b1685836452587a5c51793257570bb2d

eb_hooks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg
333333
Solve issues with compiling or running the tests on both
334334
neoverse_n1 and neoverse_v1 with Highway 1.0.4 and GCC 12.3.0:
335335
- for neoverse_n1 we set optarch to GENERIC
336-
- for neoverse_v1 we completely disable the tests
336+
- for neoverse_v1 and a64fx we completely disable the tests
337337
cfr. https://github.com/EESSI/software-layer/issues/469
338338
"""
339339
if self.name == 'Highway':
@@ -342,7 +342,7 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg
342342
# note: keep condition in sync with the one used in
343343
# post_prepare_hook_highway_handle_test_compilation_issues
344344
if self.version in ['1.0.4'] and tcname == 'GCCcore' and tcversion == '12.3.0':
345-
if cpu_target == CPU_TARGET_NEOVERSE_V1:
345+
if cpu_target in [CPU_TARGET_A64FX, CPU_TARGET_NEOVERSE_V1]:
346346
self.cfg.update('configopts', '-DHWY_ENABLE_TESTS=OFF')
347347
if cpu_target == CPU_TARGET_NEOVERSE_N1:
348348
self.orig_optarch = build_option('optarch')

0 commit comments

Comments
 (0)