From 883e5248c10135fcde486ef495bfca90bebc4228 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Jun 2024 09:14:51 -0600 Subject: [PATCH 1/5] 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 a69f3e4f1..96f55267a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + #url = https://github.com/jcsda/spack + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack + branch = feature/update_mapl_from_spack_dev_20240613 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 98ddab9e1..cdbee7332 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 98ddab9e1dfbd5b9935b46acd572671108fde56c +Subproject commit cdbee7332cc761bd86d9d824f5a3edae0c5635ad From 715cbf10a6009d0092a3baa9e97608378eac87a2 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Jun 2024 09:20:18 -0600 Subject: [PATCH 2/5] Bump esmf+mapl to 8.6.1 + 2.46.2 --- .github/workflows/ubuntu-ci-containers-x86_64.yaml | 4 ---- configs/common/packages.yaml | 10 +++++----- configs/containers/specs/jedi-ci.yaml | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ubuntu-ci-containers-x86_64.yaml b/.github/workflows/ubuntu-ci-containers-x86_64.yaml index 5a8510df8..67c3fc1e4 100644 --- a/.github/workflows/ubuntu-ci-containers-x86_64.yaml +++ b/.github/workflows/ubuntu-ci-containers-x86_64.yaml @@ -71,10 +71,6 @@ jobs: spack stack create ctr --container ${CONTAINER} --specs ${SPECS} cd ${ENVDIR} - # mapl@:2.41 doesn't build with mpich@4 - https://github.com/JCSDA/spack-stack/issues/608 - if [[ "${CONTAINER}" == *"mpich"* ]]; then - sed -i 's/- mapl@/#- mapl@/g' spack.yaml - fi spack containerize > Dockerfile docker build -t ${CONTAINER}-${SPECS} . diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 6529428bb..f9737d80b 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -59,7 +59,7 @@ # config and update the projections for lmod/tcl. # Also, check the acorn and derecho site configs which have esmf modifications. esmf: - version: ['8.6.0'] + version: ['8.6.1'] variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio #version: ['8.6.1b04'] #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio @@ -139,7 +139,7 @@ libyaml: version: ['0.2.5'] mapl: - version: ['2.40.3'] + version: ['2.46.2'] variants: +shared +pflogger ~f2py # If making changes here, also check the Discover site configs and the CI workflows met: @@ -195,7 +195,7 @@ parallel-netcdf: version: ['1.12.3'] pflogger: - version: ['1.12.0'] + #version: ['1.12.0'] variants: +mpi pixman: variants: +pic @@ -291,8 +291,8 @@ version: ['2.0.8'] wrf-io: version: ['1.2.0'] - yafyaml: - version: ['1.2.0'] + #yafyaml: + # version: ['1.2.0'] zstd: version: ['1.5.2'] variants: +programs diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index a1c3394d4..122a6e685 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -9,7 +9,7 @@ parallelio@2.6.2, parallel-netcdf@1.12.3, py-eccodes@1.5.0, py-f90nml@1.4.3, py-gitpython@3.1.40, py-h5py@3.8.0, py-numpy@1.22.3, py-pandas@1.5.3, py-pip, py-pyyaml@6.0, py-scipy@1.11.4, py-shapely@1.8.0, py-xarray@2023.7.0, - sp@2.5.0, udunits@2.2.28, w3emc@2.10.0, nco@5.1.6, esmf@8.6.0, mapl@2.40.3, + sp@2.5.0, udunits@2.2.28, w3emc@2.10.0, nco@5.1.6, esmf@8.6.1, mapl@2.46.2, zlib-ng@2.1.5, zstd@1.5.2, odc@1.4.6, shumlib@macos_clang_linux_intel_port, awscli-v2@2.13.22, py-globus-cli@3.16.0, # Added for new CI system 2024/04/30 From 88305afae341a33966c125fdd0aa38f0421ac382 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 17 Jun 2024 05:45:15 -0600 Subject: [PATCH 3/5] 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 96f55267a..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack - branch = feature/update_mapl_from_spack_dev_20240613 + url = https://github.com/jcsda/spack + branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index cdbee7332..93bf14d6d 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit cdbee7332cc761bd86d9d824f5a3edae0c5635ad +Subproject commit 93bf14d6d3bb14df154d1417aa41d7bbdd481d95 From 06a09b445c0ef35c729fa1a3d6f177ceefc4df55 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 17 Jun 2024 07:23:23 -0600 Subject: [PATCH 4/5] Fix ESMF version by using require --- configs/common/packages.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index f9737d80b..088eaa814 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -59,19 +59,22 @@ # config and update the projections for lmod/tcl. # Also, check the acorn and derecho site configs which have esmf modifications. esmf: - version: ['8.6.1'] - variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio + #version: ['8.6.1'] + #variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio #version: ['8.6.1b04'] #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio #version: ['8.7.0b04'] #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio require: - - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] + - any_of: ['@=8.6.1 ~xerces ~pnetcdf snapshot=none +shared +external-parallelio fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel" message: "Extra ESMF compile options for Intel" - - any_of: [''] + - any_of: ['@=8.6.1 ~xerces ~pnetcdf snapshot=none +shared +external-parallelio'] when: "%gcc" message: "Extra ESMF compile options for GCC" + - any_of: ['@=8.6.1 ~xerces ~pnetcdf snapshot=none +shared +external-parallelio'] + when: "%apple-clang" + message: "Extra ESMF compile options for GCC" fckit: version: ['0.11.0'] variants: +eckit From 2b787972010d39104604d1fee785823317f00404 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 17 Jun 2024 09:51:29 -0600 Subject: [PATCH 5/5] Clean up esmf section in configs/common/packages.yaml --- configs/common/packages.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 088eaa814..dbead3b3e 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -59,12 +59,6 @@ # config and update the projections for lmod/tcl. # Also, check the acorn and derecho site configs which have esmf modifications. esmf: - #version: ['8.6.1'] - #variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio - #version: ['8.6.1b04'] - #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio - #version: ['8.7.0b04'] - #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio require: - any_of: ['@=8.6.1 ~xerces ~pnetcdf snapshot=none +shared +external-parallelio fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel"