X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cluster_tools%2Fgate_run_submit_cluster.sh;h=ebb0917d8efff9fc1c044f8394f1f51bdecaf837;hb=f48c960aef6e0a5a4edea516b062197db009e25f;hp=f47ed6dcdba0923b7a915880ec5e5746b1d5dfc3;hpb=58d7be8f825a67f224ce4f825a703c2cbcfd43a0;p=clitk.git

diff --git a/cluster_tools/gate_run_submit_cluster.sh b/cluster_tools/gate_run_submit_cluster.sh
index f47ed6d..ebb0917 100755
--- a/cluster_tools/gate_run_submit_cluster.sh
+++ b/cluster_tools/gate_run_submit_cluster.sh
@@ -1,59 +1,90 @@
-#!/usr/bin/env bash 
+#! /bin/bash -lx
 
 set -u
 SCRIPTNAME="$(basename "${0}")"
 
+# -------------------------------------------------
 function error {
-echo "ERROR: $1"
-usage
-exit 1
+    echo "ERROR: $1"
+    usage
+    exit 1
 }
+# -------------------------------------------------
 
 DEFAULTRELEASESUFFIX="NONE"
 DEFAULTNUMBEROFJOBS="10"
 
+# -------------------------------------------------
 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 "${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)"
 }
+# -------------------------------------------------
 
 test $# -eq 0 && usage && exit 0
 
-SCRIPTDIR="${HOME}/git/gate-tests/bin"
 RELEASESUFFIX=${3:-"${DEFAULTRELEASESUFFIX}"}
 RELEASEDIR="${HOME}/releases/grid_release${RELEASESUFFIX}"
-JOBFILE="$(dirname $0)/gate_job_cluster.job"
+if test "$(dnsdomainname)" = "in2p3.fr"
+then
+    JOBFILE="$(dirname $0)/gate_job_ccin2p3.job"
+else
+    JOBFILE="$(dirname $0)/gate_job_cluster.job"
+fi
 
 echo "Checking stuff"
 test -f ${JOBFILE} || error "can't find job file ${JOBFILE}"
 if test "${RELEASESUFFIX}" = "${DEFAULTRELEASESUFFIX}"
 then
-	RELEASEDIR="NONE"
-	which Gate 2>&1 >/dev/null || error "there is no Gate in the PATH"
+    RELEASEDIR="NONE"
+    which Gate 2>&1 >/dev/null || error "there is no Gate in the PATH"
 else
-	test -d ${RELEASEDIR} || error "invalid release dir ${RELEASEDIR}"
+    test -d ${RELEASEDIR} || error "invalid release dir ${RELEASEDIR}"
 fi
 MACRODIR=$(pwd)
 test -d ${MACRODIR}/mac && test -d ${MACRODIR}/data || error "invalid path"
 MACROFILE=${1:?"provide relative macro path"}
 test -f ${MACRODIR}/${MACROFILE} || error "invalid macro"
-OUTPUTDIR=$(mktemp --tmpdir=${MACRODIR} -d run.XXXX || error "can't create temp dir")
+if test "$(dnsdomainname)" = "in2p3.fr"
+then
+    OUTPUTDIR=$(mktemp -d -p "${MACRODIR}" run.XXXX || error "can't create temp dir")
+else
+    unamestr=`uname`
+    if [[ "$unamestr" == 'Darwin' ]]; then
+        ## On OSX (Darwin), mktemp version is different from Linux version . We
+        ## need the absolute folder here
+        OUTPUTDIR=$(mktemp -d run.XXXX || error "can't create temp dir")
+        OUTPUTDIR=${MACRODIR}/${OUTPUTDIR}
+    else
+        OUTPUTDIR=$(mktemp --tmpdir=${MACRODIR} -d run.XXXX || error "can't create temp dir")
+    fi
+    echo $OUTPUTDIR
+fi
 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}"
-echo "qsub is $(which qsub)"
+
+QSUB=$(which qsub 2> /dev/null)
+# echo "qsub is $(which qsub)"
+test -z "${QSUB}" && QSUB="noqsub"
+if test "${QSUB}" = "noqsub"
+then
+    echo "qsub is not found. Simply run Gate on multiple cores."
+fi
+
 test -z "${PARAM}" && echo "no param" || echo "param is ${PARAM}"
 if test "$RELEASESUFFIX" = "$DEFAULTRELEASESUFFIX"
 then
-	echo "using $(which Gate)"
+    echo "Gate is $(which Gate)"
 else
-	echo "using release $(basename ${RELEASEDIR})"
+    echo "Gate release is $(basename ${RELEASEDIR})"
 fi
 echo "submitting ${NJOBS} jobs"
 
@@ -62,11 +93,37 @@ echo "njobs = ${NJOBS}" >> "${PARAMFILE}"
 echo "macro = ${MACROFILE}" >> "${PARAMFILE}"
 test -z "${PARAM}" || echo "param = ${PARAM}" >> "${PARAMFILE}"
 
+# Copy macros files (for log)
+mkdir ${OUTPUTDIR}/mac
+cp ${MACROFILE} ${OUTPUTDIR}/mac
+files=`grep "control/execute" ${MACROFILE} | cut -d " " -f 2`
+for i in $files
+do
+    cp $i ${OUTPUTDIR}/mac
+done
+
 while test $NJOBS -gt 0; do
-	qsub -N "gatejob.${RUNID}" -o "${OUTPUTDIR}" \
-	-v "PARAM=\"${PARAM}\",INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},SCRIPTDIR=${SCRIPTDIR},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
-	"${JOBFILE}" || error "submission error"
-	let NJOBS--
+
+    if test "${QSUB}" = "noqsub"
+    then
+        echo "Launching Gate log in ${OUTPUTDIR}/gate_${NJOBS}.log"
+        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
+        qsub -o "${OUTPUTDIR}" \
+             -e "${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}" \
+      "${JOBFILE}" || error "submission error"
+    fi
+
+    let NJOBS--
 done
 
 echo "runid is ${RUNID}"