From 71d00b05a7acb759afd418dcae10264675102bc2 Mon Sep 17 00:00:00 2001 From: TopRichard Date: Thu, 29 Jun 2023 06:52:52 +0000 Subject: [PATCH 1/5] {2023.06}[foss/2021a] WRF-dmpar V4.3 --- eessi-2023.06-eb-4.7.2-2021a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 461c22b7ed..03aa6e406e 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -7,3 +7,4 @@ easyconfigs: - libpng-1.6.37-GCCcore-10.3.0.eb: - libjpeg-turbo-2.0.6-GCCcore-10.3.0.eb - QuantumESPRESSO-6.7-foss-2021a.eb + - WRF-4.3-foss-2021a-dmpar.eb From 536b8794e6f6fffa974f33096f558fcce1241c97 Mon Sep 17 00:00:00 2001 From: TopRichard Date: Mon, 18 Sep 2023 14:03:49 +0000 Subject: [PATCH 2/5] modified the WRF-hook --- eb_hooks.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eb_hooks.py b/eb_hooks.py index 9f6c60039d..23edd32a50 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -253,15 +253,13 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs): if self.name == 'WRF': wrfversion = int((self.version).replace(".","")) if get_cpu_architecture() == AARCH64: + pattern = "Linux x86_64 ppc64le, gfortran" + repl = "Linux x86_64 aarch64 ppc64le, gfortran" if wrfversion <= 39: - pattern = "Linux x86_64 ppc64le, gfortran" - repl = "Linux x86_64 aarch64 ppc64le, gfortran" self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl)) print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts']) if 400 <= wrfversion <= 421: - pattern = "Linux x86_64 ppc64le, gfortran" - repl = "Linux x86_64 aarch64 ppc64le, gfortran" self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure.defaults && " % (pattern, repl)) print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts']) else: From 7cc4a1b9afc68200012f11f2a8693642066036b4 Mon Sep 17 00:00:00 2001 From: TopRichard Date: Mon, 18 Sep 2023 16:11:28 +0000 Subject: [PATCH 3/5] modified the WRF-hook using LooseVersion --- eb_hooks.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eb_hooks.py b/eb_hooks.py index 23edd32a50..db01bb9007 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -251,15 +251,14 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs): - patch arch/configure_new.defaults so building WRF with foss toolchain works on aarch64 """ if self.name == 'WRF': - wrfversion = int((self.version).replace(".","")) if get_cpu_architecture() == AARCH64: pattern = "Linux x86_64 ppc64le, gfortran" repl = "Linux x86_64 aarch64 ppc64le, gfortran" - if wrfversion <= 39: + if LooseVersion(self.version) <= LooseVersion('3.9.0'): self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl)) print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts']) - if 400 <= wrfversion <= 421: + if LooseVersion('4.0.0') <= LooseVersion(self.version) <= LooseVersion('4.2.1'): self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure.defaults && " % (pattern, repl)) print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts']) else: From 1cdf369fa786131409495fa052c2fca30dc9281f Mon Sep 17 00:00:00 2001 From: TopRichard Date: Thu, 21 Sep 2023 10:45:02 +0000 Subject: [PATCH 4/5] added easyblocks from-pr --- eessi-2023.06-eb-4.7.2-2021a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 805da235eb..007809db88 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -25,3 +25,4 @@ easyconfigs: options: from-pr: 18348 - WRF-4.3-foss-2021a-dmpar.eb + include-easyblocks-from-pr: 3006 From 985805a8a74b5a80a21631038780fbbf7374a675 Mon Sep 17 00:00:00 2001 From: TopRichard Date: Thu, 21 Sep 2023 10:46:41 +0000 Subject: [PATCH 5/5] easyblocks from-pr-3006 --- eessi-2023.06-eb-4.7.2-2021a.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 007809db88..e04f669ba9 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -24,5 +24,6 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18348 options: from-pr: 18348 - - WRF-4.3-foss-2021a-dmpar.eb + - WRF-4.3-foss-2021a-dmpar.eb: + options: include-easyblocks-from-pr: 3006