Upgrade to spack-stack version 1.6.0 (#856)

* Upgrade to spack-stack v1.6.0, remove cheyenne. #844 * Loosen up CI concretizer for sp. #844 * Update CI/ip version to SS version. * Revert unify to true. #844 * Change prod-util to prod_util on MSU.
NOAA-EMC · Jan 29, 2024 · 6331f0b · 6331f0b
1 parent cd58d22
commit 6331f0b
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 136 deletions.
diff --git a/ci/rt.sh b/ci/rt.sh
@@ -65,26 +65,26 @@ if [ $mac2 = hf ]; then # for HERA
  export machine=HERA
  export homedir=${homedir:-"/scratch2/NAGAPE/epic/UPP/test_suite"}
  export rundir=${rundir:-"/scratch1/NCEPDEV/stmp2/${USER}"}
- module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core
+ module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core
  module load stack-intel/2021.5.0
  module load stack-intel-oneapi-mpi/2021.5.1
- module load prod_util/1.2.2
+ module load prod_util/2.1.1
 elif [ $mac = O ] ; then
  export machine=ORION
  export homedir=${homedir:-"/work/noaa/epic/UPP"}
  export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
- module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core
+ module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core
  module load stack-intel/2022.0.2
  module load stack-intel-oneapi-mpi/2021.5.1
- module load prod-util/1.2.2
+ module load prod_util/2.1.1
 elif [ $mac3 = herc ] ; then
  export machine=HERCULES
  export homedir=${homedir:-"/work/noaa/epic/UPP"}
  export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
- module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core
+ module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core
  module load stack-intel/2021.9.0
  module load stack-intel-oneapi-mpi/2021.9.0
- module load prod-util/1.2.2
+ module load prod_util/2.1.1
 fi
 
 #set working directory

diff --git a/ci/spack.yaml b/ci/spack.yaml
@@ -6,19 +6,19 @@ spack:
       - intel
       - gcc@10:10
   specs:
-  - netcdf-c@4.7.4
-  - netcdf-fortran@4.5.3
+  - netcdf-c@4.9.2
+  - netcdf-fortran@4.6.1
   - [email protected]
-  - w3emc@2.9.2
+  - w3emc@2.10.0
   - [email protected]
-  - [email protected].0
-  - sp@2.3.3
-  - ip@3.3.3
+  - [email protected].2
+  - sp@2.5.0
+  - ip@4.3.0
   - [email protected]
   - [email protected]
   - [email protected]
   - [email protected]
-  - crtm@2.3.0
+  - crtm@2.4.0.1
   view: true
   concretizer:
     unify: true

diff --git a/modulefiles/cheyenne b/modulefiles/cheyenne
diff --git a/modulefiles/cheyenne_gnu b/modulefiles/cheyenne_gnu
diff --git a/modulefiles/hera.lua b/modulefiles/hera.lua
@@ -3,7 +3,7 @@ Load environment to build UPP on hera
 ]])
 
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))

diff --git a/modulefiles/hercules.lua b/modulefiles/hercules.lua
@@ -3,7 +3,7 @@ Load environment to build UPP on hecules
 ]])
 
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 load(pathJoin("stack-intel", stack_intel_ver))

diff --git a/modulefiles/jet b/modulefiles/jet
diff --git a/modulefiles/jet.lua b/modulefiles/jet.lua
@@ -0,0 +1,22 @@
+help([[
+Load environment to build UPP on Jet
+]])
+
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
+load("upp_common")
+
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
+whatis("Description: UPP build environment")
diff --git a/modulefiles/orion.lua b/modulefiles/orion.lua
@@ -3,7 +3,7 @@ Load environment to build UPP on orion
 ]])
 
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
 load(pathJoin("stack-intel", stack_intel_ver))

diff --git a/modulefiles/s4.lua b/modulefiles/s4.lua
@@ -1,10 +1,11 @@
 -- ---------------------------------------------------------------------------
 -- David Huber 06/2021, Set up config. with the hpc-stack NCEPLIBS.
 -- Innocent Souopgui 11/2023, Update to use spack-stack
+-- David Huber 1/24, Update to use spack-stack v1.6.0
 -- ---------------------------------------------------------------------------
 
 
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0"

diff --git a/modulefiles/upp_common.lua b/modulefiles/upp_common.lua
@@ -8,14 +8,14 @@ local ufs_modules = {
   {["libpng"]          = "1.6.37"},
   {["hdf5"]            = "1.14.0"},
   {["netcdf-c"]        = "4.9.2"},
-  {["netcdf-fortran"]  = "4.6.0"},
+  {["netcdf-fortran"]  = "4.6.1"},
   {["parallelio"]      = "2.5.10"},
   {["bacio"]           = "2.4.1"},
-  {["crtm"]            = "2.4.0"},
+  {["crtm"]            = "2.4.0.1"},
   {["g2"]              = "3.4.5"},
   {["g2tmpl"]          = "1.10.2"},
   {["ip"]              = "4.3.0"},
-  {["sp"]              = "2.3.3"},
+  {["sp"]              = "2.5.0"},
   {["w3emc"]           = "2.10.0"},
   {["nemsio"]          = "2.5.4"},
   {["sigio"]           = "2.3.2"},