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.

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

Jump to bottom

Re-work testing verification, fail file naming consistency, remove lsf support, simplify RT logs. #2061

Merged
merged 95 commits into from
Feb 21, 2024
Merged

Re-work testing verification, fail file naming consistency, remove lsf support, simplify RT logs. #2061

Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
6d06965
Remove LSF support
BrianCurtis-NOAA Dec 14, 2023
7645d38
Cleanup wording for RT failures, and why tests are failling
BrianCurtis-NOAA Dec 14, 2023
d4df8c7
merge conflict with rt_utils fixed
Dec 15, 2023
e83f033
Initial push, adds calculation to compare compiles and tests to make …
BrianCurtis-NOAA Dec 21, 2023
e6a72e0
Re-work testing verification to match STESTS_FILE
BrianCurtis-NOAA Dec 21, 2023
e781d2b
Merge branch 'cleanup_failures' of github.com:BrianCurtis-NOAA/ufs-we…
BrianCurtis-NOAA Dec 21, 2023
2768362
Brought in changes to wording for tests, and fixed any testing bugs
BrianCurtis-NOAA Dec 21, 2023
7d7d4ba
Fix error with logic in new verification function, and testing bugfixes
BrianCurtis-NOAA Dec 22, 2023
fba71de
Fixed issue with log dir test name having extra underscore
BrianCurtis-NOAA Dec 22, 2023
4d1c08c
Small adjustment of text
BrianCurtis-NOAA Dec 22, 2023
d2d27c7
Re-work verification a little to reduce the number of if statements.
BrianCurtis-NOAA Dec 22, 2023
70c02c1
Merge branch 'develop' of github.com:ufs-community/ufs-weather-model …
BrianCurtis-NOAA Dec 22, 2023
18e3cc4
bringing in changes to rt.sh for upsteam merge
BrianCurtis-NOAA Jan 10, 2024
c6e2b80
Merge Conflict Resolution
BrianCurtis-NOAA Jan 10, 2024
dc175ae
updates from testing, fixing associative arrays to regular arrays.
BrianCurtis-NOAA Jan 10, 2024
4ec2d73
Adjustments from testing
BrianCurtis-NOAA Jan 11, 2024
5594cad
Adjusting spacing, bring in check for word 'quota' in logs for disk i…
BrianCurtis-NOAA Jan 11, 2024
0f40706
Adjustments for errors
BrianCurtis-NOAA Jan 11, 2024
7ddc85f
missing echo causing failure
BrianCurtis-NOAA Jan 12, 2024
464ce2d
Merge branch 'develop' of github.com:ufs-community/ufs-weather-model …
BrianCurtis-NOAA Jan 12, 2024
3f88379
Major shift to cleanup RT logs to be more succinct, remove pretest op…
BrianCurtis-NOAA Jan 12, 2024
a565f44
Test Adjustments for new RT log
BrianCurtis-NOAA Jan 12, 2024
8536583
Be more specific in RT log notes
BrianCurtis-NOAA Jan 13, 2024
959d571
Found missing $ in string trying to print variable
BrianCurtis-NOAA Jan 13, 2024
224e285
Add timings to RT Log
BrianCurtis-NOAA Jan 13, 2024
27f8568
Fix counters, and show compile/text groupings better
BrianCurtis-NOAA Jan 14, 2024
9ff92e6
Add end of log statement missing from successful tests
BrianCurtis-NOAA Jan 14, 2024
0b4a091
Updated hera RT log as example of changes
BrianCurtis-NOAA Jan 14, 2024
939ff7b
Rearrage information locations and fix bug where times would show for…
BrianCurtis-NOAA Jan 14, 2024
cbfebe6
Fix a typo causing log to cut off a bit from top, move log informatio…
BrianCurtis-NOAA Jan 14, 2024
ce752d6
offset log infomation for better appearance
BrianCurtis-NOAA Jan 14, 2024
c6a9200
Need to format FAILED_COMPILES string differently to incorporate newl…
BrianCurtis-NOAA Jan 14, 2024
d682927
Strings with newlines act weird
BrianCurtis-NOAA Jan 14, 2024
f12c3ee
I am starting to dislike strings with a newline in them
BrianCurtis-NOAA Jan 15, 2024
6f327b2
Newlines in strings no more
BrianCurtis-NOAA Jan 15, 2024
43018c4
Missing a $ in iterator
BrianCurtis-NOAA Jan 15, 2024
710aeb0
Attempt to fix print out
BrianCurtis-NOAA Jan 15, 2024
03b725a
Make sure to add strings to a string array with ()
BrianCurtis-NOAA Jan 15, 2024
aa30ee6
Adding a section to specify 'timeout' failure, can't test easily though
BrianCurtis-NOAA Jan 15, 2024
cda854a
Updated hera log, full pass
BrianCurtis-NOAA Jan 15, 2024
98647ce
log merge conflict
BrianCurtis-NOAA Jan 23, 2024
2331ab5
Add memory to successful test output in log, correct some typos, clea…
BrianCurtis-NOAA Jan 23, 2024
98fa3c3
Small adjustments to make test_changes.out work and a couple visual c…
BrianCurtis-NOAA Jan 24, 2024
924de9b
Keep current hera log as proof of tests run
BrianCurtis-NOAA Jan 24, 2024
6a3d122
Re-write rt_single.conf as a rt.conf generator in cases where -n -l -…
BrianCurtis-NOAA Jan 29, 2024
1a87524
Re-work more of the -b option to use the new rtconf generator, also a…
BrianCurtis-NOAA Jan 30, 2024
11ad030
merge conflict revert logs file temporarily
BrianCurtis-NOAA Jan 30, 2024
9006468
Fix typo in 'NOTES:' section with how times/memory are enclosed in th…
BrianCurtis-NOAA Jan 31, 2024
4ddd7ee
Calculate MB for test sizes, fix a couple more typos
BrianCurtis-NOAA Jan 31, 2024
8c3e755
Merge branch 'develop' of github.com:ufs-community/ufs-weather-model …
BrianCurtis-NOAA Jan 31, 2024
2ec0ad8
Move to using variables when certain options are set, and adding BLDI…
BrianCurtis-NOAA Jan 31, 2024
9c4be17
New Hera log and a small update
BrianCurtis-NOAA Jan 31, 2024
8b6408a
test_changes.out -> test_changes.list as it's not .gitignored, and ma…
BrianCurtis-NOAA Jan 31, 2024
b3599d5
Derech RT Log
BrianCurtis-NOAA Jan 31, 2024
4d97908
Merge branch 'rt_pretest' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA Jan 31, 2024
1ee5d6c
All this time, I had the echo's in the wrong if block
BrianCurtis-NOAA Feb 1, 2024
3529537
Merge branch 'rt_pretest' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA Feb 1, 2024
cc58722
Derecho RT Log (NEW)
BrianCurtis-NOAA Feb 1, 2024
46e9191
Hera RT Log (NEW)
BrianCurtis-NOAA Feb 1, 2024
d57e040
Merge branch 'rt_pretest' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA Feb 1, 2024
36dbc93
Jet RT Log
BrianCurtis-NOAA Feb 1, 2024
1527afe
WCOSS2 RT Log
BrianCurtis-NOAA Feb 1, 2024
e958807
Acorn RT Log
BrianCurtis-NOAA Feb 1, 2024
504b03f
Orion RT Log
BrianCurtis-NOAA Feb 1, 2024
577ade7
Hercules RT Log
Feb 1, 2024
19eb5e4
Keeping current logs (hopefully)
BrianCurtis-NOAA Feb 2, 2024
792afcd
More keeping new logs (hopefully)
BrianCurtis-NOAA Feb 2, 2024
a1131df
OPTIND doesn't work as expected, forcing quotes after -n
BrianCurtis-NOAA Feb 2, 2024
0a2f0cb
Adjust to die command in -n option
BrianCurtis-NOAA Feb 2, 2024
dd97548
block -m/-c -k/-d and -e/-r from being selected at the same time
BrianCurtis-NOAA Feb 3, 2024
8368e92
Rocoto needs to create logs, so rt.sh can use them in log generation
BrianCurtis-NOAA Feb 5, 2024
2768521
Adjustments for merge conflicts, keeping my current RT logs
BrianCurtis-NOAA Feb 12, 2024
e4dab8c
Keeping new logs, not old
BrianCurtis-NOAA Feb 13, 2024
acf3093
Denise wanted a space between the file size and units
BrianCurtis-NOAA Feb 13, 2024
e18431d
A space between the file size and units was requested
BrianCurtis-NOAA Feb 13, 2024
f4b0f73
Merge branch 'rt_pretest' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA Feb 13, 2024
0d31ac8
Bringing upstream logs back for proper testing
BrianCurtis-NOAA Feb 16, 2024
049f8c4
add control_p8_gnu ORT logs: passed
zach1221 Feb 19, 2024
adc3824
add regional_control_gnu ORT logs: passed
zach1221 Feb 19, 2024
f3df212
add cpld_control_gnu ORT logs: passed
zach1221 Feb 19, 2024
4640e09
add hera RT logs: passed
zach1221 Feb 19, 2024
ff6cf3f
add orion RT logs: passed
zach1221 Feb 19, 2024
9c31b6e
add hercules RT logs: passed
zach1221 Feb 19, 2024
681a707
add gaea RT logs: passed
zach1221 Feb 19, 2024
7984c85
WCOSS2 RT Log
BrianCurtis-NOAA Feb 20, 2024
c354c9b
Acorn RT Log
BrianCurtis-NOAA Feb 20, 2024
0402bb5
Simplify PR template, with updates steming from changes in this PR
BrianCurtis-NOAA Feb 20, 2024
006e09b
Some wording touchups in PR template
BrianCurtis-NOAA Feb 20, 2024
0bec4d1
Trying to make PR template easier to fill out
BrianCurtis-NOAA Feb 20, 2024
87b8e49
add Derecho RT logs: passed
zach1221 Feb 21, 2024
a8f49c7
Update rt.sh with new Derecho ecflow paths & modules
zach1221 Feb 21, 2024
ed52baa
Update ufs_derecho.intel.lua Derecho modulepath
zach1221 Feb 21, 2024
d50788b
add jet RT logs: passed
zach1221 Feb 21, 2024
29eb0e5
Update options for describing if baselines are changing or not
BrianCurtis-NOAA Feb 21, 2024
2b8c641
Merge branch 'rt_pretest' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA Feb 21, 2024
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
8 changes: 4 additions & 4 deletions tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ fi
readonly ARGC=$#

if [[ $ARGC -lt 2 ]]; then
echo "Usage: $0 MACHINE_ID [ MAKE_OPT [ COMPILE_NR ] [ RT_COMPILER ] [ clean_before ] [ clean_after ] ]"
echo "Usage: $0 MACHINE_ID [ MAKE_OPT [ COMPILE_ID ] [ RT_COMPILER ] [ clean_before ] [ clean_after ] ]"
echo Valid MACHINE_IDs:
echo $( ls -1 ../cmake/configure_* | sed s:.*configure_::g | sed s:\.cmake:: ) | fold -sw72
exit 1
else
MACHINE_ID=$1
MAKE_OPT=${2:-}
COMPILE_NR=${3:+_$3}
COMPILE_ID=${3:+_$3}
RT_COMPILER=${4:-intel}
clean_before=${5:-YES}
clean_after=${6:-YES}
fi

BUILD_NAME=fv3${COMPILE_NR}
BUILD_NAME=fv3${COMPILE_ID}

PATHTR=${PATHTR:-$( cd ${MYDIR}/.. && pwd )}
BUILD_DIR=${BUILD_DIR:-$(pwd)/build_${BUILD_NAME}}
Expand Down Expand Up @@ -131,4 +131,4 @@ fi

elapsed=$SECONDS
echo "Elapsed time $elapsed seconds. Compiling ${CMAKE_FLAGS} finished"
echo "Compile ${COMPILE_NR/#_} elapsed time $elapsed seconds. ${CMAKE_FLAGS}" > compile${COMPILE_NR}_time.log
echo "Compile ${COMPILE_ID/#_} elapsed time $elapsed seconds. ${CMAKE_FLAGS}" > compile${COMPILE_ID}_time.log
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_qsub.IN_acorn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cd $PBS_O_WORKDIR
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_qsub.IN_derecho
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`
module purge

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_qsub.IN_wcoss2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cd $PBS_O_WORKDIR
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_slurm.IN_gaea
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_slurm.IN_hera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_slurm.IN_hercules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_slurm.IN_jet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_slurm.IN_noaacloud
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_slurm.IN_orion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/compile_slurm.IN_s4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_ID] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
Loading