From 6bd15e64f6ec13e6d1c19a285099468123dd5285 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 4 Jun 2025 11:07:52 -0600 Subject: [PATCH 01/11] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++++-- spack | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 160ccb9d4..117778869 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-1.9.2rc1 + #url = https://github.com/jcsda/spack + #branch = spack-stack-1.9.2rc1 + url = https://github.com/climbfuji/spack + branch = bugfix/rel19_yetanothercrtmfixbugfix [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 1ef7450f5..e10b764de 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 1ef7450f5e0f8401cb0ec8beadd273581d0a40fd +Subproject commit e10b764de50121e2917ddcbc7c7b728561b305ab From abc15f194b035bc21208d10996cde21557171d6a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 4 Jun 2025 11:08:12 -0600 Subject: [PATCH 02/11] configs/common/packages_oneapi.yaml: with oneapi, force scotch build to use gcc --- configs/common/packages_oneapi.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/common/packages_oneapi.yaml b/configs/common/packages_oneapi.yaml index f148f1ecf..54398f5a1 100644 --- a/configs/common/packages_oneapi.yaml +++ b/configs/common/packages_oneapi.yaml @@ -24,3 +24,6 @@ packages: qt: require: - '%gcc' + scotch: + require: + - '%gcc' From df6dac1857e3d746ea73a12c88e9c7e289d46c81 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 4 Jun 2025 15:17:03 -0600 Subject: [PATCH 03/11] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 117778869..82ae4248d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-1.9.2rc1 - url = https://github.com/climbfuji/spack - branch = bugfix/rel19_yetanothercrtmfixbugfix + 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 e10b764de..86ea11c48 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e10b764de50121e2917ddcbc7c7b728561b305ab +Subproject commit 86ea11c481b0bf9ec6b9e301e68bcf3a69e39ac3 From 8861eed1bcba098ed7ea27ce29580499fe565463 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 5 Jun 2025 05:34:53 -0600 Subject: [PATCH 04/11] Change require statements for qt and scotch in configs/common/packages.yaml --- .gitmodules | 6 ++++-- configs/common/packages.yaml | 6 ++++-- spack | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 82ae4248d..2bdab4c87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = release/1.9.0 + #url = https://github.com/jcsda/spack + #branch = release/1.9.0 + url = https://github.com/climbfuji/spack + branch = bugfix/scotch_oneapi_conflict [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 2543dac54..38ba8f759 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -265,9 +265,11 @@ packages: py-urllib3: require: '@1.26.12' qt: - require: '@5' + require: + - '@5' scotch: - require: '@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps' + require: + - '@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps' sfcio: require: '@1.4.2' shumlib: diff --git a/spack b/spack index 86ea11c48..6982570bb 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 86ea11c481b0bf9ec6b9e301e68bcf3a69e39ac3 +Subproject commit 6982570bbdc97f08478d0fe05b1b72c6636317cc From 22456d2e40d7f972a231f8f1ee57ee5911dacd9d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 6 Jun 2025 12:55:20 +0000 Subject: [PATCH 05/11] Fix ursa site config --- configs/sites/tier1/ursa/compilers.yaml | 2 ++ configs/sites/tier1/ursa/packages_gcc.yaml | 14 ++++------- configs/sites/tier1/ursa/packages_oneapi.yaml | 24 +++++++++---------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/configs/sites/tier1/ursa/compilers.yaml b/configs/sites/tier1/ursa/compilers.yaml index 9ede62d18..914a17471 100644 --- a/configs/sites/tier1/ursa/compilers.yaml +++ b/configs/sites/tier1/ursa/compilers.yaml @@ -8,6 +8,7 @@ compilers: fc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2/bin/ifort flags: {} operating_system: rocky9 + target: x86_64 modules: - intel-oneapi-compilers/2024.2.1 environment: @@ -26,6 +27,7 @@ compilers: fc: /usr/bin/gfortran flags: {} operating_system: rocky9 + target: x86_64 modules: [] environment: {} extra_rpaths: [] diff --git a/configs/sites/tier1/ursa/packages_gcc.yaml b/configs/sites/tier1/ursa/packages_gcc.yaml index d6c5aa362..e010f37e7 100644 --- a/configs/sites/tier1/ursa/packages_gcc.yaml +++ b/configs/sites/tier1/ursa/packages_gcc.yaml @@ -11,14 +11,8 @@ packages: prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/openmpi-4.1.6-auzmzlihoo7n6g254nqkguxtzrdzkyqv modules: - openmpi/4.1.6 + gcc-runtime: + externals: + - spec: gcc-runtime@11.4.1%gcc@11.4.1 + prefix: /usr - ectrans: - require:: - - '~mkl +fftw' - gsibec: - require:: - - '~mkl' - py-numpy: - require:: - - '@1.26' - - '^openblas' diff --git a/configs/sites/tier1/ursa/packages_oneapi.yaml b/configs/sites/tier1/ursa/packages_oneapi.yaml index cf3502aa2..f44e67167 100644 --- a/configs/sites/tier1/ursa/packages_oneapi.yaml +++ b/configs/sites/tier1/ursa/packages_oneapi.yaml @@ -1,6 +1,6 @@ packages: all: - compiler:: [oneapi@2024.2.1] + compiler:: [oneapi@2024.2.1,gcc@11.4.1] providers: mpi:: [intel-oneapi-mpi@2021.13] # Change as appropriate to switch to intel-oneapi-mkl @@ -16,22 +16,20 @@ packages: modules: - intel-oneapi-mpi/2021.13.1 prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-ss72gbndvat3oz22sa6lhmlbjkeabrn4 - + intel-oneapi-mkl: + externals: + - spec: intel-oneapi-mkl@2024.2.1%oneapi@2024.2.1 + modules: + - intel-oneapi-mkl/2024.2.1 + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-mkl-2024.2.1-srqwrbzwo2k7hxuuhlrxttburs5jvlat intel-oneapi-runtime: externals: - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1 prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2 modules: - compiler-rt/2024.2.1 + gcc-runtime: + externals: + - spec: gcc-runtime@11.4.1%gcc@11.4.1 + prefix: /usr - # If using intel-oneapi-mkl, make appropriate changes below - ectrans: - require:: - - '~mkl +fftw' - gsibec: - require:: - - '~mkl' - py-numpy: - require:: - - '@1.26' - - '^openblas' From 1c03d7d3b1d6d38a205bf14998dcb14895afe598 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 6 Jun 2025 07:38:49 -0600 Subject: [PATCH 06/11] Update submodule pointer for scotch --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 6982570bb..aaaeeb38e 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 6982570bbdc97f08478d0fe05b1b72c6636317cc +Subproject commit aaaeeb38ebf0611f1bda8ed328c49ef65285df0e From 41f3b4f46ea81f2d85fc76baffab69c05d4336b2 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Jun 2025 11:55:32 -0600 Subject: [PATCH 07/11] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2bdab4c87..82ae4248d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = release/1.9.0 - url = https://github.com/climbfuji/spack - branch = bugfix/scotch_oneapi_conflict + 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 aaaeeb38e..ee0ebf831 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit aaaeeb38ebf0611f1bda8ed328c49ef65285df0e +Subproject commit ee0ebf831768e2b662e0926bbfbd3e88c507f627 From 44970e8f47db981b9cdd90060365c2de60667016 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Jun 2025 16:09:48 -0600 Subject: [PATCH 08/11] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++++-- spack | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 82ae4248d..215d1db2e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = release/1.9.0 + #url = https://github.com/jcsda/spack + #branch = release/1.9.0 + url = https://github.com/climbfuji/spack + branch = feature/rel190mapl2534 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index ee0ebf831..e4b800c41 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit ee0ebf831768e2b662e0926bbfbd3e88c507f627 +Subproject commit e4b800c412d675ee72bfccf484f5e6046722797e From cb9a8d845fd33e09b82cacd192434d91c63f3805 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Jun 2025 16:12:45 -0600 Subject: [PATCH 09/11] In configs/** replace 'mapl@2.53.0 ^esmf@8.8.0' with 'mapl@2.53.4 ^esmf@8.8.0' --- configs/common/packages.yaml | 2 +- configs/containers/specs/jedi-ci.yaml | 2 +- configs/templates/skylab-dev/spack.yaml | 2 +- configs/templates/unified-dev/spack.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 38ba8f759..6f7c763e4 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -160,7 +160,7 @@ packages: magics: require: "@4.15.3:" mapl: - require: '@2.53.0 ~shared ~f2py' + require: '@2.53 ~shared ~f2py' variants: '+pflogger' met: require: '@11.1.1 +python +grib2' diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index 7072243cc..d61dc8ce9 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -48,7 +48,7 @@ w3emc@2.10.0, nco, esmf@8.8.0, - mapl@2.53.0, + mapl@2.53.4, zlib-ng, zstd, odc@1.5.2, diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index f29430cb5..11c056e6b 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -28,7 +28,7 @@ spack: # Mapl with various esmf tags - mapl@2.53.0 ^esmf@8.6.1 - - mapl@2.53.0 ^esmf@8.8.0 + - mapl@2.53.4 ^esmf@8.8.0 # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index a56a37dbc..27c76a7cd 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -34,7 +34,7 @@ spack: # Mapl with various esmf tags - mapl@2.53.0 ^esmf@8.6.1 - - mapl@2.53.0 ^esmf@8.8.0 + - mapl@2.53.4 ^esmf@8.8.0 # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none From 500680f56546fda79e1a4937c6a21377426528aa Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Jun 2025 16:13:59 -0600 Subject: [PATCH 10/11] Update configs/templates/unified-dev/spack.yaml --- configs/templates/unified-dev/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 27c76a7cd..2badbba65 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -34,7 +34,7 @@ spack: # Mapl with various esmf tags - mapl@2.53.0 ^esmf@8.6.1 - - mapl@2.53.4 ^esmf@8.8.0 + - mapl@2.53.4 ^esmf@8.8.0 # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none From 751af112afd75de5e0c9268890dda574879c8113 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 10 Jun 2025 08:07:05 -0600 Subject: [PATCH 11/11] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 215d1db2e..82ae4248d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = release/1.9.0 - url = https://github.com/climbfuji/spack - branch = feature/rel190mapl2534 + 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 e4b800c41..9c5291036 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e4b800c412d675ee72bfccf484f5e6046722797e +Subproject commit 9c52910360a5b45d24c85870d5787f4321a5771d