Resolve merge conflict

getzlab · Jan 11, 2024 · 5667aae · 5667aae
1 parent 521f739
commit 5667aae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/canine/orchestrator.py b/canine/orchestrator.py
@@ -52,7 +52,7 @@
 echo -n '---- STARTING JOB SETUP ... ' >&2
 source $CANINE_JOBS/$SLURM_ARRAY_TASK_ID/setup.sh
 echo 'COMPLETE ----' >&2
-if [ ${{{{SLURM_RESTART_COUNT:-0}}}} -ge $CANINE_PREEMPT_LIMIT ]; then
+if [ $((${{{{SLURM_RESTART_COUNT:-0}}}}-$([ -f $CANINE_JOB_ROOT/.localization_failure_count ] && cat $CANINE_JOB_ROOT/.localization_failure_count || echo -n 0))) -ge $CANINE_PREEMPT_LIMIT ]; then
   # localization must have completed successfully and job must not have exited with a failure
   if [[ ( -e $CANINE_JOB_ROOT/.localizer_exit_code && $(cat $CANINE_JOB_ROOT/.job_exit_code) -eq 0) && \
         (( -e $CANINE_JOB_ROOT/.job_exit_code && $(cat $CANINE_JOB_ROOT/.job_exit_code) -eq 0 ) || \