From be32dbf6fa9fc8c87fbb4237b0eb7753a7d36b52 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:28:23 +0000 Subject: [PATCH 01/12] wcoss2: scotch@7.0.7 --- configs/sites/tier1/wcoss2/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sites/tier1/wcoss2/packages.yaml b/configs/sites/tier1/wcoss2/packages.yaml index 8d5ae1a7c..63c5b667a 100644 --- a/configs/sites/tier1/wcoss2/packages.yaml +++ b/configs/sites/tier1/wcoss2/packages.yaml @@ -116,4 +116,4 @@ crtm: require: ['@2.4.0.1 +fix'] scotch: - require: ['@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps build_system=cmake'] + require: ['@7.0.7 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps build_system=cmake'] From 4fcf080db796427419529c8cd18eb10518a2d909 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:37:18 +0000 Subject: [PATCH 02/12] wcoss2 updates for 1.9.2rc2 --- configs/sites/tier1/wcoss2/packages.yaml | 4 +++- configs/sites/tier1/wcoss2/packages_intel.yaml | 13 ++++++++++--- configs/sites/tier1/wcoss2/packages_oneapi.yaml | 9 ++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/configs/sites/tier1/wcoss2/packages.yaml b/configs/sites/tier1/wcoss2/packages.yaml index 63c5b667a..345019aab 100644 --- a/configs/sites/tier1/wcoss2/packages.yaml +++ b/configs/sites/tier1/wcoss2/packages.yaml @@ -71,6 +71,8 @@ gsibec: require:: - '@1.2.1 ~mkl' + icu4c: + require: ['%gcc'] libffi: require: - any_of: ['@3.3'] @@ -92,7 +94,7 @@ require: - any_of: ['@0.29.36'] when: '%intel' - py-numpy: + py-numpy:: require:: - '^[virtuals=lapack,blas] openblas' - '@1.26' diff --git a/configs/sites/tier1/wcoss2/packages_intel.yaml b/configs/sites/tier1/wcoss2/packages_intel.yaml index e2393324c..8cf6af84b 100644 --- a/configs/sites/tier1/wcoss2/packages_intel.yaml +++ b/configs/sites/tier1/wcoss2/packages_intel.yaml @@ -1,9 +1,11 @@ packages: # - ### Set compiler. + ### Set compilers & MPI provider for metamodule generation. # all: - compiler:: [intel@19.1.3.304] + compiler:: [intel@19.1.3.304,gcc] + providers: + mpi:: [cray-mpich] # ### External packages. # @@ -25,6 +27,11 @@ packages: harfbuzz: require: ['%gcc'] ecflow: - require:: ['@5.11.4', '+ui', '^boost %gcc', '%intel'] + require:: + - '@5.11.4' + - '+ui' + - 'cflags="-no-ipo" cxxflags="-no-ipo"' + - '^boost %gcc' + - '%intel' py-numpy: require: ['%gcc'] diff --git a/configs/sites/tier1/wcoss2/packages_oneapi.yaml b/configs/sites/tier1/wcoss2/packages_oneapi.yaml index a9bb4b49f..6f7459043 100644 --- a/configs/sites/tier1/wcoss2/packages_oneapi.yaml +++ b/configs/sites/tier1/wcoss2/packages_oneapi.yaml @@ -1,6 +1,11 @@ packages: + # + ### Set compilers & MPI provider for metamodule generation. + # all: - compiler:: [oneapi@2024.2.1] + compiler:: [oneapi@2024.2.1,gcc] + providers: + mpi:: [cray-mpich] gcc-runtime: require: '%gcc@12.1.0' cray-mpich: @@ -31,8 +36,6 @@ packages: require: ['@9.4.1'] libtiff: require: ['build_system=cmake'] - icu4c: - require: ['%gcc'] ninja: require: ['~re2c %gcc'] pixman: From 600f680c55fb7efc96a102c28ce0eaaf74189695 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:37:34 +0000 Subject: [PATCH 03/12] nco template: pin mapl/esmf versions --- configs/templates/nco/spack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/templates/nco/spack.yaml b/configs/templates/nco/spack.yaml index daa20ab72..c72a3aa67 100644 --- a/configs/templates/nco/spack.yaml +++ b/configs/templates/nco/spack.yaml @@ -25,7 +25,7 @@ spack: - eckit - ecmwf-atlas - eigen - - esmf + - esmf@8.8.0 - fckit - fms - g2 @@ -53,7 +53,7 @@ spack: - libxml2 - libxrender - madis - - mapl + - mapl@2.53.4 ^esmf@8.8.0 - mbedtls - met - metis From 19ab109e3586117176212b442980b78746ccd00e Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:42:05 +0000 Subject: [PATCH 04/12] wcoss2 packages_intel.yaml: fix indentation --- configs/sites/tier1/wcoss2/packages_intel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/sites/tier1/wcoss2/packages_intel.yaml b/configs/sites/tier1/wcoss2/packages_intel.yaml index 8cf6af84b..ffb73dcd5 100644 --- a/configs/sites/tier1/wcoss2/packages_intel.yaml +++ b/configs/sites/tier1/wcoss2/packages_intel.yaml @@ -4,8 +4,8 @@ packages: # all: compiler:: [intel@19.1.3.304,gcc] - providers: - mpi:: [cray-mpich] + providers: + mpi:: [cray-mpich] # ### External packages. # From b3cc8ebd7f7da21bce03ee73516667197700703e Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 17:42:14 +0000 Subject: [PATCH 05/12] wcoss2: fix numpy config --- configs/sites/tier1/wcoss2/packages.yaml | 4 ---- configs/sites/tier1/wcoss2/packages_intel.yaml | 7 +++++-- configs/sites/tier1/wcoss2/packages_oneapi.yaml | 4 ++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configs/sites/tier1/wcoss2/packages.yaml b/configs/sites/tier1/wcoss2/packages.yaml index 345019aab..c335eff9a 100644 --- a/configs/sites/tier1/wcoss2/packages.yaml +++ b/configs/sites/tier1/wcoss2/packages.yaml @@ -94,10 +94,6 @@ require: - any_of: ['@0.29.36'] when: '%intel' - py-numpy:: - require:: - - '^[virtuals=lapack,blas] openblas' - - '@1.26' py-pandas: 'require:': ~excel # minimize dependencies py-scipy: diff --git a/configs/sites/tier1/wcoss2/packages_intel.yaml b/configs/sites/tier1/wcoss2/packages_intel.yaml index ffb73dcd5..2de9fb2e3 100644 --- a/configs/sites/tier1/wcoss2/packages_intel.yaml +++ b/configs/sites/tier1/wcoss2/packages_intel.yaml @@ -33,5 +33,8 @@ packages: - 'cflags="-no-ipo" cxxflags="-no-ipo"' - '^boost %gcc' - '%intel' - py-numpy: - require: ['%gcc'] + py-numpy:: + require:: + - '^[virtuals=lapack,blas] openblas' + - '@1.26' + - '%gcc' diff --git a/configs/sites/tier1/wcoss2/packages_oneapi.yaml b/configs/sites/tier1/wcoss2/packages_oneapi.yaml index 6f7459043..41a09c932 100644 --- a/configs/sites/tier1/wcoss2/packages_oneapi.yaml +++ b/configs/sites/tier1/wcoss2/packages_oneapi.yaml @@ -46,3 +46,7 @@ packages: require: ['%gcc'] zlib-ng: require: ['cflags="-static-intel"', 'cxxflags="-static-intel"'] + py-numpy:: + require:: + - '^[virtuals=lapack,blas] openblas' + - '@1.26' From 2550c75d09cfbac10c07458a270a2217715f7193 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 19:51:46 +0000 Subject: [PATCH 06/12] wcoss2: remove gcc from compilers list; use soft links for now --- configs/sites/tier1/wcoss2/packages_intel.yaml | 2 +- configs/sites/tier1/wcoss2/packages_oneapi.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/sites/tier1/wcoss2/packages_intel.yaml b/configs/sites/tier1/wcoss2/packages_intel.yaml index 2de9fb2e3..660802761 100644 --- a/configs/sites/tier1/wcoss2/packages_intel.yaml +++ b/configs/sites/tier1/wcoss2/packages_intel.yaml @@ -3,7 +3,7 @@ packages: ### Set compilers & MPI provider for metamodule generation. # all: - compiler:: [intel@19.1.3.304,gcc] + compiler:: [intel@19.1.3.304] providers: mpi:: [cray-mpich] # diff --git a/configs/sites/tier1/wcoss2/packages_oneapi.yaml b/configs/sites/tier1/wcoss2/packages_oneapi.yaml index 41a09c932..56437b7b7 100644 --- a/configs/sites/tier1/wcoss2/packages_oneapi.yaml +++ b/configs/sites/tier1/wcoss2/packages_oneapi.yaml @@ -3,7 +3,7 @@ packages: ### Set compilers & MPI provider for metamodule generation. # all: - compiler:: [oneapi@2024.2.1,gcc] + compiler:: [oneapi@2024.2.1] providers: mpi:: [cray-mpich] gcc-runtime: From 01d979b290d880badc80c5e967b628b2ef35f515 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 20:09:19 +0000 Subject: [PATCH 07/12] submodule pointer->test --- .gitmodules | 4 ++-- spack | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 160ccb9d4..b261832cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-1.9.2rc1 + url = https://github.com/AlexanderRichert-NOAA/spack + branch = 192rc2 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 1ef7450f5..b1db55742 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 1ef7450f5e0f8401cb0ec8beadd273581d0a40fd +Subproject commit b1db55742eb6ec6dc3879c1b02875dc607bee89c From 8aac26cc08df6122fd2bdae46cbc327fdbc77c55 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 20:23:38 +0000 Subject: [PATCH 08/12] update test submodule ptr --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index b1db55742..be6ea1845 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit b1db55742eb6ec6dc3879c1b02875dc607bee89c +Subproject commit be6ea18450829add86ab84daa49d7a2bc4dd0bf2 From d4fd37968e95eff0d73edb08375fb13c88a07489 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 21:21:41 +0000 Subject: [PATCH 09/12] revert to jcsda submodule --- .gitmodules | 4 ++-- spack | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index b261832cc..82ae4248d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "spack"] path = spack - url = https://github.com/AlexanderRichert-NOAA/spack - branch = 192rc2 + url = https://github.com/jcsda/spack + branch = release/1.9.0 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index be6ea1845..f1be10018 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit be6ea18450829add86ab84daa49d7a2bc4dd0bf2 +Subproject commit f1be10018764d95382abcd2adee0d3756c298ac1 From 20d6d50a3ff6456a7cffed023c5d7a688902643b Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 21:24:29 +0000 Subject: [PATCH 10/12] .gitmodules: spack-stack-1.9.2rc2 --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 82ae4248d..62c13d62b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "spack"] path = spack url = https://github.com/jcsda/spack - branch = release/1.9.0 + branch = spack-stack-1.9.2rc2 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules From 817347465e33aa5ed80d54e3133ef372d2a0bb3c Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 21:38:47 +0000 Subject: [PATCH 11/12] wcoss2: scotch:: --- configs/sites/tier1/wcoss2/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sites/tier1/wcoss2/packages.yaml b/configs/sites/tier1/wcoss2/packages.yaml index c335eff9a..c19223565 100644 --- a/configs/sites/tier1/wcoss2/packages.yaml +++ b/configs/sites/tier1/wcoss2/packages.yaml @@ -114,4 +114,4 @@ crtm: require: ['@2.4.0.1 +fix'] scotch: - require: ['@7.0.7 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps build_system=cmake'] + require:: ['@7.0.7 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps build_system=cmake'] From fcd00fde25acd1ec2b190d34276311af3dcd7ee5 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Tue, 10 Jun 2025 15:36:24 -0700 Subject: [PATCH 12/12] Update .gitmodules Co-authored-by: Dom Heinzeller --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 62c13d62b..82ae4248d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "spack"] path = spack url = https://github.com/jcsda/spack - branch = spack-stack-1.9.2rc2 + branch = release/1.9.0 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules