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

update suite.submit script and add new controls and cice.setup option… #395

Merged
merged 4 commits into from
Feb 14, 2020
Merged

update suite.submit script and add new controls and cice.setup option… #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fafde4a
update suite.submit script and add new controls and cice.setup option…
apcraig Jan 15, 2020
6a892fc
update cice.setup new --setup options
apcraig Jan 17, 2020
5afbf0c
update documentation
apcraig Feb 11, 2020
3a2f1f6
update documentation
apcraig Feb 11, 2020
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
175 changes: 109 additions & 66 deletions cice.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ set stime = `date -u "+%H%M%S"`
set docase = 0
set dotest = 0
set dosuite = 0
set suitebuild = true
set suiterun = false
set suitesubmit = true

if ($#argv < 1) then
set helpheader = 1
Expand Down Expand Up @@ -79,6 +82,7 @@ SYNOPSIS
--suite SUITE[,SUITE2] -m MACH --testid ID
[-e ENV1,ENV2][--acct ACCT][--bdir DIR][--bgen DIR]
[--bcmp DIR][--tdir PATH][--report]
[--setup-only || --setup-build || --setup-build-run || --setup-build-submit]

DESCRIPTION
--help, -h : help
Expand All @@ -104,6 +108,10 @@ DESCRIPTION
--testid : test ID, user-defined id for testing (REQUIRED with --test or --suite)
--diff : generate comparison against another case
--report : automatically post results when tests are complete
--setup-only : for suite, setup testcases, no build, no submission
--setup-build : for suite, setup and build testcases, no submission
--setup-build-run : for suite, setup, build, and run interactively
--setup-build-submit : for suite, setup, build, and submit (default behavior)

EXAMPLES
cice.setup --version
Expand All @@ -122,44 +130,45 @@ SEE ALSO
EOF1

if ($helpheader > 1) then
cat << EOF1
cat << EOF1

Available --mach and --env combinations are in configuration/scripts/machines and include:
EOF1
set soptions1 = `ls -1 configuration/scripts/machines | grep Macros | sed 's/Macros.//g' `
set soptions = `echo $soptions1 | fmt -1 | sort `
foreach sopt ($soptions)
echo " $sopt"
end
cat << EOF1
set soptions1 = `ls -1 configuration/scripts/machines | grep Macros | sed 's/Macros.//g' `
set soptions = `echo $soptions1 | fmt -1 | sort `
foreach sopt ($soptions)
echo " $sopt"
end

cat << EOF1

Available --set options are in configuration/scripts/options and include:
EOF1
set soptions1 = `ls -1 configuration/scripts/options | grep set_ | sed 's/set_nml.//g' | sed 's/set_env.//g' | sed 's/set_files.//g' `
set soptions = `echo $soptions1 | fmt -1 | sort -u `
foreach sopt ($soptions)
echo " $sopt"
end
set soptions1 = `ls -1 configuration/scripts/options | grep set_ | sed 's/set_nml.//g' | sed 's/set_env.//g' | sed 's/set_files.//g' `
set soptions = `echo $soptions1 | fmt -1 | sort -u `
foreach sopt ($soptions)
echo " $sopt"
end

cat << EOF1
cat << EOF1

Available tests are in configuration/scripts/tests and include:
EOF1
set soptions1 = `ls -1 configuration/scripts/tests | grep test_ | grep script | sed 's/test_//g' | sed 's/.script//g' `
set soptions = `echo $soptions1 | fmt -1 | sort `
foreach sopt ($soptions)
echo " $sopt"
end
set soptions1 = `ls -1 configuration/scripts/tests | grep test_ | grep script | sed 's/test_//g' | sed 's/.script//g' `
set soptions = `echo $soptions1 | fmt -1 | sort `
foreach sopt ($soptions)
echo " $sopt"
end

cat << EOF1
cat << EOF1

Available sets of predefined suites are in configurations/scripts/tests and include:
EOF1
set soptions1 = `ls -1 configuration/scripts/tests | grep "\.ts" | sed 's/\.ts//g' `
set soptions = `echo $soptions1 | fmt -1 | sort `
foreach sopt ($soptions)
echo " $sopt"
end
set soptions1 = `ls -1 configuration/scripts/tests | grep "\.ts" | sed 's/\.ts//g' `
set soptions = `echo $soptions1 | fmt -1 | sort `
foreach sopt ($soptions)
echo " $sopt"
end

endif
exit -1
Expand Down Expand Up @@ -215,6 +224,30 @@ while (1)
set report = 1
shift argv

else if ("$option" == "--setup-only") then
set suitebuild = false
set suiterun = false
set suitesubmit = false
shift argv

else if ("$option" == "--setup-build") then
set suitebuild = true
set suiterun = false
set suitesubmit = false
shift argv

else if ("$option" == "--setup-build-run") then
set suitebuild = true
set suiterun = true
set suitesubmit = false
shift argv

else if ("$option" == "--setup-build-submit") then
set suitebuild = true
set suiterun = false
set suitesubmit = true
shift argv

# arguments with settings
else
shift argv
Expand Down Expand Up @@ -379,16 +412,35 @@ else
cp -f ${ICE_SCRIPTS}/tests/report_results.csh ${tsdir}
cp -f ${ICE_SCRIPTS}/tests/poll_queue.csh ${tsdir}

foreach file (${tsdir}/suite.run ${tsdir}/suite.submit)
cat >! $file << EOF0
cat >! ${tsdir}/suite.submit << EOF0
#!/bin/csh -f

set nonomatch && rm -f ciceexe.* && unset nonomatch

set dobuild = true
set dorun = false
set dosubmit = true
if (\$?SUITE_BUILD) then
set dobuild = "\${SUITE_BUILD}"
if (\$?SUITE_RUN) then
set dorun = "\${SUITE_RUN}"
endif
if (\$?SUITE_SUBMIT) then
set dosubmit = "\${SUITE_SUBMIT}"
endif

echo \${0}: dobuild = \${dobuild}
echo \${0}: dorun = \${dorun}
echo \${0}: dosubmit = \${dosubmit}

if (\${dorun} == true && \${dosubmit} == true) then
echo \${0}: ERROR dorun and dosubmit should not both be true
exit -1
endif

EOF0
end

cat >! ${tsdir}/results.csh << EOF0
cat >! ${tsdir}/results.csh << EOF0
#!/bin/csh -f
rm -f results.log
echo "#------- " >> results.log
Expand All @@ -406,7 +458,6 @@ echo "#vers = ${vers}" >> results.log
echo "#------- " >> results.log
EOF0

chmod +x ${tsdir}/suite.run
chmod +x ${tsdir}/suite.submit
chmod +x ${tsdir}/results.csh

Expand Down Expand Up @@ -445,11 +496,11 @@ foreach compiler ( $ncompilers )
continue
# Check if line is a sleep line, can only happen with suites
else if ( $line:q =~ 'sleep'*) then
cat >> ${tsdir}/suite.submit << EOF
cat >> ${tsdir}/suite.submit << EOF

echo "-------test--------------"
echo "$line:q"
$line:q

EOF
echo "adding sleep line: $line"
echo ""
Expand Down Expand Up @@ -720,7 +771,7 @@ EOF
if (-e ${fimods}) rm ${fimods}
if (-e ${fsmods}) rm ${fsmods}

cat >! ${fimods} << EOF1
cat >! ${fimods} << EOF1
# cice.setup settings

nprocs = ${task}
Expand Down Expand Up @@ -749,7 +800,7 @@ EOF1
set baseCom = `ls -t $basedir_tmp | head -1`
endif

cat >! ${fsmods} << EOF1
cat >! ${fsmods} << EOF1
# cice.setup settings

setenv ICE_SANDBOX ${ICE_SANDBOX}
Expand Down Expand Up @@ -824,15 +875,13 @@ EOF1
foreach name (${grid} $setsx)
set found = 0
if (-e ${ICE_SCRIPTS}/options/set_nml.${name}) then

cat >> ${fimods} << EOF2
cat >> ${fimods} << EOF2

# set_nml.${name}

EOF2
cat ${ICE_SCRIPTS}/options/set_nml.${name} >> ${fimods}

cat >> ${fimods} << EOF2
cat >> ${fimods} << EOF2

EOF2
echo "adding namelist mods set_nml.${name}"
Expand All @@ -841,18 +890,15 @@ EOF2
endif
if (-e ${ICE_SCRIPTS}/options/set_env.${name}) then

cat >> ${fsmods} << EOF2
cat >> ${fsmods} << EOF2

# set_env.${name}

EOF2

cat ${ICE_SCRIPTS}/options/set_env.${name} >> ${fsmods}

cat >> ${fsmods} << EOF2
cat >> ${fsmods} << EOF2

EOF2

echo "adding env mods set_env.${name}"
echo "`date` ${0} adding namelist modes set_env.${name}" >> ${casedir}/README.case
set found = 1
Expand Down Expand Up @@ -906,34 +952,30 @@ EOF2

if ( ${dosuite} == 1 ) then
cd ${ICE_SANDBOX}
# Write build and run commands to suite.run and suite.submit
# Write build and run commands to suite.submit

cat >> ${tsdir}/results.csh << EOF
cat >> ${tsdir}/results.csh << EOF
cat ${testname_base}/test_output >> results.log
EOF
foreach file (${tsdir}/suite.run ${tsdir}/suite.submit)
cat >> $file << EOF

cat >> ${tsdir}/suite.submit << EOF

echo "-------test--------------"
echo "${testname_base}"
cd ${testname_base}
source ./cice.settings
set ciceexe = "../ciceexe.\${ICE_COMPILER}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
./cice.build --exe \${ciceexe}
if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
EOF
end
cat >> ${tsdir}/suite.submit << EOF
./cice.submit | tee -a ../suite.jobs
EOF
cat >> ${tsdir}/suite.run << EOF
./cice.test
EOF
foreach file (${tsdir}/suite.run ${tsdir}/suite.submit)
cat >> $file << EOF
if (\${dobuild} == true) then
set ciceexe = "../ciceexe.\${ICE_COMPILER}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
./cice.build --exe \${ciceexe}
if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
endif
if (\${dosubmit} == true) then
./cice.submit | tee -a ../suite.jobs
else if (\${dorun} == true) then
./cice.test
endif
cd ..

EOF
end

# Reset case for the next test in suite
set case = ${spval}
Expand All @@ -954,16 +996,14 @@ end
if ( ${dosuite} == 1 ) then

# Delete reused ciceexe files at the end to save space
foreach file (${tsdir}/suite.run ${tsdir}/suite.submit)
cat >> $file << EOF0
cat >> ${tsdir}/suite.submit << EOF0

set nonomatch && rm -f ciceexe.* && unset nonomatch

EOF0
end

# Add code to results.csh to count the number of failures
cat >> ${tsdir}/results.csh << EOF
cat >> ${tsdir}/results.csh << EOF
cat ./results.log
set pends = \`cat ./results.log | grep PEND | wc -l\`
set failures = \`cat ./results.log | grep FAIL | wc -l\`
Expand Down Expand Up @@ -994,13 +1034,16 @@ exit \$failures
EOF

if ($?ICE_MACHINE_QSTAT) then
cat >! ${tsdir}/poll_queue.env << EOF0
cat >! ${tsdir}/poll_queue.env << EOF0
setenv ICE_MACHINE_QSTAT ${ICE_MACHINE_QSTAT}
EOF0
endif

# build and submit tests
cd ${tsdir}
setenv SUITE_BUILD ${suitebuild}
setenv SUITE_RUN ${suiterun}
setenv SUITE_SUBMIT ${suitesubmit}
./suite.submit | tee suite.log
if ($report == 1) then
echo "Reporting results"
Expand Down
Loading