diff --git a/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh b/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh index 8dd6353f0ab533d895051268f2412a91352e30c4..e59a910c4dd99dfe5a4969073206433e0184a072 100755 --- a/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh +++ b/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh @@ -65,7 +65,7 @@ function read_cluster_model { GLOBALFS=true DOCKER=false # disabled as outputproc is too slow on docker 1.9.1 (#9522) - CEP4=true + OUTPUTPROC_ROOT="`echo '/opt/outputproc-${LOFAR_TAG}' | docker-template`" ;; *) HEADNODE=lhn001.cep2.lofar @@ -75,7 +75,7 @@ function read_cluster_model { GLOBALFS=false DOCKER=false - CEP4=false + OUTPUTPROC_ROOT="/data/home/lofarsys/production/lofar_cobalt" ;; esac diff --git a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh index 92bb651a47230e13d23b79a01386c47822ccd12f..aadd9ffbac02f6b5c3ab48fbfd87868e19c1ad31 100755 --- a/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh +++ b/RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh @@ -355,8 +355,7 @@ echo "[outputProc] pid file = $PID_LIST_FILE" touch $PID_LIST_FILE # Construct full command line for outputProc -OUTPUTPROC_VARS="export QUEUE_PREFIX=$QUEUE_PREFIX LOFARENV=$LOFARENV;" # Variables to forward to outputProc -OUTPUTPROC_CMDLINE="$OUTPUTPROC_VARS $OUTPUT_PROC_EXECUTABLE $OBSERVATIONID" +OUTPUTPROC_CMDLINE="source $OUTPUTPROC_ROOT/lofarinit.sh; export QUEUE_PREFIX=$QUEUE_PREFIX LOFARENV=$LOFARENV; $OUTPUT_PROC_EXECUTABLE $OBSERVATIONID" # Wrap command line with Docker if required if $DOCKER; then @@ -367,11 +366,6 @@ if $DOCKER; then OUTPUTPROC_CMDLINE="docker-run-slurm.sh --rm --cpu-shares=24576 --cap-add=sys_nice --cap-add=sys_admin -u `id -u $SSH_USER_NAME` --net=host -v $GLOBALFS_DIR:$GLOBALFS_DIR lofar-outputproc:$TAG bash -c \"sudo echo 950000 > /sys/fs/cgroup/cpu/cpu.rt_runtime_us; $OUTPUTPROC_CMDLINE\"" fi -if $CEP4; then - TAG="`echo '${LOFAR_TAG}' | docker-template`" - OUTPUTPROC_CMDLINE="source /opt/outputproc-$TAG/lofarinit.sh; $OUTPUTPROC_CMDLINE" -fi - echo "[outputProc] command line = $OUTPUTPROC_CMDLINE" if ! $DUMMY_RUN; then