Skip to content

Commit d57779f

Browse files
NickSzapiro-NOAAgspetro-NOAABruceKropp-Raytheon
authored
Update CICE (2025-01) + Feature/cicd bugfix to save metrics result files #2592 + Remove Expanse/Odin/Stampede & Update Orion/Hercules lmod init script location #2570 (#2569)
* UFSWM - Update CICE to Consortium/main (2025-01) * UFSWM - Rm Expanse/Stampede/Odin & update Orion/Hercules lmod init location * UFSWM - Save cicd automation metrics in WORKSPACE * CICE - Update CICE to Consortium/main (2025-01) --------- Co-authored-by: gspetro-NOAA <[email protected]> Co-authored-by: Bruce Kropp <[email protected]>
1 parent ee3d52d commit d57779f

30 files changed

+2704
-2811
lines changed

‎.cicd/scripts/disk_usage.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ echo "script_dir=${script_dir}"
2525
declare workspace
2626
if [[ -d "${WORKSPACE}/${UFS_PLATFORM}" ]]; then
2727
workspace="${WORKSPACE}/${UFS_PLATFORM}"
28-
outfile="${4:-${workspace}-${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
28+
outfile="${4:-${WORKSPACE}/${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
2929
else
3030
workspace="$(cd -- "${script_dir}/../.." && pwd)"
31-
outfile="${4:-${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
31+
outfile="${4:-${WORKSPACE}/${UFS_PLATFORM}-${UFS_COMPILER}-disk-usage${STAGE_NAME%% *}.csv}"
3232
fi
3333
echo "workspace=${workspace}"
3434
echo "outfile=${outfile}"

‎.cicd/scripts/wm_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module list
6363
echo "Pipeline Building WM on ${UFS_PLATFORM} ${UFS_COMPILER} with Account=${ACCNR}."
6464
export CMAKE_FLAGS="-DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16"
6565
/usr/bin/time -p \
66-
-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_build.json \
66+
-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_build.json \
6767
-f '{\n "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
6868
./build.sh | tee ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-wm_build-log.txt
6969
status=${PIPESTATUS[0]}

‎.cicd/scripts/wm_init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ fi
3535
echo "machine_id=<${machine_id}>"
3636

3737
/usr/bin/time -p \
38-
-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_init.json \
38+
-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_init.json \
3939
-f '{\n "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
4040
pwd

‎.cicd/scripts/wm_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if [[ ${WM_REGRESSION_TESTS} = true ]] ; then
102102
ls -al .cicd/*
103103
echo "Pipeline Creating Baseline Tests ${WM_OPERATIONAL_TESTS:=default} on ${UFS_PLATFORM} ${UFS_COMPILER}"
104104
/usr/bin/time -p \
105-
-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
105+
-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
106106
-f '{\n "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
107107
./.cicd/scripts/create_baseline.sh | tee -a ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-wm_test-log.txt
108108
status=${PIPESTATUS[0]}
@@ -113,7 +113,7 @@ if [[ ${WM_REGRESSION_TESTS} = true ]] ; then
113113
ls -al .cicd/*
114114
echo "Pipeline Running Regression Tests ${WM_OPERATIONAL_TESTS:=default} on ${UFS_PLATFORM} ${UFS_COMPILER}"
115115
/usr/bin/time -p \
116-
-o ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
116+
-o ${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_test.json \
117117
-f '{\n "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
118118
./.cicd/scripts/regression_test.sh | tee -a ${workspace}/${UFS_PLATFORM}-${UFS_COMPILER}-wm_test-log.txt
119119
status=${PIPESTATUS[0]}

‎.github/pull_request_template.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ Please delete what is not needed.
145145
- [ ] Hera
146146
- [ ] Orion
147147
- [ ] Hercules
148-
- [ ] Jet
149148
- [ ] GaeaC5
150149
- [ ] GaeaC6
151150
- [ ] Derecho

‎CICE-interface/CICE

‎FV3

‎modulefiles/ufs_expanse.intel

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎modulefiles/ufs_odin

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎modulefiles/ufs_stampede.intel

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎tests/bl_date.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20250129
1+
export BL_DATE=20250205

‎tests/default_vars.sh

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -363,20 +363,6 @@ elif [[ ${MACHINE_ID} = derecho ]]; then
363363
export WPG_cpl_atmw_gdas=24
364364
export WAV_tasks_atmw_gdas=248
365365

366-
elif [[ ${MACHINE_ID} = stampede ]]; then
367-
368-
echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
369-
exit 1
370-
371-
# TPN_dflt=48 ; INPES_dflt=3 ; JNPES_dflt=8
372-
# TPN_thrd=24 ; INPES_thrd=3 ; JNPES_thrd=4
373-
# TPN_c384=20 ; INPES_c384=8 ; JNPES_c384=6
374-
# TPN_c768=20 ; INPES_c768=8 ; JNPES_c768=16
375-
# TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
376-
377-
# TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
378-
# THRD_cpl_atmw_gdas=4; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
379-
380366
elif [[ ${MACHINE_ID} = noaacloud ]] ; then
381367

382368
if [[ ${PW_CSP} == aws ]]; then
@@ -415,18 +401,6 @@ elif [[ ${MACHINE_ID} = noaacloud ]] ; then
415401
export ICE_tasks_cpl_thrd=10
416402
export WAV_tasks_cpl_thrd=12
417403

418-
elif [[ ${MACHINE_ID} = expanse ]]; then
419-
420-
echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
421-
exit 1
422-
423-
# TPN_dflt=64 ; INPES_dflt=3 ; JNPES_dflt=8
424-
# TPN_thrd=64 ; INPES_thrd=3 ; JNPES_thrd=4
425-
# TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
426-
427-
# TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
428-
# THRD_cpl_atmw_gdas=2; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
429-
430404
else
431405

432406
echo "Unknown MACHINE_ID ${MACHINE_ID}"

‎tests/detect_machine.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,9 @@ case $(hostname -f) in
4848
derecho7.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho7
4949
derecho8.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho8
5050

51-
login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4
52-
5351
login[1-4].frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera1-4
5452
c*.frontera.tacc.utexas.edu) MACHINE_ID=frontera ;; ### frontera compute
5553

56-
login0[1-2].expanse.sdsc.edu) MACHINE_ID=expanse ;; ### expanse1-2
57-
5854
discover3[1-5].prv.cube) MACHINE_ID=discover ;; ### discover31-35
5955
*) MACHINE_ID=UNKNOWN ;; # Unknown platform
6056
esac

‎tests/fv3_conf/fv3_slurm.IN_expanse

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎tests/fv3_conf/fv3_slurm.IN_stampede

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)