Updated theta files

Author: ncollier

workflows/common/sh/theta_run_logger.sh

@@ -3,22 +3,23 @@ set -eu
 CMD=$1
 EMEWS_PROJECT_ROOT=$2
 
-export PYTHONHOME="/home/brettin/anaconda2/envs/vrane"
+export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
 PYTHON="$PYTHONHOME/bin/python"
 export LD_LIBRARY_PATH="$PYTHONHOME/lib"
 export PATH="$PYTHONHOME/bin:$PATH"
 
-COMMON=$emews_root/../../../Benchmarks/common
-PYTHONPATH="$PYTHONHOME/lib/python2.7:$COMMON"
+COMMON=$EMEWS_PROJECT_ROOT/../../../Benchmarks/common
+echo $COMMON
+PYTHONPATH="$PYTHONHOME/lib/python2.7:$COMMON:"
 PYTHONPATH+="$PYTHONHOME/lib/python2.7/site-packages"
 export PYTHONPATH
 
 # "start" propose_points, max_iterations, ps, algorithm, exp_id, sys_env
 if [ $CMD == "start" ]
   then
     arg_array=("$EMEWS_PROJECT_ROOT/../common/python/log_runner.py" "$1" "$3" "$4" "$5" "$6" "$7" "$8")
-    python "${arg_array[@]}"
+    $PYTHON "${arg_array[@]}"
   else
     arg_array=("$EMEWS_PROJECT_ROOT/../common/python/log_runner.py" "$1" "$3")
-    python "${arg_array[@]}"
+    $PYTHON "${arg_array[@]}"
 fi

workflows/nt3_mlrMBO/scripts/theta_run_model.sh

@@ -48,7 +48,7 @@ export KMP_SETTINGS=1
 export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
 export OMP_NUM_THREADS=144
 
-export PYTHONHOME="/home/brettin/anaconda2/envs/vrane"
+export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
 PYTHON="$PYTHONHOME/bin/python"
 export LD_LIBRARY_PATH="$PYTHONHOME/lib"
 export PATH="$PYTHONHOME/bin:$PATH"
@@ -68,6 +68,7 @@ MODEL_CMD="python ${arg_array[@]}"
 # the optional timeout.
 set +e
 echo $MODEL_CMD
+
 $TIMEOUT_CMD python "${arg_array[@]}"
 # $? is the exit status of the most recently executed command (i.e the
 # line above)

workflows/nt3_mlrMBO/swift/ai_workflow3.swift

@@ -73,6 +73,7 @@ app (file out, file err) run_log_end(file shfile)
   file out <"%s/out.txt" % outdir>;
   file err <"%s/err.txt" % outdir>;
 
+  //printf("%s", params);
   //string fname = "%s/params.json" % outdir =>
   //file params_file <fname> = write(params) =>
   (out,err) = run_model(model_script, params, outdir, iter_indiv_id) =>

workflows/nt3_mlrMBO/swift/theta_workflow.sh

@@ -71,17 +71,15 @@ export TURBINE_JOBNAME="${EXPID}_job"
 # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$R_HOME/lib
 # export PYTHONHOME=
 
-
-
-TCL=/gpfs/mira-home/wozniak/Public/sfw/theta/tcl-8.6.1
-export R=/home/wozniak/mira-home/Public/sfw/theta/R-3.4.0/lib64/R
-export PY=/gpfs/mira-home/wozniak/Public/sfw/theta/Python-2.7.12
+TCL=/home/wozniak/Public/sfw/theta/tcl-8.6.1
+export R=/home/wozniak/Public/sfw/theta/R-3.4.0/lib64/R
+export PY=/home/wozniak/Public/sfw/theta/Python-2.7.12
 export LD_LIBRARY_PATH=$PY/lib:$R/lib:$LD_LIBRARY_PATH
 COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
 PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$BENCHMARK_DIR:$COMMON_DIR
-PYTHONHOME=/gpfs/mira-home/wozniak/Public/sfw/theta/Python-2.7.12
+PYTHONHOME=/home/wozniak/Public/sfw/theta/Python-2.7.12
 
-export PATH=/gpfs/mira-home/wozniak/Public/sfw/theta/swift-t-pyr/stc/bin:$TCL/bin:$PATH
+export PATH=/home/wozniak/Public/sfw/theta/swift-t-pyr/stc/bin:$TCL/bin:$PATH
 #$PYTHONHOME/bin:$TCL/bin:$PATH
 
 # Resident task workers and ranks
@@ -96,6 +94,8 @@ CMD_LINE_ARGS+="-param_set_file=$PARAM_SET_FILE -script_file=$EMEWS_PROJECT_ROOT
 CMD_LINE_ARGS+="-model_name=$MODEL_NAME "
 CMD_LINE_ARGS+="-exp_id=$EXPID -log_script=$EMEWS_PROJECT_ROOT/../common/sh/theta_run_logger.sh"
 
+TURBINE_DIR=/home/wozniak/Public/sfw/theta/swift-t-pyr/turbine/lib
+
 # set machine to your scheduler type (e.g. pbs, slurm, cobalt etc.),
 # or empty for an immediate non-queued unscheduled run
 MACHINE="theta"
@@ -114,7 +114,7 @@ log_script
 # echo's anything following this to standard out
 set -x
 WORKFLOW_SWIFT=ai_workflow3.swift
-swift-t -n $PROCS $MACHINE -p -I $EQR -r $EQR \
+swift-t -n $PROCS $MACHINE -p -I $EQR -r $EQR  -r $TURBINE_DIR \
         -e LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
         -e TURBINE_RESIDENT_WORK_WORKERS=$TURBINE_RESIDENT_WORK_WORKERS \
     -e RESIDENT_WORK_RANKS=$RESIDENT_WORK_RANKS \