From 10555baf5695f14f039e19e42db5c6894eda97e2 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Fri, 28 Jun 2024 11:43:56 -0400 Subject: [PATCH 1/2] update orion modulefile for rocky8 upgrade --- modulefiles/orion.intel-run.lua | 11 ++++++++--- modulefiles/orion.intel.lua | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modulefiles/orion.intel-run.lua b/modulefiles/orion.intel-run.lua index a6956cf..bb795b5 100644 --- a/modulefiles/orion.intel-run.lua +++ b/modulefiles/orion.intel-run.lua @@ -1,10 +1,15 @@ help([[ ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core") +-- Spack Stack installation specs +local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion" +local ss_ver=os.getenv("stack_ver") or "1.6.0" +local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9" -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" +prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "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 "2.1.1" diff --git a/modulefiles/orion.intel.lua b/modulefiles/orion.intel.lua index 1b3425a..8df836f 100644 --- a/modulefiles/orion.intel.lua +++ b/modulefiles/orion.intel.lua @@ -1,10 +1,15 @@ help([[ ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core") +-- Spack Stack installation specs +local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion" +local ss_ver=os.getenv("stack_ver") or "1.6.0" +local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9" -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" +prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "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)) From 106b91aff12d5386277bfc080109a3348b85fc40 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Fri, 28 Jun 2024 14:59:55 -0400 Subject: [PATCH 2/2] also update detect_machine.sh --- ush/detect_machine.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh index f42b648..eb2c223 100755 --- a/ush/detect_machine.sh +++ b/ush/detect_machine.sh @@ -75,8 +75,8 @@ elif [[ -d /scratch1 ]]; then MACHINE_ID=hera elif [[ -d /work ]]; then # We are on MSU Orion or Hercules - if [[ -d /apps/other ]]; then - # We are on Hercules + mount=$(findmnt -n -o SOURCE /home) + if [[ ${mount} =~ "hercules" ]]; then MACHINE_ID=hercules else MACHINE_ID=orion