Skip to content

Updates for gaea-c5 of modulefiles and scripts #13

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

Merged
ulmononian merged 3 commits into from
Nov 21, 2023
Merged

Updates for gaea-c5 of modulefiles and scripts #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0707e9
Merge recent updates from 'develop' into Gaea-C5 updates/PR1784
Nov 13, 2023
7dedc6f
updates for gaea-c5 modulefiles, scripts
Nov 15, 2023
fd892c1
Merge remote-tracking branch 'origin3/feature/add_c5' into feature_ga…
Nov 15, 2023
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
4 changes: 4 additions & 0 deletions cmake/configure_gaea-c5.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2")
set(HYCOM_Extra_C_FLAGS "-xSSE4.2")
3 changes: 1 addition & 2 deletions modulefiles/ufs_gaea_c5.intel.lua → modulefiles/ufs_gaea-c5.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ load(pathJoin("stack-python", stack_python_ver))
load("ufs_common")

unload("darshan-runtime")
unload("cray-libsci")

setenv("CC","cc")
setenv("CXX","CC")
setenv("FC","ftn")
setenv("CMAKE_Platform","gaea_c5.intel")
setenv("CMAKE_Platform","gaea-c5.intel")
2 changes: 1 addition & 1 deletion tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ else
if [[ $MACHINE_ID == gaea ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
# Activate lua environment for gaea c5
elif [[ $MACHINE_ID == gaea_c5 ]]; then
elif [[ $MACHINE_ID == gaea-c5 ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
fi
# Load fv3 module
Expand Down
2 changes: 1 addition & 1 deletion tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ elif [[ $MACHINE_ID = gaea ]]; then
INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
WAV_tasks_atmw_gdas=264

elif [[ $MACHINE_ID = gaea_c5 ]]; then
elif [[ $MACHINE_ID = gaea-c5 ]]; then

TPN=128

Expand Down
16 changes: 8 additions & 8 deletions tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ case $(hostname -f) in
gaea15.ncrc.gov) MACHINE_ID=gaea ;; ### gaea15
gaea16.ncrc.gov) MACHINE_ID=gaea ;; ### gaea16

gaea51.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea51
gaea52.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea52
gaea53.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea53
gaea54.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea54
gaea55.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea55
gaea56.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea56
gaea57.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea57
gaea58.ncrc.gov) MACHINE_ID=gaea_c5 ;; ### gaea58
gaea51.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea51
gaea52.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea52
gaea53.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea53
gaea54.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea54
gaea55.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea55
gaea56.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea56
gaea57.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea57
gaea58.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea58

hfe01) MACHINE_ID=hera ;; ### hera01
hfe02) MACHINE_ID=hera ;; ### hera02
Expand Down
0 tests/fv3_conf/compile_slurm.IN_gaea_c5 → tests/fv3_conf/compile_slurm.IN_gaea-c5
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions tests/fv3_conf/fv3_slurm.IN_gaea_c5 → tests/fv3_conf/fv3_slurm.IN_gaea-c5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
#SBATCH --job-name="@[JBNME]"
#SBATCH --account=@[ACCNR]
#SBATCH --qos=@[QUEUE]
#SBATCH --clusters=@[PARTITION]
#SBATCH --clusters=c5
#SBATCH --partition=batch
#SBATCH --nodes=@[NODES]
#SBATCH --ntasks-per-node=@[TPN]
#SBATCH --time=@[WLCLK]
Expand All @@ -13,7 +14,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt

set +x
MACHINE_ID=gaea_c5
MACHINE_ID=gaea-c5
source ./module-setup.sh
module use --prepend $PWD/modulefiles
module load modules.fv3
Expand Down
3,745 changes: 3,745 additions & 0 deletions tests/logs/RegressionTests_gaea-c5.log
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ elif [[ $MACHINE_ID = gaea ]] ; then
fi
source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh

elif [[ $MACHINE_ID = gaea_c5 ]] ; then
elif [[ $MACHINE_ID = gaea-c5 ]] ; then
# We are on GAEA C5
if ( ! eval module help > /dev/null 2>&1 ) ; then
# We cannot simply load the module command. The GAEA
Expand Down
17 changes: 14 additions & 3 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ elif [[ $MACHINE_ID = acorn ]]; then

elif [[ $MACHINE_ID = gaea ]]; then

module use /lustre/f2/dev/Samuel.Trahan/hafs/modulefiles/
module use /lustre/f2/dev/role.epic/contrib/rocoto/modulefiles
module load rocoto
ROCOTORUN=$(which rocotorun)
ROCOTOSTAT=$(which rocotostat)
Expand All @@ -327,10 +327,17 @@ elif [[ $MACHINE_ID = gaea ]]; then

SCHEDULER=slurm

elif [[ $MACHINE_ID = gaea_c5 ]]; then
elif [[ $MACHINE_ID = gaea-c5 ]]; then

module use /lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles
module load rocoto
ROCOTORUN=$(which rocotorun)
ROCOTOSTAT=$(which rocotostat)
ROCOTOCOMPLETE=$(which rocotocomplete)
ROCOTO_SCHEDULER=slurm

module load PrgEnv-intel/8.3.3
module load intel-classic/2022.2.1
module load intel-classic/2023.1.0
module load cray-mpich/8.1.25
module load python/3.9.12
module use /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles
Expand Down Expand Up @@ -676,6 +683,10 @@ if [[ $ROCOTO == true ]]; then
QUEUE=normal
COMPILE_QUEUE=normal
ROCOTO_SCHEDULER=slurm
elif [[ $MACHINE_ID = gaea-c5 ]]; then
QUEUE=normal
COMPILE_QUEUE=normal
ROCOTO_SCHEDULER=slurm
else
die "Rocoto is not supported on this machine $MACHINE_ID"
fi
Expand Down
18 changes: 17 additions & 1 deletion tests/rt_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ check_results() {
fi

if [[ $d -eq 1 && ${i##*.} == 'nc' ]] ; then
if [[ " orion hercules hera wcoss2 acorn cheyenne gaea gaea_c5 jet s4 noaacloud " =~ " ${MACHINE_ID} " ]]; then
if [[ " orion hercules hera wcoss2 acorn cheyenne gaea gaea-c5 jet s4 noaacloud " =~ " ${MACHINE_ID} " ]]; then
printf ".......ALT CHECK.." >> ${RT_LOG}
printf ".......ALT CHECK.."
if [[ $CMP_DATAONLY == false ]]; then
Expand Down Expand Up @@ -472,6 +472,10 @@ rocoto_create_compile_task() {
if [[ $MACHINE_ID == gaea ]]; then
BUILD_WALLTIME="01:00:00"
fi
if [[ $MACHINE_ID == gaea-c5 ]]; then
BUILD_WALLTIME="01:00:00"
fi


cat << EOF >> $ROCOTO_XML
<task name="compile_${COMPILE_NR}" maxtries="${ROCOTO_COMPILE_MAXTRIES:-3}">
Expand All @@ -487,6 +491,12 @@ EOF
<partition>eslogin</partition>
<native>--exclude=gaea9</native>
EOF

elif [[ "$MACHINE_ID" == gaea-c5 ]] ; then
cat << EOF >> $ROCOTO_XML
<native>--clusters=es</native>
<partition>eslogin_c5</partition>
EOF
else
cat << EOF >> $ROCOTO_XML
<partition>${PARTITION}</partition>
Expand Down Expand Up @@ -530,6 +540,12 @@ EOF
cat << EOF >> $ROCOTO_XML
<native>--clusters=${PARTITION}</native>
EOF

elif [[ "$MACHINE_ID" == gaea-c5 ]] ; then
cat << EOF >> $ROCOTO_XML
<native>--clusters=${PARTITION}</native>
<native>--partition=batch</native>
EOF
else
cat << EOF >> $ROCOTO_XML
<queue>${QUEUE}</queue>
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 @@ -97,7 +97,7 @@ cp ${PATHTR}/modulefiles/ufs_common* ./modulefiles/.
cp ${PATHRT}/module-setup.sh module-setup.sh

# load nccmp module
if [[ " s4 hera orion hercules gaea gaea_c5 jet cheyenne acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
if [[ " s4 hera orion hercules gaea gaea-c5 jet cheyenne acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
if [[ " wcoss2 acorn " =~ " ${MACHINE_ID} " ]] ; then
module load intel/19.1.3.304 netcdf/4.7.4
module load nccmp
Expand All @@ -106,7 +106,7 @@ if [[ " s4 hera orion hercules gaea gaea_c5 jet cheyenne acorn wcoss2 " =~ " $MA
module load stack-intel/2021.5.0 stack-intel-oneapi-mpi/2021.5.0
module load miniconda/3.9.12
module load nccmp/1.9.0.1
elif [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then
elif [[ " hera orion hercules gaea gaea-c5 jet " =~ " ${MACHINE_ID} " ]] ; then
module use modulefiles
module load modules.fv3
else
Expand Down