Skip to content

Remove Expanse/Odin/Stampede & Update Orion/Hercules lmod init script location #2570

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.

Sign up for GitHub

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

Closed
gspetro-NOAA wants to merge 14 commits into from
Closed

Remove Expanse/Odin/Stampede & Update Orion/Hercules lmod init script location #2570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2d92e57
rm ufs_odin modulefile
gspetro-NOAA Jan 21, 2025
a68cbba
rm expanse modulefile
gspetro-NOAA Jan 21, 2025
548dd65
rm stampede modulefile
gspetro-NOAA Jan 21, 2025
b7c086a
correct orion lmod init path
gspetro-NOAA Jan 21, 2025
62bccd1
rm fv3_slurm.IN_expanse
gspetro-NOAA Jan 23, 2025
377f99c
rm expanse from sh scripts
gspetro-NOAA Jan 23, 2025
21f78e8
rm expanse from defaults_vars.sh
gspetro-NOAA Jan 23, 2025
9a1f3c7
rm expanse from rt.sh
gspetro-NOAA Jan 23, 2025
622de4d
rm fv3_slurm.IN_stampede
gspetro-NOAA Jan 23, 2025
8ea6bf4
rm stampede-related logic
gspetro-NOAA Jan 23, 2025
efa208a
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
gspetro-NOAA Jan 24, 2025
48847e5
Merge branch 'ufs-community:develop' into feature/issues-modules
gspetro-NOAA Feb 4, 2025
d26f773
address issue #2539
gspetro-NOAA Feb 5, 2025
4382794
Merge branch 'ufs-community:develop' into feature/issues-modules
gspetro-NOAA Feb 5, 2025
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
32 changes: 0 additions & 32 deletions modulefiles/ufs_expanse.intel
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions modulefiles/ufs_odin
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions modulefiles/ufs_stampede.intel
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,20 +363,6 @@ elif [[ ${MACHINE_ID} = derecho ]]; then
export WPG_cpl_atmw_gdas=24
export WAV_tasks_atmw_gdas=248

elif [[ ${MACHINE_ID} = stampede ]]; then

echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
exit 1

# TPN_dflt=48 ; INPES_dflt=3 ; JNPES_dflt=8
# TPN_thrd=24 ; INPES_thrd=3 ; JNPES_thrd=4
# TPN_c384=20 ; INPES_c384=8 ; JNPES_c384=6
# TPN_c768=20 ; INPES_c768=8 ; JNPES_c768=16
# TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4

# TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
# THRD_cpl_atmw_gdas=4; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"

elif [[ ${MACHINE_ID} = noaacloud ]] ; then

if [[ ${PW_CSP} == aws ]]; then
Expand Down Expand Up @@ -415,18 +401,6 @@ elif [[ ${MACHINE_ID} = noaacloud ]] ; then
export ICE_tasks_cpl_thrd=10
export WAV_tasks_cpl_thrd=12

elif [[ ${MACHINE_ID} = expanse ]]; then

echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
exit 1

# TPN_dflt=64 ; INPES_dflt=3 ; JNPES_dflt=8
# TPN_thrd=64 ; INPES_thrd=3 ; JNPES_thrd=4
# TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4

# TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
# THRD_cpl_atmw_gdas=2; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"

else

echo "Unknown MACHINE_ID ${MACHINE_ID}"
Expand Down
4 changes: 0 additions & 4 deletions tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@ case $(hostname -f) in
derecho7.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho7
derecho8.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho8

login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4

login[1-4].frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera1-4
c*.frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera compute

login0[1-2].expanse.sdsc.edu) MACHINE_ID=expanse ;; ### expanse1-2

discover3[1-5].prv.cube) MACHINE_ID=discover ;; ### discover31-35
*) MACHINE_ID=UNKNOWN ;; # Unknown platform
esac
Expand Down
40 changes: 0 additions & 40 deletions tests/fv3_conf/fv3_slurm.IN_expanse
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions tests/fv3_conf/fv3_slurm.IN_stampede
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions tests/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/other/lmod/lmod/init/bash
fi
module purge

Expand Down Expand Up @@ -51,13 +51,6 @@ elif [[ ${MACHINE_ID} = derecho ]] ; then
fi
module purge

elif [[ ${MACHINE_ID} = stampede ]] ; then
# We are on TACC Stampede
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /opt/apps/lmod/lmod/init/bash
fi
module purge

elif [[ ${MACHINE_ID} = frontera ]] ; then
# We are on TACC Frontera
if ( ! eval module help > /dev/null 2>&1 ) ; then
Expand All @@ -81,14 +74,6 @@ elif [[ ${MACHINE_ID} = gaeac6 ]]; then
source /opt/cray/pe/lmod/lmod/init/bash
fi
module reset

elif [[ ${MACHINE_ID} = expanse ]]; then
# We are on SDSC Expanse
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /etc/profile.d/modules.sh
fi
module purge
module load slurm/expanse/20.02.3

elif [[ ${MACHINE_ID} = noaacloud ]] ; then
# We are on NOAA Cloud
Expand Down
37 changes: 2 additions & 35 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,39 +947,6 @@ case ${MACHINE_ID} in
ROCOTO_SCHEDULER="pbspro"
fi
;;
stampede)
echo "rt.sh: Setting up stampede..."
export PYTHONPATH=
if [[ "${ECFLOW:-false}" == true ]] ; then
ECFLOW_START=
fi
QUEUE=skx-normal
COMPILE_QUEUE=skx-dev
PARTITION=
dprefix="${SCRATCH}/ufs-weather-model/run"
DISKNM="/work2/07736/minsukji/stampede2/ufs-weather-model/RT"
STMP="${dprefix}"
PTMP="${dprefix}"
SCHEDULER="slurm"
export MPIEXEC="ibrun"
export MPIEXECOPTS=
;;
expanse)
echo "rt.sh: Setting up expanse..."
export PYTHONPATH=

if [[ "${ECFLOW:-false}" == true ]] ; then
export ECFLOW_START=
fi
QUEUE="compute"
COMPILE_QUEUE="shared"
PARTITION=
dprefix="/expanse/lustre/scratch/${USER}/temp_project/run"
DISKNM="/expanse/lustre/scratch/domh/temp_project/RT"
STMP="${dprefix}"
PTMP="${dprefix}"
SCHEDULER="slurm"
;;
noaacloud)
echo "rt.sh: Setting up noaacloud..."
export PATH="/contrib/EPIC/bin:${PATH}"
Expand Down Expand Up @@ -1093,7 +1060,7 @@ if [[ ${ROCOTO} == true ]]; then
echo "rt.sh: Verifying ROCOTO support..."

case ${MACHINE_ID} in
wcoss2|acorn|expanse|stampede)
wcoss2|acorn)
die "Rocoto not supported on this machine, please do not use '-r'."
;;
*)
Expand Down Expand Up @@ -1135,7 +1102,7 @@ fi
if [[ ${ECFLOW} == true ]]; then
echo "Verifying ECFLOW support..."
case ${MACHINE_ID} in
expanse|stampede|noaacloud)
noaacloud)
die "ECFLOW not supported on this machine, please do not use '-e'."
;;
*)
Expand Down
4 changes: 2 additions & 2 deletions tests/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ case ${MACHINE_ID} in
module load miniconda/3.9.12
module load nccmp/1.9.0.1
;;
stampede|expanse|noaacloud)
noaacloud)
echo "No special nccmp load necessary"
;;
gaeac5)
Expand Down Expand Up @@ -483,7 +483,7 @@ if [[ ${skip_check_results} == false ]]; then

else
if [[ ${i##*.} == nc* ]] ; then
if [[ " orion hercules hera wcoss2 acorn derecho gaeac5 gaeac6 jet s4 noaacloud " =~ ${MACHINE_ID} ]]; then
if [[ " orion hercules hera wcoss2 acorn derecho gaeac5 gaeac6 jet s4 noaacloud frontera" =~ ${MACHINE_ID} ]]; then
printf "USING NCCMP.." >> "${RT_LOG}"
printf "USING NCCMP.."
if [[ ${CMP_DATAONLY} == false ]]; then
Expand Down