From 74a37138d3729d571d9161b4e0595f6cb9ecc592 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Tue, 10 Sep 2024 13:05:18 +0200 Subject: [PATCH 1/3] Fix typo in `create_lmodsitepackage.py` Current typo results in the following problem ```bash [ritop7377@login-2.BETZY ~]$ ml Currently Loaded Modules: 1) StdEnv (S) 2) EESSI/2023.06 Where: S: Module is Sticky, requires --force to unload or purge [ritop@login ~]$ module purge /usr/bin/lua: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/.lmod/SitePackage.lua:21: variable 'False' is not declared stack traceback: [C]: in function 'error' /cluster/installations/lmod/lmod/libexec/../tools/strict.lua:36: in function /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/.lmod/SitePackage.lua:21: in function 'from_eessi_prefix' /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/.lmod/SitePackage.lua:189: in function (tail call): ? /cluster/installations/lmod/lmod/libexec/Master.lua:381: in function 'load' /cluster/installations/lmod/lmod/libexec/MasterControl.lua:1009: in function 'load' /cluster/installations/lmod/lmod/libexec/Master.lua:773: in function 'reload_sticky' /cluster/installations/lmod/lmod/libexec/MasterControl.lua:1120: in function 'unload_usr' /cluster/installations/lmod/lmod/libexec/cmdfuncs.lua:496: in function 'Purge' /cluster/installations/lmod/lmod/libexec/cmdfuncs.lua:473: in function 'cmd' /cluster/installations/lmod/lmod/libexec/lmod:512: in function 'main' /cluster/installations/lmod/lmod/libexec/lmod:570: in main chunk [C]: ? ``` --- create_lmodsitepackage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_lmodsitepackage.py b/create_lmodsitepackage.py index 7e55bce2a5..62f073c9a6 100755 --- a/create_lmodsitepackage.py +++ b/create_lmodsitepackage.py @@ -28,7 +28,7 @@ -- If EESSI_PREFIX wasn't defined, we cannot check if this module was from the EESSI environment -- In that case, we assume it isn't, otherwise EESSI_PREFIX would (probably) have been set if eessi_prefix == nil then - return False + return false else -- NOTE: exact paths for site so may need to be updated later. -- See https://github.com/EESSI/software-layer/pull/371 From e0401ac14ea7aef9a4de3a275c646527baff8536 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Sep 2024 20:02:17 +0200 Subject: [PATCH 2/3] {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') From 0ba9c3f1abfbdcdb7d29bd7fafa67793df9094c2 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 10 Sep 2024 20:22:06 +0200 Subject: [PATCH 3/3] {2023.06,a64fx}[foss/2023a] Brunsli v0.1 --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml | 4 ++++ 1 file changed, 4 insertions(+) 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..1fd5fb6d14 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,7 @@ easyconfigs: # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841 from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649 - R-4.3.2-gfbf-2023a.eb + - Brunsli-0.1-GCCcore-12.3.0.eb: + options: + # https://github.com/easybuilders/easybuild-easyconfigs/pull/21366 + from-commit: 1736a123b1685836452587a5c51793257570bb2d