From 4dbdf5294ee5d8469a5593ab46118ad3895b51aa Mon Sep 17 00:00:00 2001 From: Evan Parker Date: Tue, 29 Sep 2026 21:00:38 +0000 Subject: [PATCH 1/2] Update gsibec --- configs/common/packages.yaml | 2 +- configs/containers/specs/jedi-ci.yaml | 2 +- configs/sites/tier1/acorn/packages_intel-19.1.3.304.yaml | 2 -- configs/sites/tier1/acorn/packages_oneapi-2024.2.1.yaml | 2 -- configs/sites/tier1/aws-pcluster/packages_intel.yaml | 2 +- configs/sites/tier1/hera/packages_intel.yaml | 2 +- configs/sites/tier1/hera/packages_oneapi.yaml | 2 +- configs/sites/tier1/noaa-gcloud/packages_intel.yaml | 2 +- configs/sites/tier1/noaa-gcloud/packages_oneapi.yaml | 2 +- configs/sites/tier1/wcoss2/packages_intel-19.1.3.304.yaml | 2 -- configs/sites/tier1/wcoss2/packages_oneapi-2024.2.1.yaml | 2 -- configs/sites/tier2/gaea-c5/packages_intel.yaml | 2 +- configs/sites/tier2/s4/packages_intel.yaml | 2 +- configs/sites/tier2/s4/packages_oneapi.yaml | 2 +- repos/builtin | 2 +- 15 files changed, 11 insertions(+), 19 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 5a603b534..b4dcfec9c 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -228,7 +228,7 @@ packages: - '@1.4.0' gsibec: require: - - '@1.4.2' + - '@1.4.4' gsi-ncdiag: require: - '@1.1.3' diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index f5e876f1a..c9389dbef 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -21,7 +21,7 @@ fms@2024.02, g2@3.5.1, g2tmpl@1.17.0, - gsibec@1.4.2, + gsibec@1.4.4, hdf@4.2.15, hdf5@1.14.5, ip@5.4.0, diff --git a/configs/sites/tier1/acorn/packages_intel-19.1.3.304.yaml b/configs/sites/tier1/acorn/packages_intel-19.1.3.304.yaml index efadee022..70d439b2d 100644 --- a/configs/sites/tier1/acorn/packages_intel-19.1.3.304.yaml +++ b/configs/sites/tier1/acorn/packages_intel-19.1.3.304.yaml @@ -90,8 +90,6 @@ packages: require: ['@:2.74.3'] go: require: ['%gcc'] - gsibec: - require: ['@1.4.2'] harfbuzz: require: ['%gcc'] libffi: diff --git a/configs/sites/tier1/acorn/packages_oneapi-2024.2.1.yaml b/configs/sites/tier1/acorn/packages_oneapi-2024.2.1.yaml index 1c5eddbb4..44cfe3efd 100644 --- a/configs/sites/tier1/acorn/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier1/acorn/packages_oneapi-2024.2.1.yaml @@ -73,8 +73,6 @@ packages: require:: ['@1.2.0', '+fftw'] glib: require: ['%gcc'] - gsibec: - require: ['@1.4.2'] libtiff: require: ['build_system=cmake'] nco: diff --git a/configs/sites/tier1/aws-pcluster/packages_intel.yaml b/configs/sites/tier1/aws-pcluster/packages_intel.yaml index 0cf3518a6..8c2b16256 100644 --- a/configs/sites/tier1/aws-pcluster/packages_intel.yaml +++ b/configs/sites/tier1/aws-pcluster/packages_intel.yaml @@ -28,7 +28,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/configs/sites/tier1/hera/packages_intel.yaml b/configs/sites/tier1/hera/packages_intel.yaml index 95c19f289..b8f584ab3 100644 --- a/configs/sites/tier1/hera/packages_intel.yaml +++ b/configs/sites/tier1/hera/packages_intel.yaml @@ -27,7 +27,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/configs/sites/tier1/hera/packages_oneapi.yaml b/configs/sites/tier1/hera/packages_oneapi.yaml index 05a175144..5ef5302c5 100644 --- a/configs/sites/tier1/hera/packages_oneapi.yaml +++ b/configs/sites/tier1/hera/packages_oneapi.yaml @@ -29,7 +29,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/configs/sites/tier1/noaa-gcloud/packages_intel.yaml b/configs/sites/tier1/noaa-gcloud/packages_intel.yaml index 8bde60079..b02208815 100644 --- a/configs/sites/tier1/noaa-gcloud/packages_intel.yaml +++ b/configs/sites/tier1/noaa-gcloud/packages_intel.yaml @@ -27,7 +27,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/configs/sites/tier1/noaa-gcloud/packages_oneapi.yaml b/configs/sites/tier1/noaa-gcloud/packages_oneapi.yaml index 20a7b4b9f..63c49ce39 100644 --- a/configs/sites/tier1/noaa-gcloud/packages_oneapi.yaml +++ b/configs/sites/tier1/noaa-gcloud/packages_oneapi.yaml @@ -29,7 +29,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/configs/sites/tier1/wcoss2/packages_intel-19.1.3.304.yaml b/configs/sites/tier1/wcoss2/packages_intel-19.1.3.304.yaml index ceb8dc248..7398f8c93 100644 --- a/configs/sites/tier1/wcoss2/packages_intel-19.1.3.304.yaml +++ b/configs/sites/tier1/wcoss2/packages_intel-19.1.3.304.yaml @@ -87,8 +87,6 @@ packages: require: ['@:2.74.3'] go: require: ['%gcc'] - gsibec: - require: ['@1.4.2'] harfbuzz: require: ['@2.9.1', '%gcc'] libffi: diff --git a/configs/sites/tier1/wcoss2/packages_oneapi-2024.2.1.yaml b/configs/sites/tier1/wcoss2/packages_oneapi-2024.2.1.yaml index e511d7101..0e6575e26 100644 --- a/configs/sites/tier1/wcoss2/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier1/wcoss2/packages_oneapi-2024.2.1.yaml @@ -87,8 +87,6 @@ packages: require:: ['~curl'] glib: require: ['%gcc'] - gsibec: - require: ['@1.4.2'] harfbuzz: require: - any_of: ['@:2.9 %gcc', '@11: %oneapi'] diff --git a/configs/sites/tier2/gaea-c5/packages_intel.yaml b/configs/sites/tier2/gaea-c5/packages_intel.yaml index 7962f62ef..2c9e389af 100644 --- a/configs/sites/tier2/gaea-c5/packages_intel.yaml +++ b/configs/sites/tier2/gaea-c5/packages_intel.yaml @@ -30,7 +30,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/configs/sites/tier2/s4/packages_intel.yaml b/configs/sites/tier2/s4/packages_intel.yaml index f3ef01fb9..e42d3e20c 100644 --- a/configs/sites/tier2/s4/packages_intel.yaml +++ b/configs/sites/tier2/s4/packages_intel.yaml @@ -34,7 +34,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/configs/sites/tier2/s4/packages_oneapi.yaml b/configs/sites/tier2/s4/packages_oneapi.yaml index 1f70e3418..7ffabb24f 100644 --- a/configs/sites/tier2/s4/packages_oneapi.yaml +++ b/configs/sites/tier2/s4/packages_oneapi.yaml @@ -34,7 +34,7 @@ packages: - '@1.2.0 ~mkl +fftw' gsibec: require:: - - '@1.4.2 ~mkl' + - '@1.4.4 ~mkl' py-numpy: require:: - '@2' diff --git a/repos/builtin b/repos/builtin index bd5c47399..5053313b2 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit bd5c4739937cad1785d8f2c89f80561ea1975593 +Subproject commit 5053313b2e9410903181899f0f48fcf633d45d68 From cb32c41be02eb295cff98c4abe10b39abce9c6d6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 30 Sep 2026 10:11:06 -0600 Subject: [PATCH 2/2] Update submodule pointer for repos/builtin --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index 5053313b2..fdb8a3c7e 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 5053313b2e9410903181899f0f48fcf633d45d68 +Subproject commit fdb8a3c7ef02eb714afbd85dce57b388357514da