Allow overriding GPUTYPE/NGPUs from outside

Author: davidrohr

DATA/production/configurations/asyncReco/async_pass.sh

@@ -414,8 +414,8 @@ echo "SETTING_ROOT_OUTPUT = $SETTING_ROOT_OUTPUT"
 # Enabling GPUs
 if [[ -n "$ALIEN_JDL_USEGPUS" && $ALIEN_JDL_USEGPUS != 0 ]] ; then
   echo "Enabling GPUS"
-  export GPUTYPE="HIP"
-  export GPUMEMSIZE=$((25 << 30))
+  [[ -z ${GPUTYPE:-} ]] && export GPUTYPE="HIP"
+  [[ -z ${GPUMEMSIZE:-} ]] && export GPUMEMSIZE=$((25 << 30))
   if [[ "0$ASYNC_PASS_NO_OPTIMIZED_DEFAULTS" != "01" ]]; then
     if [[ "ALIEN_JDL_USEFULLNUMADOMAIN" == 0 ]]; then
       if [[ $keep -eq 0 ]]; then

DATA/production/workflow-multiplicities.sh

@@ -122,15 +122,15 @@ if [[ ! -z ${OPTIMIZED_PARALLEL_ASYNC:-} ]]; then
     [[ -z ${TIMEFRAME_RATE_LIMIT:-} ]] && TIMEFRAME_RATE_LIMIT=35
     [[ -z ${SHMSIZE:-} ]] && SHMSIZE=100000000000 # SHM_LIMIT 3/4
     [[ -z ${TIMEFRAME_SHM_LIMIT:-} ]] && TIMEFRAME_SHM_LIMIT=$(($SHMSIZE / 3))
+    [[ -z ${NGPUS:-} ]] && NGPUS=4
     NGPURECOTHREADS=8
     NTRDTRKTHREADS=8
     ITSTRK_THREADS=5
     ITSTPC_THREADS=3
     SVERTEX_THREADS=20
     TOFMATCH_THREADS=2
     N_SECVTX=2
-    NGPUS=4
-    N_TPCTRK=4
+    N_TPCTRK=$NGPUS
     # time in s: pvtx 16, tof 30, trd 82 itstpc 53 its 200 mfttr 30 tpcent 23 hmp-clus 40 (25.11.22)
     N_TPCENTDEC=$(math_max $((4 * $NGPUS / 4)) 1)
     N_ITSTRK=$(math_max $((12 * $NGPUS / 4)) 1)