Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / cluster_tools / gate_run_submit_cluster.sh

diff --git a/cluster_tools/gate_run_submit_cluster.sh b/cluster_tools/gate_run_submit_cluster.sh
index 24fdab92e04d4408917ee8e98a9ede280753dc0d..edd798bf62839fdbaccd39d28e828be2086d808e 100755 (executable)
--- a/cluster_tools/gate_run_submit_cluster.sh
+++ b/cluster_tools/gate_run_submit_cluster.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#! /bin/bash -lx
 
 set -u
 SCRIPTNAME="$(basename "${0}")"
@@ -19,6 +19,7 @@ function usage {
     echo "${SCRIPTNAME} mac/main.mac njobs releasesuffix paramtogate"
     echo "default njobs = ${DEFAULTNUMBEROFJOBS}"
     echo "default releasesuffix = ${DEFAULTRELEASESUFFIX} (NONE means use Gate in PATH)"
+    echo "default paramtogate = \"\" (use \"\" around params and \\ in front of commas)"
 }
 # -------------------------------------------------
 
@@ -57,7 +58,7 @@ test -d ${OUTPUTDIR} || error "can't locate output dir"
 RUNID=${OUTPUTDIR##*.}
 NJOBS=${2:-"${DEFAULTNUMBEROFJOBS}"}
 NJOBSMAX=${NJOBS}
-PARAM="${4:-""}"
+PARAM="${4:-\"\"}"
 
 echo "Lets roll!!"
 echo "runid is ${RUNID}"
@@ -101,14 +102,15 @@ while test $NJOBS -gt 0; do
         PARAM=\"${PARAM}\" INDEX=${NJOBS} INDEXMAX=${NJOBSMAX} OUTPUTDIR=${OUTPUTDIR}  RELEASEDIR=${RELEASEDIR} MACROFILE=${MACROFILE} MACRODIR=${MACRODIR} PBS_JOBID="local_${NJOBS}" bash "${JOBFILE}" > ${OUTPUTDIR}/gate_${NJOBS}.log &
     elif test "$(dnsdomainname)" = "in2p3.fr"
     then
-        PROJECTGROUP=creatis 
+        PROJECTGROUP=creatis
         qsub -o "${OUTPUTDIR}" \
+            -l sps=1 \
              -N "gate.${RUNID}" \
              -v "PARAM=\"${PARAM}\",INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
              "${JOBFILE}" || error "submission error"
     else
         qsub -N "gatejob.${RUNID}" -o "${OUTPUTDIR}" \
-           -v "PARAM=\"${PARAM}\",INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
+           -v "PARAM=${PARAM},INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
            "${JOBFILE}" || error "submission error"
     fi
 
@@ -116,7 +118,3 @@ while test $NJOBS -gt 0; do
 done
 
 echo "runid is ${RUNID}"
-if test "$(dnsdomainname)" = "in2p3.fr"
-then
-    rsync -av --remove-source-files -e "ssh -i ${HOME}/.ssh/ccin2p3" ${OUTPUTDIR}/ "linux1.dg.creatis.insa-lyon.fr:./cc/$(basename ${OUTPUTDIR})" --exclude '.__afs*' --exclude "${OUTPUTDIR}/gatejob.*.o*"
-fi