From 49c278d3678859aa4ab029a97d1c6661fa920a14 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Wed, 15 Nov 2023 13:19:00 +0000 Subject: [PATCH] Upgrade to spack-stack/1.5.1. #98 --- modulefiles/common.lua | 4 ++-- modulefiles/hera.gnu-run.lua | 4 ++-- modulefiles/hera.gnu.lua | 3 +-- modulefiles/hera.intel-run.lua | 3 +-- modulefiles/hera.intel.lua | 5 +---- modulefiles/hercules-run.lua | 18 ++++++++++++++++++ modulefiles/hercules.lua | 16 ++++++++++++++++ modulefiles/jet-run.lua | 15 +++++++-------- modulefiles/jet.lua | 16 ++++++++-------- modulefiles/orion-run.lua | 12 +++++------- modulefiles/orion.lua | 16 ++++++---------- modulefiles/s4-run.lua | 19 ++++++++----------- modulefiles/s4.lua | 17 +++++++++-------- 13 files changed, 84 insertions(+), 64 deletions(-) create mode 100644 modulefiles/hercules-run.lua create mode 100644 modulefiles/hercules.lua diff --git a/modulefiles/common.lua b/modulefiles/common.lua index 8192b7bf..fda621a1 100644 --- a/modulefiles/common.lua +++ b/modulefiles/common.lua @@ -5,8 +5,8 @@ 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 bacio_ver=os.getenv("bacio_ver") or "2.4.1" -local w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" -local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1" +local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" +local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2" load(pathJoin("netcdf-c", netcdf_c_ver)) load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) diff --git a/modulefiles/hera.gnu-run.lua b/modulefiles/hera.gnu-run.lua index 8d221f62..6b03f2fd 100644 --- a/modulefiles/hera.gnu-run.lua +++ b/modulefiles/hera.gnu-run.lua @@ -1,7 +1,7 @@ help([[ ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/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" @@ -11,7 +11,7 @@ local grads_ver=os.getenv("grads_ver") or "2.2.1" load(pathJoin("stack-gcc", stack_gnu_ver)) load(pathJoin("stack-openmpi", stack_openmpi_ver)) load(pathJoin("grads", grads_ver)) -load(pathJoin("prod-util", prod_util_ver)) +load(pathJoin("prod_util", prod_util_ver)) load("common-run") diff --git a/modulefiles/hera.gnu.lua b/modulefiles/hera.gnu.lua index ea1a0f09..ecf64629 100644 --- a/modulefiles/hera.gnu.lua +++ b/modulefiles/hera.gnu.lua @@ -1,8 +1,7 @@ help([[ ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/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 bd51a667..b4d94564 100644 --- a/modulefiles/hera.intel-run.lua +++ b/modulefiles/hera.intel-run.lua @@ -1,8 +1,7 @@ help([[ ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/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/hera.intel.lua b/modulefiles/hera.intel.lua index 28f213be..b6675bf7 100644 --- a/modulefiles/hera.intel.lua +++ b/modulefiles/hera.intel.lua @@ -1,17 +1,14 @@ help([[ ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -local stack_python_ver=os.getenv("stack_python_ver") or "3.9.12" 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" load(pathJoin("stack-intel", stack_intel_ver)) load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -load(pathJoin("stack-python", stack_python_ver)) load(pathJoin("cmake", cmake_ver)) load("common") diff --git a/modulefiles/hercules-run.lua b/modulefiles/hercules-run.lua new file mode 100644 index 00000000..1114299c --- /dev/null +++ b/modulefiles/hercules-run.lua @@ -0,0 +1,18 @@ +help([[ +]]) + +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") + +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 grads_ver=os.getenv("grads_ver") or "2.2.1" +local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2" + +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +load(pathJoin("grads", grads_ver)) +load(pathJoin("prod_util", prod_util_ver)) + +load("common-run") + +whatis("Description: GSI Monitoring run-time environment on Orion") diff --git a/modulefiles/hercules.lua b/modulefiles/hercules.lua new file mode 100644 index 00000000..a889dcf0 --- /dev/null +++ b/modulefiles/hercules.lua @@ -0,0 +1,16 @@ +help([[ +]]) + +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") + +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 cmake_ver=os.getenv("cmake_ver") or "3.23.1" + +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +load(pathJoin("cmake", cmake_ver)) + +load("common") + +whatis("Description: GSI Monitoring environment on Orion with Intel Compilers") diff --git a/modulefiles/jet-run.lua b/modulefiles/jet-run.lua index dc0fd70a..f9a2d964 100644 --- a/modulefiles/jet-run.lua +++ b/modulefiles/jet-run.lua @@ -1,21 +1,20 @@ help([[ ]]) -prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack") +prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -local hpc_ver=os.getenv("hpc_ver") or "1.1.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4.274" +local stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" +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" -load(pathJoin("hpc", hpc_ver)) -load(pathJoin("hpc-intel", hpc_intel_ver)) -load(pathJoin("hpc-impi", hpc_impi_ver)) +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +load(pathJoin("stack-python", stack_python_ver)) load(pathJoin("grads", grads_ver)) load(pathJoin("prod_util", prod_util_ver)) load("common-run") - whatis("Description: GSI Monitoring run-time environment on Jet") diff --git a/modulefiles/jet.lua b/modulefiles/jet.lua index 1d131395..85aa110f 100644 --- a/modulefiles/jet.lua +++ b/modulefiles/jet.lua @@ -1,16 +1,16 @@ help([[ ]]) -prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-18.0.5.274/modulefiles/stack") +prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -local hpc_ver=os.getenv("hpc_ver") or "1.2.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4.274" -local cmake_ver=os.getenv("cmake_ver") or "3.20.1" +local stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" +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" -load(pathJoin("hpc", hpc_ver)) -load(pathJoin("hpc-intel", hpc_intel_ver)) -load(pathJoin("hpc-impi", hpc_impi_ver)) +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +load(pathJoin("stack-python", stack_python_ver)) load(pathJoin("cmake", cmake_ver)) load("common") diff --git a/modulefiles/orion-run.lua b/modulefiles/orion-run.lua index 229ac582..0e7b5c9d 100644 --- a/modulefiles/orion-run.lua +++ b/modulefiles/orion-run.lua @@ -1,17 +1,15 @@ help([[ ]]) -prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -local hpc_ver=os.getenv("hpc_ver") or "1.1.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2018.4" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4" +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" -load(pathJoin("hpc", hpc_ver)) -load(pathJoin("hpc-intel", hpc_intel_ver)) -load(pathJoin("hpc-impi", hpc_impi_ver)) +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) load(pathJoin("grads", grads_ver)) load(pathJoin("prod_util", prod_util_ver)) diff --git a/modulefiles/orion.lua b/modulefiles/orion.lua index 4bce8854..5396be72 100644 --- a/modulefiles/orion.lua +++ b/modulefiles/orion.lua @@ -1,19 +1,15 @@ help([[ ]]) -prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -local hpc_ver=os.getenv("hpc_ver") or "1.1.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2018.4" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4" -local cmake_ver=os.getenv("cmake_ver") or "3.22.1" -local python_ver=os.getenv("python_ver") or "3.7.5" +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" -load(pathJoin("hpc", hpc_ver)) -load(pathJoin("hpc-intel", hpc_intel_ver)) -load(pathJoin("hpc-impi", hpc_impi_ver)) +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) load(pathJoin("cmake", cmake_ver)) -load(pathJoin("python", python_ver)) load("common") diff --git a/modulefiles/s4-run.lua b/modulefiles/s4-run.lua index 04eb58b9..0f88da20 100644 --- a/modulefiles/s4-run.lua +++ b/modulefiles/s4-run.lua @@ -1,23 +1,20 @@ help([[ ]]) -prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack") +prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -local license_ver=os.getenv("license_ver") or "S4" -local hpc_ver=os.getenv("hpc_ver") or "1.1.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.4" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "18.0.4" +load("license_intel/S4") + +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" -load(pathJoin("license_intel", license_ver)) -load(pathJoin("hpc", hpc_ver)) -load(pathJoin("hpc-intel", hpc_intel_ver)) -load(pathJoin("hpc-impi", hpc_impi_ver)) +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) load(pathJoin("grads", grads_ver)) -load(pathJoin("prod_util", prod_util_ver)) +load(pathJoin("prod-util", prod_util_ver)) load("common-run") - whatis("Description: GSI Monitoring run-time environment on S4") diff --git a/modulefiles/s4.lua b/modulefiles/s4.lua index aaeb0776..8198ac0e 100644 --- a/modulefiles/s4.lua +++ b/modulefiles/s4.lua @@ -1,16 +1,17 @@ help([[ ]]) -local hpc_ver=os.getenv("hpc_ver") or "1.1.0" -local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.4" -local hpc_impi_ver=os.getenv("hpc_impi_ver") or "18.0.4" - -prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack") +prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") load("license_intel/S4") -load(pathJoin("hpc", hpc_ver)) -load(pathJoin("hpc-intel", hpc_intel_ver)) -load(pathJoin("hpc-impi", hpc_impi_ver)) + +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" + +load(pathJoin("stack-intel", stack_intel_ver)) +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +load(pathJoin("cmake", cmake_ver)) load("common")