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 2ae6186bcfc38a27bfc230d4052d6c4f338e16e6..edd798bf62839fdbaccd39d28e828be2086d808e 100755 (executable)
--- a/cluster_tools/gate_run_submit_cluster.sh
+++ b/cluster_tools/gate_run_submit_cluster.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#! /bin/bash -lx
 
 set -u
 SCRIPTNAME="$(basename "${0}")"
@@ -91,7 +91,6 @@ cp ${MACROFILE} ${OUTPUTDIR}/mac
 files=`grep "control/execute" ${MACROFILE} | cut -d " " -f 2`
 for i in $files
 do
-    echo $i
     cp $i ${OUTPUTDIR}/mac
 done
 
@@ -105,11 +104,12 @@ while test $NJOBS -gt 0; do
     then
         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}" \
+        qsub -N "gatejob.${RUNID}" -o "${OUTPUTDIR}" \
            -v "PARAM=${PARAM},INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
            "${JOBFILE}" || error "submission error"
     fi
@@ -118,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