From e0401ac14ea7aef9a4de3a275c646527baff8536 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Sep 2024 20:02:17 +0200 Subject: [PATCH] {2023.06,a64fx}[foss/2023a] Highway v1.0.4 --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml | 1 + eb_hooks.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml index 2f884f1838..58907f0ba0 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml @@ -19,3 +19,4 @@ easyconfigs: # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841 from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649 - R-4.3.2-gfbf-2023a.eb + - Highway-1.0.4-GCCcore-12.3.0.eb diff --git a/eb_hooks.py b/eb_hooks.py index 6cac9b8609..3e095129f9 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -333,7 +333,7 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg Solve issues with compiling or running the tests on both neoverse_n1 and neoverse_v1 with Highway 1.0.4 and GCC 12.3.0: - for neoverse_n1 we set optarch to GENERIC - - for neoverse_v1 we completely disable the tests + - for neoverse_v1 and a64fx we completely disable the tests cfr. https://github.com/EESSI/software-layer/issues/469 """ if self.name == 'Highway': @@ -342,7 +342,7 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg # note: keep condition in sync with the one used in # post_prepare_hook_highway_handle_test_compilation_issues if self.version in ['1.0.4'] and tcname == 'GCCcore' and tcversion == '12.3.0': - if cpu_target == CPU_TARGET_NEOVERSE_V1: + if cpu_target in [CPU_TARGET_A64FX, CPU_TARGET_NEOVERSE_V1]: self.cfg.update('configopts', '-DHWY_ENABLE_TESTS=OFF') if cpu_target == CPU_TARGET_NEOVERSE_N1: self.orig_optarch = build_option('optarch')