From 1adce02c9c128cf9d1b22bde80aaef9dc6bb02a3 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Fri, 19 Jan 2024 18:38:21 +0000 Subject: [PATCH] Update to spack-stack/1.6.0, remove cheyenne. #109 --- modulefiles/cheyenne.gnu.lua | 18 ------------------ modulefiles/cheyenne.intel.lua | 17 ----------------- modulefiles/common-run.lua | 2 +- modulefiles/common.lua | 2 +- modulefiles/hera.gnu-run.lua | 4 ++-- modulefiles/hera.gnu.lua | 2 +- modulefiles/hera.intel-run.lua | 4 ++-- modulefiles/hera.intel.lua | 2 +- modulefiles/jet-run.lua | 4 ++-- modulefiles/jet.lua | 4 ++-- modulefiles/orion-run.lua | 4 ++-- modulefiles/orion.lua | 2 +- modulefiles/s4-run.lua | 4 ++-- modulefiles/s4.lua | 2 +- 14 files changed, 18 insertions(+), 53 deletions(-) delete mode 100644 modulefiles/cheyenne.gnu.lua delete mode 100644 modulefiles/cheyenne.intel.lua diff --git a/modulefiles/cheyenne.gnu.lua b/modulefiles/cheyenne.gnu.lua deleted file mode 100644 index 682e6481..00000000 --- a/modulefiles/cheyenne.gnu.lua +++ /dev/null @@ -1,18 +0,0 @@ -help([[ -]]) - -load("cmake/3.22.0") -load("python/3.7.9") -load("ncarenv/1.3") -load("gnu/10.1.0") -load("ncarcompilers/0.5.0") -unload("netcdf") - -prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack") - -load("hpc/1.2.0") -load("hpc-gnu/10.1.0") - -load("common") - -whatis("Description: GSI Monitoring environment on Cheyenne with GNU Compilers") diff --git a/modulefiles/cheyenne.intel.lua b/modulefiles/cheyenne.intel.lua deleted file mode 100644 index eeea6f7b..00000000 --- a/modulefiles/cheyenne.intel.lua +++ /dev/null @@ -1,17 +0,0 @@ -help([[ -]]) - -load("cmake/3.22.0") -load("python/3.7.9") -load("ncarenv/1.3") -load("intel/2022.1") -load("ncarcompilers/0.5.0") - -prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack") - -load("hpc/1.2.0") -load("hpc-intel/2022.1") - -load("common") - -whatis("Description: GSI Monitoring environment on Cheyenne with Intel Compilers") diff --git a/modulefiles/common-run.lua b/modulefiles/common-run.lua index b4d0123f..9902daae 100644 --- a/modulefiles/common-run.lua +++ b/modulefiles/common-run.lua @@ -3,7 +3,7 @@ Load common modules to run GSI Monitoring 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 wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8" load(pathJoin("netcdf-c", netcdf_c_ver)) diff --git a/modulefiles/common.lua b/modulefiles/common.lua index fda621a1..cd1a17a3 100644 --- a/modulefiles/common.lua +++ b/modulefiles/common.lua @@ -3,7 +3,7 @@ Load common modules to build GSI Monitoring 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 bacio_ver=os.getenv("bacio_ver") or "2.4.1" local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2" diff --git a/modulefiles/hera.gnu-run.lua b/modulefiles/hera.gnu-run.lua index 6b03f2fd..658157ab 100644 --- a/modulefiles/hera.gnu-run.lua +++ b/modulefiles/hera.gnu-run.lua @@ -1,11 +1,11 @@ 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 stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0" local stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.5" -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" local grads_ver=os.getenv("grads_ver") or "2.2.1" load(pathJoin("stack-gcc", stack_gnu_ver)) diff --git a/modulefiles/hera.gnu.lua b/modulefiles/hera.gnu.lua index ecf64629..3b00a706 100644 --- a/modulefiles/hera.gnu.lua +++ b/modulefiles/hera.gnu.lua @@ -1,7 +1,7 @@ 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 stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0" local stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.5" diff --git a/modulefiles/hera.intel-run.lua b/modulefiles/hera.intel-run.lua index 6826a143..ebc2f068 100644 --- a/modulefiles/hera.intel-run.lua +++ b/modulefiles/hera.intel-run.lua @@ -1,12 +1,12 @@ 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 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 grads_ver=os.getenv("grads_ver") or "2.2.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/hera.intel.lua b/modulefiles/hera.intel.lua index b6675bf7..faba0ac3 100644 --- a/modulefiles/hera.intel.lua +++ b/modulefiles/hera.intel.lua @@ -1,7 +1,7 @@ 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 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" diff --git a/modulefiles/jet-run.lua b/modulefiles/jet-run.lua index f57a11fa..e9fa2c04 100644 --- a/modulefiles/jet-run.lua +++ b/modulefiles/jet-run.lua @@ -1,12 +1,12 @@ 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 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 grads_ver=os.getenv("grads_ver") or "2.2.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/jet.lua b/modulefiles/jet.lua index 85aa110f..68c1bedf 100644 --- a/modulefiles/jet.lua +++ b/modulefiles/jet.lua @@ -1,9 +1,9 @@ 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 stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" +local stack_python_ver=os.getenv("stack_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" diff --git a/modulefiles/orion-run.lua b/modulefiles/orion-run.lua index 0e7b5c9d..aba538af 100644 --- a/modulefiles/orion-run.lua +++ b/modulefiles/orion-run.lua @@ -1,12 +1,12 @@ 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-dev/install/modulefiles/Core") 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 grads_ver=os.getenv("grads_ver") or "2.2.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/orion.lua b/modulefiles/orion.lua index 5396be72..a143c962 100644 --- a/modulefiles/orion.lua +++ b/modulefiles/orion.lua @@ -1,7 +1,7 @@ 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-dev/install/modulefiles/Core") 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" diff --git a/modulefiles/s4-run.lua b/modulefiles/s4-run.lua index 4214abc2..f3f7f38c 100644 --- a/modulefiles/s4-run.lua +++ b/modulefiles/s4-run.lua @@ -1,12 +1,12 @@ 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-dev/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" local grads_ver=os.getenv("grads_ver") or "2.2.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/s4.lua b/modulefiles/s4.lua index 51aed3e9..1cb2bd7c 100644 --- a/modulefiles/s4.lua +++ b/modulefiles/s4.lua @@ -1,7 +1,7 @@ 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-dev/install/modulefiles/Core") load("license_intel/S4")