Updated p2b1 workflows to use tensor flow

Author: ncollier

workflows/p2b1_mlrMBO/scripts/run_model.sh

@@ -42,7 +42,7 @@ framework=$4
 exp_id=$5
 run_id=$6
 
-export KERAS_BACKEND=theano
+#export KERAS_BACKEND=theano
 BENCHMARK_DIR=$emews_root/../../../Benchmarks/common:$emews_root/../../../Benchmarks/Pilot2/P2B1
 COMMON_DIR=$emews_root/../common/python
 export PYTHONPATH="$BENCHMARK_DIR:$COMMON_DIR"

workflows/p2b1_mlrMBO/scripts/theta_run_model.sh

@@ -40,17 +40,16 @@ framework=$4
 exp_id=$5
 run_id=$6
 
-export KERAS_BACKEND=theano
-# Theta / Tensorflow env vars
-#export KMP_BLOCKTIME=30
-#export KMP_SETTINGS=1
-#export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
-#export OMP_NUM_THREADS=144
-
+# export KERAS_BACKEND=theano
 #export THEANO_FLAGS="config.base_compiledir=$instance_directory"
-export THEANO_FLAGS="base_compiledir=$instance_directory"
+#export THEANO_FLAGS="base_compiledir=$instance_directory"
 
 
+# Theta / Tensorflow env vars
+export KMP_BLOCKTIME=30
+export KMP_SETTINGS=1
+export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
+export OMP_NUM_THREADS=144
 
 export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
 PYTHON="$PYTHONHOME/bin/python"

workflows/p2b1_mlrMBO/swift/cori_workflow3.sh

@@ -88,8 +88,7 @@ CMD_LINE_ARGS+="-param_set_file=$PARAM_SET_FILE "
 CMD_LINE_ARGS+="-exp_id=$EXPID "
 
 # P2B1 requires theano -- doesn't work with tensor flow
-KERAS_BACKEND=theano
-
+# KERAS_BACKEND=theano
 
 # set machine to your scheduler type (e.g. pbs, slurm, cobalt etc.),
 # or empty for an immediate non-queued unscheduled run

workflows/p2b1_mlrMBO/swift/workflow.sh

@@ -14,7 +14,8 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
 # See README.md for more information
 
 # The directory in the Benchmarks repo containing P2B1
-BENCHMARK_DIR=$EMEWS_PROJECT_ROOT/../../../Benchmarks/Pilot2/P2B1
+BENCHMARK_DIR="$EMEWS_PROJECT_ROOT/../../../Benchmarks/common:"
+BENCHMARK_DIR+="$EMEWS_PROJECT_ROOT/../../../Benchmarks/Pilot2/P2B1"
 
 # The number of MPI processes
 # Note that 2 processes are reserved for Swift/EMEMS
@@ -78,7 +79,7 @@ export RESIDENT_WORK_RANKS=$(( PROCS - 2 ))
 # EQ/R location
 EQR=$EMEWS_PROJECT_ROOT/ext/EQ-R
 
-export KERAS_BACKEND=theano
+#export KERAS_BACKEND=theano
 
 CMD_LINE_ARGS="$* -pp=$PROPOSE_POINTS -mi=$MAX_ITERATIONS -mb=$MAX_BUDGET -ds=$DESIGN_SIZE "
 CMD_LINE_ARGS+="-exp_id=$EXPID -param_set_file=$PARAM_SET_FILE "

workflows/p2b1_mlrMBO/swift/workflow3.swift

@@ -23,11 +23,9 @@ string code_template =
 """
 import os
 outdir = '%s'
-os.environ['THEANO_FLAGS']="base_compiledir={}".format(outdir)
 
 import p2b1_runner
 import json
-import theano
 
 if not os.path.exists(outdir):
     os.makedirs(outdir)
@@ -132,9 +130,16 @@ max.budget = %d, max.iterations = %d, design.size=%d, propose.points=%d, param.s
 
 (void o) log_start(string algorithm) {
     string ps = join(file_lines(input(param_set)), " ");
-    string sys_env = join(file_lines(input("%s/turbine.log" % turbine_output)), ", ");
-    string code = code_log_start % (propose_points, max_iterations, ps, algorithm, exp_id, sys_env);
-    python_persist(code);
+    string t_log = "%s/turbine.log" % turbine_output;
+    if (file_exists(t_log)) {
+      string sys_env = join(file_lines(input(t_log)), ", ");
+      string code = code_log_start % (propose_points, max_iterations, ps, algorithm, exp_id, sys_env);
+      python_persist(code);
+    } else {
+      string code = code_log_start % (propose_points, max_iterations, ps, algorithm, exp_id, "");
+      python_persist(code);
+    }
+
     o = propagate();
 }