Merge branch 'master' of https://github.com/ECP-CANDLE/Supervisor into rajeeja/rnd_grid

Author: rajeeja

workflows/nt3_mlrMBO/scripts/theta_run_model.sh

@@ -47,7 +47,7 @@ benchmark_timeout=$8
 export KMP_BLOCKTIME=30
 export KMP_SETTINGS=1
 export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
-export OMP_NUM_THREADS=144
+export OMP_NUM_THREADS=128
 
 export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
 PYTHON="$PYTHONHOME/bin/python"

workflows/p2b1_mlrMBO/scripts/theta_run_model.sh

@@ -50,7 +50,7 @@ benchmark_timeout=$7
 export KMP_BLOCKTIME=30
 export KMP_SETTINGS=1
 export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
-export OMP_NUM_THREADS=144
+export OMP_NUM_THREADS=128
 
 export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
 PYTHON="$PYTHONHOME/bin/python"

workflows/p3b1_mlrMBO/scripts/theta_run_model.sh

@@ -45,7 +45,7 @@ benchmark_timeout=$7
 export KMP_BLOCKTIME=30
 export KMP_SETTINGS=1
 export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
-export OMP_NUM_THREADS=144
+export OMP_NUM_THREADS=128
 
 export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
 PYTHON="$PYTHONHOME/bin/python"

workflows/p3b1_mlrMBO/swift/cori_workflow3.sh

@@ -50,8 +50,8 @@ PARAM_SET_FILE=${PARAM_SET_FILE:-$EMEWS_PROJECT_ROOT/data/parameter_set3.R}
 # Source some utility functions used by EMEWS in this script
 source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
 
+script_name=$(basename $0)
 if [ "$#" -ne 1 ]; then
-  script_name=$(basename $0)
   echo "Usage: ${script_name} EXPERIMENT_ID (e.g. ${script_name} experiment_1)"
   exit 1
 fi
@@ -104,7 +104,7 @@ fi
 # for example, USER_VARS=("VAR_1" "VAR_2")
 USER_VARS=($CMD_LINE_ARGS)
 # log variables and script to to TURBINE_OUTPUT directory
-log_script
+log_script $EMEWS_PROJECT_ROOT/swift/$script_name
 
 R_LIB=/global/homes/w/wozniak/Public/sfw/R-3.4.0/lib64/R/lib
 GCC_LIB=/opt/gcc/6.3.0/snos/lib64