From 0fad7dc215ac9e6217a5e48fa6f1fe87e28fd986 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 5 Oct 2023 04:29:41 +0000 Subject: [PATCH 1/8] added the CDO package to the yml file --- eessi-2023.06-eb-4.7.2-2022a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.7.2-2022a.yml b/eessi-2023.06-eb-4.7.2-2022a.yml index 9991de1508..fb7d26f0c7 100644 --- a/eessi-2023.06-eb-4.7.2-2022a.yml +++ b/eessi-2023.06-eb-4.7.2-2022a.yml @@ -10,3 +10,4 @@ easyconfigs: - FFTW.MPI-3.3.10-gompi-2022a.eb - foss-2022a.eb - Python-3.10.4-GCCcore-11.3.0.eb + - CDO-2.0.6-gompi-2022a.eb From bb610d2831cc442a0aa87b4d60703cc6d95afdf6 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 5 Oct 2023 09:44:25 +0000 Subject: [PATCH 2/8] created the 4.8.1 yml file and added from easyblock option --- eessi-2023.06-eb-4.7.2-2022a.yml | 1 - eessi-2023.06-eb-4.8.1-2022a.yml | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 eessi-2023.06-eb-4.8.1-2022a.yml diff --git a/eessi-2023.06-eb-4.7.2-2022a.yml b/eessi-2023.06-eb-4.7.2-2022a.yml index fb7d26f0c7..9991de1508 100644 --- a/eessi-2023.06-eb-4.7.2-2022a.yml +++ b/eessi-2023.06-eb-4.7.2-2022a.yml @@ -10,4 +10,3 @@ easyconfigs: - FFTW.MPI-3.3.10-gompi-2022a.eb - foss-2022a.eb - Python-3.10.4-GCCcore-11.3.0.eb - - CDO-2.0.6-gompi-2022a.eb diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml new file mode 100644 index 0000000000..c73f6f0f9d --- /dev/null +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -0,0 +1,4 @@ +easyconfigs: + - CDO-2.0.6-gompi-2022a.eb: + options: + include-easyblocks-from-pr: 3012 From 02bf48c47594ca2ff06df25223c43d32ede7f2e1 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Fri, 20 Oct 2023 18:41:59 +0000 Subject: [PATCH 3/8] Only for trial reduced parallelism --- eessi-2023.06-eb-4.8.1-2022a.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 9e5bccc5c9..3709cedec0 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -63,8 +63,7 @@ easyconfigs: options: download-timeout: 1000 - ASE-3.22.1-foss-2022a.eb - - googletest-1.11.0-GCCcore-11.3.0.eb - - nlohmann_json-3.10.5-GCCcore-11.3.0.eb - CDO-2.0.6-gompi-2022a.eb: options: include-easyblocks-from-pr: 3012 + parallel: 1 From 5f16d373f592160ef5c60c83855fea305f1d35ee Mon Sep 17 00:00:00 2001 From: Richard Top Date: Fri, 20 Oct 2023 19:05:23 +0000 Subject: [PATCH 4/8] Only for trial reduced parallelism --- eessi-2023.06-eb-4.8.1-2022a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 3709cedec0..b6db763cd5 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -66,4 +66,4 @@ easyconfigs: - CDO-2.0.6-gompi-2022a.eb: options: include-easyblocks-from-pr: 3012 - parallel: 1 + parallel 1 From 375dbdda2d970253054538e4f2fc3326a5066992 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Fri, 20 Oct 2023 19:12:44 +0000 Subject: [PATCH 5/8] Only for trial reduced parallelism --- eessi-2023.06-eb-4.8.1-2022a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index b6db763cd5..e30af577f6 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -66,4 +66,4 @@ easyconfigs: - CDO-2.0.6-gompi-2022a.eb: options: include-easyblocks-from-pr: 3012 - parallel 1 + parallel: 2 From d492bd707ddcd4956ddaa46c475a7fceb3f938c0 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Mon, 23 Oct 2023 12:13:23 +0000 Subject: [PATCH 6/8] cleared additional configs --- eessi-2023.06-eb-4.8.1-2022a.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index e30af577f6..af4489cb09 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -66,4 +66,3 @@ easyconfigs: - CDO-2.0.6-gompi-2022a.eb: options: include-easyblocks-from-pr: 3012 - parallel: 2 From 51f33764e7dceefe20658bb203ee6c7628d75220 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Tue, 24 Oct 2023 07:20:17 +0000 Subject: [PATCH 7/8] added rebuild of SQLite --- eessi-2023.06-eb-4.8.1-2022a.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index af4489cb09..68278519c9 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -63,6 +63,9 @@ easyconfigs: options: download-timeout: 1000 - ASE-3.22.1-foss-2022a.eb + - SQLite-3.38.3-GCCcore-11.3.0.eb: + options: + force: - CDO-2.0.6-gompi-2022a.eb: options: include-easyblocks-from-pr: 3012 From b3d591a84fdbf2ca796d3e7a70d041b75cba875a Mon Sep 17 00:00:00 2001 From: Richard Top Date: Mon, 30 Oct 2023 10:44:10 +0000 Subject: [PATCH 8/8] EasyBuild 4.8.2 yml --- eessi-2023.06-eb-4.8.1-2022a.yml | 6 ------ eessi-2023.06-eb-4.8.2-2022a.yml | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 eessi-2023.06-eb-4.8.2-2022a.yml diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 68278519c9..840feb96bb 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -63,9 +63,3 @@ easyconfigs: options: download-timeout: 1000 - ASE-3.22.1-foss-2022a.eb - - SQLite-3.38.3-GCCcore-11.3.0.eb: - options: - force: - - CDO-2.0.6-gompi-2022a.eb: - options: - include-easyblocks-from-pr: 3012 diff --git a/eessi-2023.06-eb-4.8.2-2022a.yml b/eessi-2023.06-eb-4.8.2-2022a.yml new file mode 100644 index 0000000000..2a6721cd9a --- /dev/null +++ b/eessi-2023.06-eb-4.8.2-2022a.yml @@ -0,0 +1,2 @@ +easyconfigs: + - CDO-2.0.6-gompi-2022a.eb