From 060e9815f905b28dd963fda12ba9bdfd4163b94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 18 Jul 2024 16:05:55 +0200 Subject: [PATCH 01/11] add R 4.4.1 and R-bundle-CRAN 2024.06 --- .../2023.06/eessi-2023.06-eb-4.9.2-2023b.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml index e0057f18ab..c371fb16bc 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml @@ -5,3 +5,10 @@ easyconfigs: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20889 from-commit: c66c4788a17f7e4f55aa23f9fdb782aad97c9ce7 + - R-4.4.1-gfbf-2023b.eb + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 + from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c + - R-bundle-CRAN-2024.06-foss-2023b.eb + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 + from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c From de84033c321129be15d986a0665821dc1210967e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 18 Jul 2024 16:21:55 +0200 Subject: [PATCH 02/11] add missing colons --- .../2023.06/eessi-2023.06-eb-4.9.2-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.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml index c371fb16bc..7a0b70867d 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml @@ -5,10 +5,10 @@ easyconfigs: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20889 from-commit: c66c4788a17f7e4f55aa23f9fdb782aad97c9ce7 - - R-4.4.1-gfbf-2023b.eb + - R-4.4.1-gfbf-2023b.eb: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c - - R-bundle-CRAN-2024.06-foss-2023b.eb + - R-bundle-CRAN-2024.06-foss-2023b.eb: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c From a3b713479fa42f2e720bbe491713953b53b2b6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 18 Jul 2024 16:42:11 +0200 Subject: [PATCH 03/11] add missing options key --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml index 7a0b70867d..9779adfc4d 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml @@ -10,5 +10,6 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c - R-bundle-CRAN-2024.06-foss-2023b.eb: + options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c From b3faff32e0dbdb55f6a86ad8fc45ceaaf01adf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 19 Jul 2024 09:36:05 +0200 Subject: [PATCH 04/11] add hook that fixes Pango+GObject-Introspection issue --- eb_hooks.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index 3b381e5963..5c8d19f052 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -439,6 +439,21 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs): raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!") +def pre_configure_hook_pango_filter_ld_library_path(self, *args, **kwargs): + """ + pre-configure hook for Pango: + - instruct GObject-Introspection's g-ir-scanner tool to not set $LD_LIBRARY_PATH + when EasyBuild is configured to filter it, see: + https://github.com/EESSI/software-layer/issues/196 + """ + if self.name == 'Pango' and self.version in ['1.51.0']: + if build_option('filter_env_vars') and 'LD_LIBRARY_PATH' in build_option('filter_env_vars'): + sed_cmd = 'sed -i "s/gir_args = \[/gir_args = \[\\n \'--lib-dirs-envvar=FILTER_LD_LIBRARY_PATH\',/g" %(start_dir)s/pango/meson.build && ' + self.cfg.update('preconfigopts', sed_cmd) + else: + raise EasyBuildError("Pango-specific hook triggered for non-Pango easyconfig?!") + + def pre_configure_hook_atspi2core_filter_ld_library_path(self, *args, **kwargs): """ pre-configure hook for at-spi2-core: @@ -719,6 +734,7 @@ def inject_gpu_property(ec): 'libfabric': pre_configure_hook_libfabric_disable_psm3_x86_64_generic, 'MetaBAT': pre_configure_hook_metabat_filtered_zlib_dep, 'OpenBLAS': pre_configure_hook_openblas_optarch_generic, + 'Pango': pre_configure_hook_pango_filter_ld_library_path, 'WRF': pre_configure_hook_wrf_aarch64, } From ba755b26f79dfdc8b3702b2c2e3e5ceff3fcb23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 19 Jul 2024 17:07:56 +0200 Subject: [PATCH 05/11] remove Pango hook again, fixed in GObject-Introspection --- eb_hooks.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/eb_hooks.py b/eb_hooks.py index 5c8d19f052..3b381e5963 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -439,21 +439,6 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs): raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!") -def pre_configure_hook_pango_filter_ld_library_path(self, *args, **kwargs): - """ - pre-configure hook for Pango: - - instruct GObject-Introspection's g-ir-scanner tool to not set $LD_LIBRARY_PATH - when EasyBuild is configured to filter it, see: - https://github.com/EESSI/software-layer/issues/196 - """ - if self.name == 'Pango' and self.version in ['1.51.0']: - if build_option('filter_env_vars') and 'LD_LIBRARY_PATH' in build_option('filter_env_vars'): - sed_cmd = 'sed -i "s/gir_args = \[/gir_args = \[\\n \'--lib-dirs-envvar=FILTER_LD_LIBRARY_PATH\',/g" %(start_dir)s/pango/meson.build && ' - self.cfg.update('preconfigopts', sed_cmd) - else: - raise EasyBuildError("Pango-specific hook triggered for non-Pango easyconfig?!") - - def pre_configure_hook_atspi2core_filter_ld_library_path(self, *args, **kwargs): """ pre-configure hook for at-spi2-core: @@ -734,7 +719,6 @@ def inject_gpu_property(ec): 'libfabric': pre_configure_hook_libfabric_disable_psm3_x86_64_generic, 'MetaBAT': pre_configure_hook_metabat_filtered_zlib_dep, 'OpenBLAS': pre_configure_hook_openblas_optarch_generic, - 'Pango': pre_configure_hook_pango_filter_ld_library_path, 'WRF': pre_configure_hook_wrf_aarch64, } From f2f40ceac1d4af66d304e155d55c98369b165eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Sat, 20 Jul 2024 13:48:38 +0200 Subject: [PATCH 06/11] disable Highway tests for now on neoverse v1 --- eb_hooks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index 73adce90f1..e497109986 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -318,6 +318,9 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg if cpu_target == CPU_TARGET_NEOVERSE_N1: self.orig_optarch = build_option('optarch') update_build_option('optarch', OPTARCH_GENERIC) + if self.version in ['1.0.7'] and tcname == 'GCCcore' and tcversion == '13.2.0': + if cpu_target == CPU_TARGET_NEOVERSE_V1: + self.cfg.update('configopts', '-DHWY_ENABLE_TESTS=OFF') else: raise EasyBuildError("Highway-specific hook triggered for non-Highway easyconfig?!") From e8dab521b86fb9b78e1ef4b44abb16da38236b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Sat, 20 Jul 2024 16:53:45 +0200 Subject: [PATCH 07/11] Disable Highway 1.0.7 tests for all Arm targets --- eb_hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eb_hooks.py b/eb_hooks.py index e497109986..4a6068f7fa 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -319,7 +319,7 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg self.orig_optarch = build_option('optarch') update_build_option('optarch', OPTARCH_GENERIC) if self.version in ['1.0.7'] and tcname == 'GCCcore' and tcversion == '13.2.0': - if cpu_target == CPU_TARGET_NEOVERSE_V1: + if os.getenv('EESSI_CPU_FAMILY') == 'aarch64': self.cfg.update('configopts', '-DHWY_ENABLE_TESTS=OFF') else: raise EasyBuildError("Highway-specific hook triggered for non-Highway easyconfig?!") From 42c41e98d5283022ddc897d3c908f77090fa31d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 22 Jul 2024 21:54:59 +0200 Subject: [PATCH 08/11] Use newer commit from R PR --- .../2023.06/eessi-2023.06-eb-4.9.2-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.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml index 25fcc3cf75..25a41413c9 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml @@ -14,8 +14,8 @@ easyconfigs: - R-4.4.1-gfbf-2023b.eb: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 - from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c + from-commit: 12ef0f174250928ca9a5ccf47e4f7ca0ce56811f - R-bundle-CRAN-2024.06-foss-2023b.eb: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 - from-commit: 37e673217efbecc359d6008dcf19f8dbf72e777c \ No newline at end of file + from-commit: 12ef0f174250928ca9a5ccf47e4f7ca0ce56811f \ No newline at end of file From 32ede2008efd3517f275af1ec4dbf8e7b46e90f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 10 Sep 2024 20:27:05 +0200 Subject: [PATCH 09/11] remove hook for Highway 1.0.7 again --- eb_hooks.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/eb_hooks.py b/eb_hooks.py index 4a6068f7fa..73adce90f1 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -318,9 +318,6 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg if cpu_target == CPU_TARGET_NEOVERSE_N1: self.orig_optarch = build_option('optarch') update_build_option('optarch', OPTARCH_GENERIC) - if self.version in ['1.0.7'] and tcname == 'GCCcore' and tcversion == '13.2.0': - if os.getenv('EESSI_CPU_FAMILY') == 'aarch64': - self.cfg.update('configopts', '-DHWY_ENABLE_TESTS=OFF') else: raise EasyBuildError("Highway-specific hook triggered for non-Highway easyconfig?!") From ea9d4691131c3e133717c6ebf00a984df976538a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 10 Sep 2024 22:31:56 +0200 Subject: [PATCH 10/11] Toolchain for Brunsli was wrong --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-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.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml index 401410fc1b..863fe5e2e0 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml @@ -20,7 +20,7 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21200 from-commit: 765ba900daf5953e306c4dad896febe52fdd6c00 - HPL-2.3-foss-2023b.eb - - Brunsli-0.1-GCCcore-12.3.0.eb: + - Brunsli-0.1-GCCcore-13.2.0.eb: options: # https://github.com/easybuilders/easybuild-easyconfigs/pull/21366 from-commit: 1736a123b1685836452587a5c51793257570bb2d From a6999fa80881584a4b4dee634c458eda0f1f90f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 11 Sep 2024 16:14:48 +0200 Subject: [PATCH 11/11] remove explicitly listed R, use newer commit for R-bundle-CRAN --- .../2023.06/eessi-2023.06-eb-4.9.2-2023b.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml index 863fe5e2e0..6398f014dc 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml @@ -24,11 +24,7 @@ easyconfigs: options: # https://github.com/easybuilders/easybuild-easyconfigs/pull/21366 from-commit: 1736a123b1685836452587a5c51793257570bb2d - - R-4.4.1-gfbf-2023b.eb: - options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 - from-commit: 12ef0f174250928ca9a5ccf47e4f7ca0ce56811f - R-bundle-CRAN-2024.06-foss-2023b.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20898 - from-commit: 12ef0f174250928ca9a5ccf47e4f7ca0ce56811f + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21285 + from-commit: 41a2cd83f9fb017b76f0693f6a264d8acb548317