Merge pull request #1 from VUmcCGP/SlurmQueueArg

Generic/SLURM queue variable
VUmcCGP · Apr 11, 2017 · 676c8c4 · 676c8c4
2 parents c563222 + 98026ea
commit 676c8c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/propr.sh b/propr.sh
@@ -56,12 +56,13 @@ getHoldIds() {
 			fi
 		done
 	fi
-	
+
 	echo $HOLDFOR
 }
 
 # Stub values to work with
 SCHEDULER='dry'
+QUEUE='defq'
 SGE_PE='singlenode'
 DIR_NODES=$DIR_BASE/pipelines/
 ARG_SUBBASE=""

diff --git a/submit/slurm.sh b/submit/slurm.sh
@@ -9,7 +9,7 @@ submit() {
 		then
 			SUBARGS="$SUBARGS -c $(($AVAL<$ARG_JOB_CPU_MAX?$AVAL:$ARG_JOB_CPU_MAX))"
 		fi
-		
+
 		if [ $ANAME = "array" ]
 		then
 			SUBARGS="$SUBARGS -a ${AVAL//,/:}"
@@ -27,14 +27,15 @@ submit() {
 
 	# Submit to SLURM
 	JOBID=`sbatch \
+        --partition ${QUEUE} \
 		$HOLDFOR \
 		-J $JOB_NAME \
 		-e $FILE_LOG_ERR \
 		-o $FILE_LOG_OUT \
 		$SUBARGS \
 		$NODE \
 		$ADDS`
-	
+
 	# Fix the JobID
 	JOBID=`echo $JOBID | cut -d\  -f4`
 }