make TURBINE_OUTPUT configurable via ENV variables

hyoo · hyoo · commit b6d09da21f43 · 2017-06-27T21:10:31.000-05:00
diff --git a/workflows/nt3_mlrMBO/swift/ai_workflow.sh b/workflows/nt3_mlrMBO/swift/ai_workflow.sh
@@ -57,7 +57,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/nt3_mlrMBO/swift/cori_workflow.sh b/workflows/nt3_mlrMBO/swift/cori_workflow.sh
@@ -55,7 +55,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/nt3_mlrMBO/swift/cori_workflow3.sh b/workflows/nt3_mlrMBO/swift/cori_workflow3.sh
@@ -56,7 +56,7 @@ fi
 
 export EXPID=$1
 #export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
-export TURBINE_OUTPUT=/project/projectdirs/m2759/pbalapra/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-/project/projectdirs/m2759/pbalapra/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/nt3_mlrMBO/swift/theta_workflow.sh b/workflows/nt3_mlrMBO/swift/theta_workflow.sh
@@ -59,7 +59,7 @@ fi
 export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=/lus/theta-fs0/projects/Candle_ECP/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-/lus/theta-fs0/projects/Candle_ECP/experiments/$EXPID}
 #export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
 check_directory_exists
 
diff --git a/workflows/nt3_mlrMBO/swift/workflow.sh b/workflows/nt3_mlrMBO/swift/workflow.sh
@@ -57,7 +57,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p1b1_mlrMBO/swift/cooley_workflow.sh b/workflows/p1b1_mlrMBO/swift/cooley_workflow.sh
@@ -16,7 +16,7 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
 source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 # TODO edit the number of processes as required.
diff --git a/workflows/p1b1_mlrMBO/swift/cori_workflow.sh b/workflows/p1b1_mlrMBO/swift/cori_workflow.sh
@@ -54,7 +54,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p1b1_mlrMBO/swift/workflow.sh b/workflows/p1b1_mlrMBO/swift/workflow.sh
@@ -16,7 +16,7 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
 source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 # TODO edit the number of processes as required.
diff --git a/workflows/p1b3_mlrMBO/swift/ai_theta_workflow3.sh b/workflows/p1b3_mlrMBO/swift/ai_theta_workflow3.sh
@@ -57,7 +57,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p1b3_mlrMBO/swift/ai_workflow.sh b/workflows/p1b3_mlrMBO/swift/ai_workflow.sh
@@ -16,7 +16,7 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
 source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 # TODO edit the number of processes as required.
diff --git a/workflows/p1b3_mlrMBO/swift/cori_workflow.sh b/workflows/p1b3_mlrMBO/swift/cori_workflow.sh
@@ -53,7 +53,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p1b3_mlrMBO/swift/cori_workflow3.sh b/workflows/p1b3_mlrMBO/swift/cori_workflow3.sh
@@ -57,7 +57,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p1b3_mlrMBO/swift/titan_workflow.sh b/workflows/p1b3_mlrMBO/swift/titan_workflow.sh
@@ -52,7 +52,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$HOME/FS/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$HOME/FS/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p1b3_mlrMBO/swift/workflow.sh b/workflows/p1b3_mlrMBO/swift/workflow.sh
@@ -16,7 +16,7 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
 source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 # TODO edit the number of processes as required.
diff --git a/workflows/p2b1_mlrMBO/swift/ai_workflow.sh b/workflows/p2b1_mlrMBO/swift/ai_workflow.sh
@@ -59,7 +59,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p2b1_mlrMBO/swift/cori_workflow3.sh b/workflows/p2b1_mlrMBO/swift/cori_workflow3.sh
@@ -54,7 +54,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p2b1_mlrMBO/swift/theta_workflow.sh b/workflows/p2b1_mlrMBO/swift/theta_workflow.sh
@@ -52,7 +52,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p2b1_mlrMBO/swift/workflow.sh b/workflows/p2b1_mlrMBO/swift/workflow.sh
@@ -56,7 +56,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p3b1_mlrMBO/swift/ai_workflow.sh b/workflows/p3b1_mlrMBO/swift/ai_workflow.sh
@@ -57,7 +57,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p3b1_mlrMBO/swift/cori_workflow3.sh b/workflows/p3b1_mlrMBO/swift/cori_workflow3.sh
@@ -59,7 +59,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p3b1_mlrMBO/swift/theta_workflow.sh b/workflows/p3b1_mlrMBO/swift/theta_workflow.sh
@@ -57,7 +57,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
diff --git a/workflows/p3b1_mlrMBO/swift/workflow.sh b/workflows/p3b1_mlrMBO/swift/workflow.sh
@@ -55,7 +55,7 @@ fi
 #export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
 
 export EXPID=$1
-export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
+export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
 check_directory_exists
 
 export TURBINE_JOBNAME="${EXPID}_job"
