From a1706b51013ffc78855d4197aab58ea46b337c07 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 4 Apr 2025 13:11:47 -0600 Subject: [PATCH 1/2] Add esmf@8.9.0b05 and use in neptune-dev template --- .gitmodules | 6 ++++-- configs/common/modules_lmod.yaml | 2 ++ configs/common/modules_tcl.yaml | 2 ++ configs/common/packages.yaml | 2 +- configs/templates/neptune-dev/spack.yaml | 4 ++-- spack | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..41f5ea823 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/esmf89 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index f8b79a575..4507e7145 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -134,6 +134,8 @@ modules: ^esmf@8.7.0+debug snapshot=none: 'esmf-8.7.0-debug' ^esmf@8.8.0~debug snapshot=none: 'esmf-8.8.0' ^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug' + ^esmf@8.9.0b05~debug snapshot=b05: 'esmf-8.9.0b05' + ^esmf@8.9.0b05+debug snapshot=b05: 'esmf-8.9.0b05-debug' openmpi: environment: set: diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index c5aa45211..86a548bf9 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -136,6 +136,8 @@ modules: ^esmf@8.7.0+debug snapshot=none: 'esmf-8.7.0-debug' ^esmf@8.8.0~debug snapshot=none: 'esmf-8.8.0' ^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug' + ^esmf@8.9.0b05~debug snapshot=b05: 'esmf-8.9.0b05' + ^esmf@8.9.0b05+debug snapshot=b05: 'esmf-8.9.0b05-debug' openmpi: environment: set: diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index c3c38304b..e4f470860 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -70,7 +70,7 @@ packages: esmf: require: - '~xerces ~pnetcdf +shared +external-parallelio' - - any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none'] + - any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.0b05 snapshot=b05'] - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel" message: "Extra ESMF compile options for Intel" diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml index ca2486c53..8ef00fce7 100644 --- a/configs/templates/neptune-dev/spack.yaml +++ b/configs/templates/neptune-dev/spack.yaml @@ -8,9 +8,9 @@ spack: definitions: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - - neptune-env +espc ^esmf@=8.8.0 + - neptune-env +espc ^esmf@=8.9.0b05 snapshot=b05 # Comment out for Cole and Tusk or any other air-gapped system: - - neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0 + - neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.9.0b05 snapshot=b05 specs: - matrix: diff --git a/spack b/spack index 58c9fb6aa..04b5161ec 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 58c9fb6aa91e944ab05957d29586f6e100045610 +Subproject commit 04b5161eca2304c914584156430d2d29f5be8080 From 1a4d08166c5cfd94c8d7014bbc554b329aace518 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 4 Apr 2025 19:45:49 -0600 Subject: [PATCH 2/2] 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 41f5ea823..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/esmf89 + 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 04b5161ec..9432cbe9f 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 04b5161eca2304c914584156430d2d29f5be8080 +Subproject commit 9432cbe9fab792b6ae2094edb35cb02c91ae6f24