Upgrade to spack-stack version 1.6.0 (#27)

* Upgrade to spack-stack v1.6.0. #26
NOAA-EMC · Feb 14, 2024 · 55abe58 · 55abe58
1 parent 309f49e
commit 55abe58
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 24 deletions.
diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -33,6 +33,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      # Free up disk space
+      - name: free-disk-spack
+        run: |
+          df -h
+          sudo swapoff -a
+          sudo rm -rf /swapfile
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
+
       - name: checkout  # This is for getting spack.yaml
         uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -36,6 +36,20 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
+      # Free up disk space
+      - name: free-disk-spack
+        run: |
+          df -h
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
+
       - name: checkout # This is for getting spack.yaml
         uses: actions/checkout@v3
         with:

diff --git a/ci/spack.yaml b/ci/spack.yaml
@@ -8,7 +8,7 @@ spack:
       compiler: [intel, gcc@10:10]
   specs:
   - [email protected]
-  - [email protected].0
+  - [email protected].1
   - [email protected]
   - [email protected]
   - [email protected]
@@ -18,7 +18,7 @@ spack:
   - [email protected]
   - [email protected]
   - [email protected]
-  - [email protected]
+  - [email protected].1
   - [email protected]
   - [email protected]
   - [email protected]

diff --git a/modulefiles/gsiutils_common.lua b/modulefiles/gsiutils_common.lua
@@ -3,19 +3,19 @@ Load common modules to build GSI utilities on all machines
 ]])
 
 local netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
-local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
+local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
 
 local bufr_ver=os.getenv("bufr_ver") or "11.7.0"
 local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
-local sp_ver=os.getenv("sp_ver") or "2.3.3"
+local sp_ver=os.getenv("sp_ver") or "2.5.0"
 local ip_ver=os.getenv("ip_ver") or "4.3.0"
 local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
 local nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
 local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
 local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
-local crtm_ver=os.getenv("crtm_ver") or "2.4.0"
+local crtm_ver=os.getenv("crtm_ver") or "2.4.0.1"
 local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2"
 
 load(pathJoin("netcdf-c", netcdf_c_ver))

diff --git a/modulefiles/gsiutils_hera.gnu.lua b/modulefiles/gsiutils_hera.gnu.lua
@@ -1,15 +1,15 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
 --Needed for openmpi build
 prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 local stack_intel_ver=os.getenv("stack_gcc_ver") or "9.2.0"
 local stack_impi_ver=os.getenv("stack_openmpi_ver") or "4.1.5"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-local openblas_ver=os.getenv("cmake_ver") or "0.3.19"
+local openblas_ver=os.getenv("cmake_ver") or "0.3.24"
 
 load(pathJoin("stack-gcc", stack_gcc_ver))
 load(pathJoin("stack-openmpi", stack_openmpi_ver))

diff --git a/modulefiles/gsiutils_hera.intel.lua b/modulefiles/gsiutils_hera.intel.lua
@@ -1,13 +1,13 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
 
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 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.1"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

diff --git a/modulefiles/gsiutils_hercules.intel.lua b/modulefiles/gsiutils_hercules.intel.lua
@@ -1,14 +1,14 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 
-local stack_python_ver=os.getenv("python_ver") or "3.10.8"
+local stack_python_ver=os.getenv("python_ver") or "3.11.6"
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 local mkl_ver=os.getenv("mkl_ver") or "2022.2.1"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

diff --git a/modulefiles/gsiutils_jet.intel.lua b/modulefiles/gsiutils_jet.intel.lua
@@ -1,13 +1,13 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
 
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 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.1"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

diff --git a/modulefiles/gsiutils_orion.intel.lua b/modulefiles/gsiutils_orion.intel.lua
@@ -1,13 +1,13 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 
-local stack_python_ver=os.getenv("python_ver") or "3.10.8"
+local stack_python_ver=os.getenv("python_ver") or "3.11.6"
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
 local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

diff --git a/modulefiles/gsiutils_s4.intel.lua b/modulefiles/gsiutils_s4.intel.lua
@@ -1,13 +1,13 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 
-local python_ver=os.getenv("python_ver") or "3.10.8"
+local python_ver=os.getenv("python_ver") or "3.11.6"
 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"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

diff --git a/modulefiles/gsiutils_wcoss2.intel.lua b/modulefiles/gsiutils_wcoss2.intel.lua
@@ -19,7 +19,7 @@ local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
 local nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
 local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
-local crtm_ver=os.getenv("crtm_ver") or "2.3.0"
+local crtm_ver=os.getenv("crtm_ver") or "2.4.0.1"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10"
 
 load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))