From fb8bbd114deed64698faa5700ad22a518e7b019a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 23 Oct 2024 15:46:05 +0200 Subject: [PATCH 1/8] make 4.9.4 2023b easystack file, add Score-P --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml new file mode 100644 index 0000000000..3b6234ffce --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml @@ -0,0 +1,2 @@ +easyconfigs: + - Score-P-8.4-gompi-2023b.eb From ecf97e3a2c672f69e96da8331283f675703439e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 25 Oct 2024 16:36:53 +0200 Subject: [PATCH 2/8] add SIONlib from a specific commit --- .../2023.06/eessi-2023.06-eb-4.9.4-2023b.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml index 3b6234ffce..e20d3daa38 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml @@ -1,2 +1,6 @@ easyconfigs: + - SIONlib-1.7.7-GCCcore-13.2.0.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21748 + from-commit: 253198299616e4069327797374e579077aa8dfa5 - Score-P-8.4-gompi-2023b.eb From 5856c2e605e57b7bb2522f713eae5adb3c77b57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 25 Oct 2024 16:45:19 +0200 Subject: [PATCH 3/8] use correct filename for SIONlib easyconfig --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml index e20d3daa38..d5ff8f31b9 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml @@ -1,5 +1,5 @@ easyconfigs: - - SIONlib-1.7.7-GCCcore-13.2.0.eb: + - SIONlib-1.7.7-GCCcore-13.2.0-tools.eb: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21748 from-commit: 253198299616e4069327797374e579077aa8dfa5 From e2574ee73269338fa7258ff7eb6a820c2ed3a47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 25 Oct 2024 17:23:54 +0200 Subject: [PATCH 4/8] add hook for Score-P for picking up libbfd from compat layer --- eb_hooks.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index a3ae6bbc05..03642656ea 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -414,6 +414,29 @@ def pre_configure_hook_BLIS_a64fx(self, *args, **kwargs): raise EasyBuildError("BLIS-specific hook triggered for non-BLIS easyconfig?!") +def pre_configure_hook_score_p(self, *args, **kwargs): + """ + Pre-configure hook for Score-p + - specify correct path to binutils (in compat layer) + """ + if self.name == 'Score-P': + + # determine path to Prefix installation in compat layer via $EPREFIX + eprefix = get_eessi_envvar('EPREFIX') + + binutils_lib_path_glob_pattern = os.path.join(eprefix, 'usr', 'lib*', 'binutils', '*-linux-gnu', '2.*') + binutils_lib_path = glob.glob(binutils_lib_path_glob_pattern) + if len(binutils_lib_path) == 1: + self.cfg.update('configopts', '--with-libbfd-lib=' + binutils_lib_path[0]) + self.cfg.update('configopts', '--with-libbfd-include=' + os.path.join(binutils_lib_path[0], 'include')) + else: + raise EasyBuildError("Failed to isolate path for binutils libraries using %s, got %s", + binutils_lib_path_glob_pattern, binutils_lib_path) + + else: + raise EasyBuildError("Score-P-specific hook triggered for non-Score-P easyconfig?!") + + def pre_configure_hook_extrae(self, *args, **kwargs): """ Pre-configure hook for Extrae @@ -972,6 +995,7 @@ def inject_gpu_property(ec): 'OpenBLAS': pre_configure_hook_openblas_optarch_generic, 'WRF': pre_configure_hook_wrf_aarch64, 'LAMMPS': pre_configure_hook_LAMMPS_zen4, + 'Score-P': pre_configure_hook_score_p, } PRE_TEST_HOOKS = { From 5901d41130c53d51563681622aba0419546ceacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 28 Oct 2024 11:02:15 +0100 Subject: [PATCH 5/8] use newer commit for SIONlib, includes a fix for non-x86-64 architectures --- .../2023.06/eessi-2023.06-eb-4.9.4-2023b.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml index d5ff8f31b9..8edf3c84b0 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml @@ -1,6 +1,6 @@ easyconfigs: - SIONlib-1.7.7-GCCcore-13.2.0-tools.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21748 - from-commit: 253198299616e4069327797374e579077aa8dfa5 + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21752 + from-commit: 6b8b53493a1188a5baa56a133574daac239730e7 - Score-P-8.4-gompi-2023b.eb From a7044806eb149fec5b5aa1c128ef6ca114b0ec55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 29 Oct 2024 09:46:15 +0100 Subject: [PATCH 6/8] use modified easyblock for Score-P --- .../2023.06/eessi-2023.06-eb-4.9.4-2023b.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml index 8edf3c84b0..a63ccf8bc0 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml @@ -3,4 +3,7 @@ easyconfigs: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21752 from-commit: 6b8b53493a1188a5baa56a133574daac239730e7 - - Score-P-8.4-gompi-2023b.eb + - Score-P-8.4-gompi-2023b.eb: + options: + # see https://github.com/easybuilders/easybuild-easyblocks/pull/3496 + include-easyblocks-from-commit: 6b7efa90f35a71c6be2ccc37096915f8a1f57225 From 7b90c46732e6dff8929f13cf4d572ec80e60b96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 29 Oct 2024 11:48:09 +0100 Subject: [PATCH 7/8] use newer commit of easyblock --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml index a63ccf8bc0..89312b1e49 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml @@ -6,4 +6,4 @@ easyconfigs: - Score-P-8.4-gompi-2023b.eb: options: # see https://github.com/easybuilders/easybuild-easyblocks/pull/3496 - include-easyblocks-from-commit: 6b7efa90f35a71c6be2ccc37096915f8a1f57225 + include-easyblocks-from-commit: f23d154eb75b72767557f78a178eb31ae9ac9d9c From 2bc14d1db0d418801a5ac3cbadad95bad55be28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 29 Oct 2024 13:49:48 +0100 Subject: [PATCH 8/8] use newer commit of easyblock --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml index 89312b1e49..099df62c08 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml @@ -6,4 +6,4 @@ easyconfigs: - Score-P-8.4-gompi-2023b.eb: options: # see https://github.com/easybuilders/easybuild-easyblocks/pull/3496 - include-easyblocks-from-commit: f23d154eb75b72767557f78a178eb31ae9ac9d9c + include-easyblocks-from-commit: 60633b0acfd41a0732992d9e16800dae71a056eb