Skip to content

Commit 591ac2b

Browse files
BrianCurtis-NOAABrianCurtis-NOAA
committed
slurm adjustments
1 parent cdc8972 commit 591ac2b

9 files changed

Lines changed: 56 additions & 38 deletions

File tree

‎reg_tests/chgres_cube/driver.sh‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ submit_test() {
5252
jobid=$(qsub -V -o "${logfile}" -e "${logfile}" -q "${QUEUE}" -A "${PROJECT_CODE}" -l walltime=${walltime} \
5353
-N "${jobname}" -l select=${nodes}:ncpus=${ntasks_per_node}:ompthreads=${OMP_NUM_THREADS}:mem=${mem} \
5454
${dep_flag_pbs:+"${dep_flag_pbs}"} ./${script})
55-
jobid=${jobid%.*}
55+
# jobid=${jobid%.*}
5656
elif [[ "${SCHEDULER}" == "slurm" ]]; then
5757
export APRUN="srun"
5858
jobid=$(sbatch --parsable --partition="${partition}" ${slurmflag:+"${slurmflag}"} --ntasks-per-node="${ntasks_per_node}" --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
5959
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6060
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
61-
jobid=${jobid%.*}
62-
jobid=${jobid%%;*}
61+
# jobid=${jobid%.*}
62+
# jobid=${jobid%%;*}
6363
else
6464
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6565
exit 1
@@ -69,6 +69,8 @@ submit_test() {
6969
echo "Error submitting job: $output"
7070
exit 1
7171
fi
72+
jobid=${jobid%.*}
73+
jobid=${jobid%%;*}
7274
if [[ "${jobid}" == "" ]]; then
7375
echo "Error submitting job to slurm scheduler"
7476
exit 1
@@ -177,20 +179,20 @@ case ${MACHINE_ID,,} in
177179
submit_test 14 6 1 100G 0:05:00 u1-compute false false 13km.conus.rap-smoke.grib2 13km.conus.rap-smoke.grib2.sh false
178180
;;
179181
gaeac6)
180-
submit_test 01 6 1 0 batch c6 false c96.fv3.restart c96.fv3.restart.sh false
181-
submit_test 02 6 2 0 batch c6 false c192.fv3.history c192.fv3.history.sh false
182-
submit_test 03 12 1 0 batch c6 false c96.fv3.netcdf c96.fv3.netcdf.sh false
183-
submit_test 04 6 1 0 batch c6 false c192.gfs.grib2 c192.gfs.grib2.sh false
184-
submit_test 05 6 1 0 batch c6 false 25km.conus.gfs.grib2 25km.conus.gfs.grib2.sh false
185-
submit_test 06 6 1 0 batch c6 false 3km.conus.hrrr.gfssdf.grib2 3km.conus.hrrr.gfssdf.grib2.sh false
186-
submit_test 07 6 2 0 batch c6 false 3km.conus.hrrr.newsfc.grib2 3km.conus.hrrr.newsfc.grib2.sh false
187-
submit_test 08 6 1 0 batch c6 false 13km.conus.nam.grib2 13km.conus.nam.grib2.sh false
188-
submit_test 09 6 1 0 batch c6 false 13km.conus.rap.grib2 13km.conus.rap.grib2.sh false
189-
submit_test 10 6 1 0 batch c6 false 13km.na.gfs.ncei.grib2 13km.na.gfs.ncei.grib2.sh false
190-
submit_test 11 12 1 0 batch c6 false c96.fv3.netcdf2wam c96.fv3.netcdf2wam.sh false
191-
submit_test 12 6 1 0 batch c6 false 25km.conus.gfs.pbgrib2 25km.conus.gfs.pbgrib2.sh false
192-
submit_test 13 6 1 0 batch c6 false c96.gefs.grib2 c96.gefs.grib2.sh false
193-
submit_test 14 6 1 0 batch c6 false 13km.conus.rap-smoke.grib2 13km.conus.rap-smoke.grib2.sh false
182+
submit_test 01 6 1 0 0:15:00 batch c6 false c96.fv3.restart c96.fv3.restart.sh false
183+
submit_test 02 6 2 0 0:15:00 batch c6 false c192.fv3.history c192.fv3.history.sh false
184+
submit_test 03 12 1 0 0:15:00 batch c6 false c96.fv3.netcdf c96.fv3.netcdf.sh false
185+
submit_test 04 6 1 0 0:05:00 batch c6 false c192.gfs.grib2 c192.gfs.grib2.sh false
186+
submit_test 05 6 1 0 0:05:00 batch c6 false 25km.conus.gfs.grib2 25km.conus.gfs.grib2.sh false
187+
submit_test 06 6 1 0 0:10:00 batch c6 false 3km.conus.hrrr.gfssdf.grib2 3km.conus.hrrr.gfssdf.grib2.sh false
188+
submit_test 07 6 2 0 0:10:00 batch c6 false 3km.conus.hrrr.newsfc.grib2 3km.conus.hrrr.newsfc.grib2.sh false
189+
submit_test 08 6 1 0 0:05:00 batch c6 false 13km.conus.nam.grib2 13km.conus.nam.grib2.sh false
190+
submit_test 09 6 1 0 0:05:00 batch c6 false 13km.conus.rap.grib2 13km.conus.rap.grib2.sh false
191+
submit_test 10 6 1 0 0:05:00 batch c6 false 13km.na.gfs.ncei.grib2 13km.na.gfs.ncei.grib2.sh false
192+
submit_test 11 12 1 0 0:15:00 batch c6 false c96.fv3.netcdf2wam c96.fv3.netcdf2wam.sh false
193+
submit_test 12 6 1 0 0:05:00 batch c6 false 25km.conus.gfs.pbgrib2 25km.conus.gfs.pbgrib2.sh false
194+
submit_test 13 6 1 0 0:05:00 batch c6 false c96.gefs.grib2 c96.gefs.grib2.sh false
195+
submit_test 14 6 1 0 0:05:00 batch c6 false 13km.conus.rap-smoke.grib2 13km.conus.rap-smoke.grib2.sh false
194196
;;
195197
wcoss2)
196198
submit_test 01 6 1 75G 0:15:00 dev false false c96.fv3.restart c96.fv3.restart.sh false

‎reg_tests/cpld_gridgen/rt.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ while read -r line || [ "$line" ]; do
214214
echo "Error submitting job: $output"
215215
exit 1
216216
fi
217+
tests[$i]=${tests[$i]%.*}
218+
tests[$i]=${tests[$i]%%;*}
217219
all_tests=${all_tests}":"${tests[$i]%.*}
218220

219221
((i=i+1))

‎reg_tests/global_cycle/driver.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ submit_test() {
5555
jobid=$(qsub -V -o "${logfile}" -e "${logfile}" -q "${QUEUE}" -A "${PROJECT_CODE}" -l walltime=${walltime} \
5656
-N "${jobname}" -l select=${nodes}:ncpus=${ntasks_per_node}:ompthreads=1:mem=${mem} \
5757
${dep_flag_pbs:+"${dep_flag_pbs}"}"./${script}")
58-
jobid=${jobid%.*}
58+
# jobid=${jobid%.*}
5959
elif [[ "${SCHEDULER}" == "slurm" ]]; then
6060
export APRUNCY="srun"
6161
jobid=$(sbatch --parsable --partition="${partition}" ${slurmflag:+"${slurmflag}"} --ntasks-per-node="${ntasks_per_node}" --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
6262
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6363
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
6464

65-
jobid=${jobid%.*}
66-
jobid=${jobid%%;*}
65+
# jobid=${jobid%.*}
66+
# jobid=${jobid%%;*}
6767
else
6868
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6969
exit 1
@@ -73,6 +73,8 @@ submit_test() {
7373
echo "Error submitting job: $output"
7474
exit 1
7575
fi
76+
jobid=${jobid%.*}
77+
jobid=${jobid%%;*}
7678
if [[ "${jobid}" == "" ]]; then
7779
echo "Error submitting job to slurm scheduler"
7880
exit 1

‎reg_tests/grid_gen/driver.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,22 @@ submit_test() {
5656
jobid=$(qsub -V -o "${logfile}" -e "${logfile}" -q "${QUEUE}" -A "${PROJECT_CODE}" -l walltime=${walltime} \
5757
-N "${jobname}" -l select=${nodes}:ncpus=${ntasks_per_node}:ompthreads=${OMP_NUM_THREADS}:mem=${mem} \
5858
${dep_flag_pbs:+"${dep_flag_pbs}"} "./${script}")
59-
jobid=${jobid%.*}
59+
# jobid=${jobid%.*}
6060
elif [[ "${SCHEDULER}" == "slurm" ]]; then
6161
export APRUNCY="srun"
6262
export APRUN_SFC=${APRUNCY}
6363
jobid=$(sbatch --parsable --partition="${partition}" ${slurmflag:+"${slurmflag}"} --ntasks-per-node="${ntasks_per_node}" --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
6464
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6565
--export=ALL,OMP_NUM_THREADS=${OMP_NUM_THREADS} ${dep_flag_slurm:+"${dep_flag_slurm}"} \
6666
-o "${logfile}" -e "${logfile}" "./${script}")
67-
jobid=${jobid%.*}
68-
jobid=${jobid%%;*}
67+
# jobid=${jobid%.*}
68+
# jobid=${jobid%%;*}
6969
else
7070
echo "Error: Unsupported scheduler '${SCHEDULER}'"
7171
exit 1
7272
fi
73+
jobid=${jobid%.*}
74+
jobid=${jobid%%;*}
7375
if [[ "${jobid}" == "" ]]; then
7476
echo "Error submitting job to slurm scheduler"
7577
exit 1

‎reg_tests/ice_blend/driver.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,29 +53,31 @@ submit_test() {
5353
jobid=$(qsub -V -o "${logfile}" -e "${logfile}" -q "${QUEUE}" -A "${PROJECT_CODE}" -l walltime=${walltime} \
5454
-N "${jobname}" -l select=${nodes}:ncpus=${ntasks_per_node}:ompthreads=${OMP_NUM_THREADS_CY}:mem=${mem} \
5555
${dep_flag_pbs:+"${dep_flag_pbs}"} "./${script}")
56-
jobid=${jobid%.*}
56+
# jobid=${jobid%.*}
5757
elif [[ "${SCHEDULER}" == "slurm" ]]; then
5858
export APRUNCY="srun"
59-
jobid=$(sbatch --parsable --partition="${partition}" --ntasks-per-node="${ntasks_per_node}" ${slurmflag:+"${slurmflag}" --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
59+
jobid=$(sbatch --parsable --partition="${partition}" --ntasks-per-node="${ntasks_per_node}" ${slurmflag:+"${slurmflag}"} --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
6060
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6161
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
62-
jobid=${jobid%.*}
63-
jobid=${jobid%%;*}
62+
# jobid=${jobid%.*}
63+
# jobid=${jobid%%;*}
6464
else
6565
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6666
exit 1
6767
fi
6868
status=$?
6969
if [ $status -ne 0 ]; then
70-
echo "Error submitting job: $output"
70+
echo "Error submitting job: ${jobid}"
7171
exit 1
7272
fi
73+
jobid=${jobid%.*}
74+
jobid=${jobid%%;*}
7375
if [[ "${jobid}" == "" ]]; then
7476
echo "Error submitting job to slurm scheduler"
7577
exit 1
7678
fi
7779
TEST_IDS+=(":${jobid}")
78-
echo "${jobid}"
80+
echo "JOBID: ${jobid}"
7981
}
8082

8183
RT_DIR=${RT_DIR:-${PWD}/..}

‎reg_tests/ocnice_prep/rt.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ while read -r line || [ "$line" ]; do
247247
echo "Error submitting job: $output"
248248
exit 1
249249
fi
250+
tests[$i]=${tests[$i]%.*}
251+
tests[$i]=${tests[$i]%%;*}
250252
all_tests=${all_tests}":"${tests[$i]%.*}
251253

252254
((i=i+1))

‎reg_tests/regrid_sfc/driver.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ submit_test() {
5656
jobid=$(qsub -V -o "${logfile}" -e "${logfile}" -q "${QUEUE}" -A "${PROJECT_CODE}" -l walltime=${walltime} \
5757
-N "${jobname}" -l select=${nodes}:ncpus=${ntasks_per_node}:ompthreads=1:mem=${mem} \
5858
${dep_flag_pbs:+"${dep_flag_pbs}"}"./${script}")
59-
jobid=${jobid%.*}
59+
# jobid=${jobid%.*}
6060
elif [[ "${SCHEDULER}" == "slurm" ]]; then
6161
export APRUN_REGRID="srun"
6262
jobid=$(sbatch --parsable --partition="${partition}" ${slurmflag:+"${slurmflag}"} --ntasks-per-node="${ntasks_per_node}" --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
6363
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6464
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
65-
jobid=${jobid%.*}
66-
jobid=${jobid%%;*}
65+
# jobid=${jobid%.*}
66+
# jobid=${jobid%%;*}
6767
else
6868
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6969
exit 1
@@ -73,6 +73,8 @@ submit_test() {
7373
echo "Error submitting job: $output"
7474
exit 1
7575
fi
76+
jobid=${jobid%.*}
77+
jobid=${jobid%%;*}
7678
if [[ "${jobid}" == "" ]]; then
7779
echo "Error submitting job to slurm scheduler"
7880
exit 1

‎reg_tests/snow2mdl/driver.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ submit_test() {
5555
jobid=$(qsub -V -o "${logfile}" -e "${logfile}" -q "${QUEUE}" -A "${PROJECT_CODE}" -l walltime=${walltime} \
5656
-N "${jobname}" -l select=${nodes}:ncpus=${ntasks_per_node}:ompthreads=${OMP_NUM_THREADS}:mem=${mem} \
5757
${dep_flag_pbs:+"${dep_flag_pbs}"} "./${script}")
58-
jobid=${jobid%.*}
58+
# jobid=${jobid%.*}
5959
elif [[ "${SCHEDULER}" == "slurm" ]]; then
6060
export APRUNCY="srun"
6161
jobid=$(sbatch --parsable --partition="${partition}" ${slurmflag:+"${slurmflag}"} --ntasks-per-node="${ntasks_per_node}" --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
6262
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6363
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
64-
jobid=${jobid%.*}
65-
jobid=${jobid%%;*}
64+
# jobid=${jobid%.*}
65+
# jobid=${jobid%%;*}
6666
else
6767
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6868
exit 1
@@ -72,6 +72,8 @@ submit_test() {
7272
echo "Error submitting job: $output"
7373
exit 1
7474
fi
75+
obid=${jobid%.*}
76+
jobid=${jobid%%;*}
7577
if [[ "${jobid}" == "" ]]; then
7678
echo "Error submitting job to slurm scheduler"
7779
exit 1

‎reg_tests/weight_gen/driver.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ submit_test() {
5555
jobid=$(qsub -V -o "${logfile}" -e "${logfile}" -q "${QUEUE}" -A "${PROJECT_CODE}" -l walltime=${walltime} \
5656
-N "${jobname}" -l select=${nodes}:ncpus=${ntasks_per_node}:ompthreads=1:mem=${mem} \
5757
${dep_flag_pbs:+"${dep_flag_pbs}"} "./${script}")
58-
jobid=${jobid%.*}
58+
# jobid=${jobid%.*}
5959
elif [[ "${SCHEDULER}" == "slurm" ]]; then
6060
export APRUNCY="srun"
6161
jobid=$(sbatch --parsable --partition="${partition}" ${slurmflag:+"${slurmflag}"} --ntasks-per-node="${ntasks_per_node}" --nodes="${nodes}" --mem="${mem}" -t "${walltime}" \
6262
-A "${PROJECT_CODE}" -q "${QUEUE}" -J "${jobname}" --open-mode=append ${exclusive_flag:+"${exclusive_flag}"} \
6363
${dep_flag_slurm:+"${dep_flag_slurm}"} -o "${logfile}" -e "${logfile}" "./${script}")
64-
jobid=${jobid%.*}
65-
jobid=${jobid%%;*}
64+
# jobid=${jobid%.*}
65+
# jobid=${jobid%%;*}
6666
else
6767
echo "Error: Unsupported scheduler '${SCHEDULER}'"
6868
exit 1
@@ -72,6 +72,8 @@ submit_test() {
7272
echo "Error submitting job: $jobid"
7373
exit 1
7474
fi
75+
jobid=${jobid%.*}
76+
jobid=${jobid%%;*}
7577
if [[ "${jobid}" == "" ]]; then
7678
echo "Error submitting job to slurm scheduler"
7779
exit 1

0 commit comments

Comments
 (0)