From 2ac2e269e6b9cb1674086cb027e8a579686f0a74 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Mon, 31 Jul 2023 16:18:39 -0500 Subject: [PATCH 1/3] corrections to module-setup.sh --- ush/module-setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ush/module-setup.sh b/ush/module-setup.sh index 8f16306efe..ab92477a56 100755 --- a/ush/module-setup.sh +++ b/ush/module-setup.sh @@ -18,7 +18,7 @@ elif [[ $MACHINE_ID = hera* ]] ; then elif [[ $MACHINE_ID = orion* ]] ; then # We are on Orion if ( ! eval module help > /dev/null 2>&1 ) ; then - source /apps/lmod/init/bash + source /apps/lmod/lmod/init/bash fi module purge @@ -58,7 +58,6 @@ elif [[ $MACHINE_ID = gaea* ]] ; then source /etc/profile __ms_source_etc_profile=yes fi - source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh From 2465cc79730b3b73d38b1e582e52a0f8d43fd785 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Mon, 31 Jul 2023 16:19:21 -0500 Subject: [PATCH 2/3] update to Orion software stack in a new role-epic location --- modulefiles/gsi_orion.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/gsi_orion.lua b/modulefiles/gsi_orion.lua index 43276b7cbe..a7ea874fb2 100644 --- a/modulefiles/gsi_orion.lua +++ b/modulefiles/gsi_orion.lua @@ -1,11 +1,11 @@ help([[ ]]) -prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/miniconda3/modulefiles") miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0" load(pathJoin("miniconda3", miniconda3_ver)) -prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2/modulefiles/stack") local hpc_ver=os.getenv("hpc_ver") or "1.2.0" local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2" From 67b87f4339a5bc966993cae06ece475025526c69 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Mon, 31 Jul 2023 16:50:01 -0500 Subject: [PATCH 3/3] updated regression/regression_param.sh srun command for Orion --- regression/regression_param.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression/regression_param.sh b/regression/regression_param.sh index 79a91bde8e..b017d80c34 100755 --- a/regression/regression_param.sh +++ b/regression/regression_param.sh @@ -349,7 +349,7 @@ if [[ "$machine" = "Hera" ]]; then export APRUN="srun" elif [[ "$machine" = "Orion" ]]; then export OMP_STACKSIZE=2048M - export APRUN="srun --label -n \$ntasks" + export APRUN="srun -n \$ntasks" elif [[ "$machine" = "Jet" ]]; then export OMP_STACKSIZE=1024M export MPI_BUFS_PER_PROC=256