Skip to content

Commit

Permalink
Add "--queue" as an option to cice.setup (#143)
Browse files Browse the repository at this point in the history 
* Add new open (--queue) to cice.setup.  Also set default queues in each env.<machin>_<compiler> file.

* Quick bugfix in cice.batch.csh

* Add code to set ICE_MACHINE_QUEUE as the default, if --queue is not used.  Also add the ability to read a queue from a ~/.cice_queue file

* quick bugfix of a typo when reading ~/.cice_queue
  • Loading branch information
@mattdturner @apcraig
mattdturner authored and apcraig committed May 24, 2018
1 parent 514e50e commit 1c20dfe
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 8 deletions.
14 changes: 13 additions & 1 deletion cice.setup
View file
Expand Up @@ -22,6 +22,7 @@ set sets = ""
set bdir = ${spval}
set testid = ${spval}
set testsuite = ${spval}
set queue = ${spval}
set acct = ${spval}
set baseCom = ${spval} # Baseline compare
set baseGen = ${spval} # Baseline generate
Expand Down Expand Up @@ -88,6 +89,7 @@ DESCRIPTION
--acct : account number for the batch submission
--grid, -g : grid, grid (default = ${grid})
--set, -s : case option setting(s), comma separated (default = " ")
--queue : queue for the batch submission
For testing
Expand Down Expand Up @@ -234,6 +236,8 @@ while (1)
set dotest = 1
else if ("$option" == "--grid" || "$option" == "-g") then
set grid = $argv[1]
else if ("$option" == "--queue") then
set queue = $argv[1]
else if ("$option" == "--pes" || "$option" == "-p") then
set pesx = $argv[1]
else if ("$option" == "--acct") then
Expand Down Expand Up @@ -538,6 +542,14 @@ foreach compiler ( $ncompilers )
endif
endif
if (${queue} == ${spval}) then
if (-e ~/.cice_queue) then
set queue = `head -1 ~/.cice_queue`
else
set queue = ${ICE_MACHINE_QUEUE}
endif
endif
#------------------------------------------------------------
# Compute a default blocksize
Expand Down Expand Up @@ -627,7 +639,6 @@ EOF1
set baseCom = `ls -t $basedir_tmp | head -1`
endif
cat >! ${fsmods} << EOF1
# cice.setup settings
Expand Down Expand Up @@ -656,6 +667,7 @@ setenv ICE_TEST ${test}
setenv ICE_TESTNAME ${testname_noid}
setenv ICE_BFBCOMP ${fbfbcomp}
setenv ICE_ACCOUNT ${acct}
setenv ICE_QUEUE ${queue}
EOF1
if (${sets} != "") then
Expand Down
7 changes: 1 addition & 6 deletions configuration/scripts/cice.batch.csh
View file
Expand Up @@ -27,7 +27,7 @@ if (${taskpernodelimit} > ${ntasks}) set taskpernodelimit = ${ntasks}
set ptile = $taskpernode
if ($ptile > ${maxtpn} / 2) @ ptile = ${maxtpn} / 2

set queue = "regular"
set queue = "${ICE_QUEUE}"
set batchtime = "00:15:00"
if (${ICE_RUNLENGTH} > 1) set batchtime = "00:29:00"
if (${ICE_RUNLENGTH} > 2) set batchtime = "00:59:00"
Expand Down Expand Up @@ -57,8 +57,6 @@ cat >> ${jobfile} << EOFB
EOFB

else if (${ICE_MACHINE} =~ thunder* || ${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*) then
set queue = "debug"
if (${ICE_RUNLENGTH} > 1) set queue = "frontier"
cat >> ${jobfile} << EOFB
#PBS -N ${shortcase}
#PBS -q ${queue}
Expand All @@ -71,8 +69,6 @@ cat >> ${jobfile} << EOFB
EOFB

else if (${ICE_MACHINE} =~ onyx*) then
set queue = "debug"
if (${ICE_RUNLENGTH} > 2) set queue = "frontier"
cat >> ${jobfile} << EOFB
#PBS -N ${ICE_CASENAME}
#PBS -q ${queue}
Expand All @@ -85,7 +81,6 @@ cat >> ${jobfile} << EOFB
EOFB

else if (${ICE_MACHINE} =~ cori*) then
set queue = "debug"
cat >> ${jobfile} << EOFB
#SBATCH -J ${ICE_CASENAME}
#SBATCH -p ${queue}
Expand Down
1 change: 1 addition & 0 deletions configuration/scripts/cice.settings
View file
Expand Up @@ -34,6 +34,7 @@ setenv ICE_BFBCOMP undefined
setenv ICE_SPVAL undefined
setenv ICE_RUNLENGTH 0
setenv ICE_ACCOUNT undefined
setenv ICE_QUEUE undefined

#======================================================

Expand Down
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.cheyenne_intel
View file
Expand Up @@ -17,6 +17,7 @@ setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
setenv ICE_MACHINE_BASELINE /glade/scratch/$user/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub"
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "regular"
setenv ICE_MACHINE_TPNODE 36
setenv ICE_MACHINE_BLDTHRDS 1
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.conrad_cray
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.conrad_gnu
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
3 changes: 2 additions & 1 deletion configuration/scripts/machines/env.conrad_intel
View file
Expand Up @@ -39,7 +39,8 @@ setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT ARLAP96070PET
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.conrad_pgi
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT ARLAP96070PET
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.cori_intel
View file
Expand Up @@ -41,6 +41,7 @@ setenv ICE_MACHINE_INPUTDATA /global/homes/t/tcraig/cice_consortium
setenv ICE_MACHINE_BASELINE $SCRATCH/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "sbatch "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "squeue --jobs="
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.gordon_cray
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.gordon_gnu
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.gordon_intel
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.gordon_pgi
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT ARLAP96070PET
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 32 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.onyx_cray
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/app/unsupported/RASM/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 44 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 12
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.onyx_gnu
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/app/unsupported/RASM/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 44 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 12
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.onyx_intel
View file
Expand Up @@ -40,6 +40,7 @@ setenv ICE_MACHINE_INPUTDATA /p/app/unsupported/RASM/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 44 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 12
setenv ICE_MACHINE_QSTAT "qstat "
1 change: 1 addition & 0 deletions configuration/scripts/machines/env.thunder_intel
View file
Expand Up @@ -33,6 +33,7 @@ setenv ICE_MACHINE_INPUTDATA /p/work2/projects/rasm/cice_consortium
setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "qsub "
setenv ICE_MACHINE_ACCT P00000000
setenv ICE_MACHINE_QUEUE "debug"
setenv ICE_MACHINE_TPNODE 36 # tasks per node
setenv ICE_MACHINE_BLDTHRDS 4
setenv ICE_MACHINE_QSTAT "qstat "

0 comments on commit 1c20dfe

Please sign in to comment.