Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Rocky8 install of spack-stack on S4 #2507

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions modulefiles/ufs_s4.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ help([[
loads UFS Model prerequisites for S4/Intel
]])

prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/upp-addon-ue-intel-2021.10.0/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0"
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
Expand All @@ -16,6 +17,11 @@ load(pathJoin("stack-python", stack_python_ver))
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
load(pathJoin("cmake", cmake_ver))

--
-- St fms version for s4
--
setenv("fms_ver", "2023.04")

load("ufs_common")

nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
Expand Down
11 changes: 3 additions & 8 deletions tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -852,17 +852,14 @@ case ${MACHINE_ID} in
s4)
echo "rt.sh: Setting up s4..."
if [[ "${ROCOTO:-false}" == true ]] ; then
module load rocoto/1.3.2
module load rocoto/1.3.7
ROCOTO_SCHEDULER=slurm
fi
if [[ "${ECFLOW:-false}" == true ]] ; then
module load ecflow/5.6.0
fi
module load miniconda/3.8-s4

module use /data/prod/jedi/spack-stack/modulefiles
module use /data/prod/jedi/rocky8/modulefiles
if [[ "${ECFLOW:-false}" == true ]] ; then
module load ecflow/5.8.4
module load ecflow/5.13.4
ECF_HOST=$(hostname)
ECF_PORT="$(( $(id -u) + 1500 ))"
export ECF_PORT ECF_HOST
Expand Down Expand Up @@ -1126,8 +1123,6 @@ if [[ ${ECFLOW} == true ]]; then
# Reduce maximum number of compile jobs on jet and s4 because of licensing issues
if [[ ${MACHINE_ID} = jet ]]; then
MAX_BUILDS=5
elif [[ ${MACHINE_ID} = s4 ]]; then
MAX_BUILDS=1
fi

ECFLOW_RUN=${PATHRT}/ecflow_run
Expand Down
6 changes: 3 additions & 3 deletions tests/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ case ${MACHINE_ID} in
module load nccmp
;;
s4)
module use /data/prod/jedi/spack-stack/spack-stack-1.4.1/envs/ufs-pio-2.5.10/install/modulefiles/Core
module load stack-intel/2021.5.0 stack-intel-oneapi-mpi/2021.5.0
module load miniconda/3.9.12
module use data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/upp-addon-ue-intel-2021.10.0/install/modulefiles/Core
module load stack-intel/2021.10.0 stack-intel-oneapi-mpi/2021.10.0
module load miniconda/3.8-s4
module load nccmp/1.9.0.1
;;
stampede|expanse|noaacloud)
Expand Down