Added logging code to all ai workflows

Author: ncollier

workflows/nt3_mlrMBO/python/log_runner.py renamed to workflows/common/python/log_runner.py

@@ -9,9 +9,9 @@ export PYTHONPATH="$COMMON_DIR"
 # "start" propose_points, max_iterations, ps, algorithm, exp_id, sys_env
 if [ $CMD == "start" ]
   then
-    arg_array=("$EMEWS_PROJECT_ROOT/python/log_runner.py" "$1" "$3" "$4" "$5" "$6" "$7" "$8")
+    arg_array=("$EMEWS_PROJECT_ROOT/../common/python/log_runner.py" "$1" "$3" "$4" "$5" "$6" "$7" "$8")
     python "${arg_array[@]}"
   else
-    arg_array=("$EMEWS_PROJECT_ROOT/python/log_runner.py" "$1" "$3")
+    arg_array=("$EMEWS_PROJECT_ROOT/../common/python/log_runner.py" "$1" "$3")
     python "${arg_array[@]}"
 fi

workflows/nt3_mlrMBO/scripts/run_logger.sh renamed to workflows/common/sh/run_logger.sh

@@ -16,9 +16,9 @@ export PYTHONPATH
 # "start" propose_points, max_iterations, ps, algorithm, exp_id, sys_env
 if [ $CMD == "start" ]
   then
-    arg_array=("$EMEWS_PROJECT_ROOT/python/log_runner.py" "$1" "$3" "$4" "$5" "$6" "$7" "$8")
+    arg_array=("$EMEWS_PROJECT_ROOT/../common/python/log_runner.py" "$1" "$3" "$4" "$5" "$6" "$7" "$8")
     python "${arg_array[@]}"
   else
-    arg_array=("$EMEWS_PROJECT_ROOT/python/log_runner.py" "$1" "$3")
+    arg_array=("$EMEWS_PROJECT_ROOT/../common/python/log_runner.py" "$1" "$3")
     python "${arg_array[@]}"
 fi

workflows/nt3_mlrMBO/scripts/theta_run_logger.sh renamed to workflows/common/sh/theta_run_logger.sh

@@ -25,8 +25,7 @@ if [ -n "$TIMEOUT" ]; then
   TIMEOUT_CMD="timeout $TIMEOUT"
 fi
 
-# Set param_line from the first argument to this script
-# param_line is the string containing the model parameters for a run.
+# string of parameters
 parameter_string="$1"
 echo $parameter_string
 

workflows/nt3_mlrMBO/scripts/run_model.sh

@@ -25,8 +25,7 @@ if [ -n "$TIMEOUT" ]; then
   TIMEOUT_CMD="timeout $TIMEOUT"
 fi
 
-# Set param_line from the first argument to this script
-# param_line is the string containing the model parameters for a run.
+
 parameter_string=$1
 
 # Set emews_root to the root directory of the project (i.e. the directory

workflows/nt3_mlrMBO/scripts/theta_run_model.sh

@@ -34,13 +34,13 @@ MACHINE=""
 # How many to runs evaluate per iteration
 MAX_BUDGET=${MAX_BUDGET:-110}
 # Total iterations
-MAX_ITERATIONS=${MAX_ITERATIONS:-2}
+MAX_ITERATIONS=${MAX_ITERATIONS:-4}
 DESIGN_SIZE=${DESIGN_SIZE:-4}
 PROPOSE_POINTS=${PROPOSE_POINTS:-4}
-PARAM_SET_FILE=${PARAM_SET_FILE:-$EMEWS_PROJECT_ROOT/data/parameter_set.R}
+PARAM_SET_FILE=${PARAM_SET_FILE:-$EMEWS_PROJECT_ROOT/data/parameter_set3.R}
 
 SCRIPT_FILE=$EMEWS_PROJECT_ROOT/scripts/run_model.sh
-LOG_SCRIPT_FILE=$EMEWS_PROJECT_ROOT/scripts/run_logger.sh
+LOG_SCRIPT_FILE=$EMEWS_PROJECT_ROOT/../common/sh/run_logger.sh
 # USER SETTINGS END
 
 # source some utility functions used by EMEWS in this script

workflows/nt3_mlrMBO/swift/ai_workflow.sh

@@ -94,7 +94,7 @@ EQR=$EMEWS_PROJECT_ROOT/ext/EQ-R
 CMD_LINE_ARGS="$* -pp=$PROPOSE_POINTS -mi=$MAX_ITERATIONS -mb=$MAX_BUDGET -ds=$DESIGN_SIZE "
 CMD_LINE_ARGS+="-param_set_file=$PARAM_SET_FILE -script_file=$EMEWS_PROJECT_ROOT/scripts/theta_run_model.sh "
 CMD_LINE_ARGS+="-model_name=$MODEL_NAME "
-CMD_LINE_ARGS+="-exp_id=$EXPID -log_script=$EMEWS_PROJECT_ROOT/scripts/theta_run_logger.sh"
+CMD_LINE_ARGS+="-exp_id=$EXPID -log_script=$EMEWS_PROJECT_ROOT/../common/sh/theta_run_logger.sh"
 
 # set machine to your scheduler type (e.g. pbs, slurm, cobalt etc.),
 # or empty for an immediate non-queued unscheduled run

workflows/nt3_mlrMBO/swift/test_workflow.sh

@@ -41,11 +41,15 @@ def run(hyper_parameter_map):
     return loss_history[-1]
 
 if __name__ == '__main__':
-    param_file = sys.argv[1]
+    param_string = sys.argv[1]
     instance_directory = sys.argv[2]
     framework = sys.argv[3]
-    hyper_parameter_map = runner_utils.init(param_file, instance_directory,
+    exp_id = sys.argv[4]
+    run_id = sys.argv[5]
+    hyper_parameter_map = runner_utils.init(param_string, instance_directory,
                                             framework, 'save_path')
+    hyper_parameter_map['experiment_id'] = exp_id
+    hyper_parameter_map['run_id'] = run_id
     # clear sys.argv so that argparse doesn't object
     sys.argv = ['p2b1_runner']
     result = run(hyper_parameter_map)

workflows/nt3_mlrMBO/swift/theta_workflow.sh

@@ -13,7 +13,7 @@ set -eu
 
 # !!! IF YOU CHANGE THE NUMBER OF ARGUMENTS PASSED TO THIS SCRIPT, YOU MUST
 # CHANGE THE TIMEOUT_ARG_INDEX !!!
-TIMEOUT_ARG_INDEX=5
+TIMEOUT_ARG_INDEX=7
 TIMEOUT=""
 if [[ $# ==  $TIMEOUT_ARG_INDEX ]]
 then
@@ -25,9 +25,9 @@ if [ -n "$TIMEOUT" ]; then
   TIMEOUT_CMD="timeout $TIMEOUT"
 fi
 
-# Set param_line from the first argument to this script
-# param_line is the string containing the model parameters for a run.
-param_file=$1
+## param_string is the string containing the model parameters for a run.
+parameter_string="$1"
+echo $parameter_string
 
 # Set emews_root to the root directory of the project (i.e. the directory
 # that contains the scripts, swift, etc. directories and files)
@@ -39,19 +39,24 @@ instance_directory=$3
 cd $instance_directory
 
 framework=$4
+exp_id=$5
+run_id=$6
 
 export KERAS_BACKEND=theano
-BENCHMARK_DIR=$emews_root/../../../Benchmarks/Pilot2/P2B1
+BENCHMARK_DIR=$emews_root/../../../Benchmarks/common:$emews_root/../../../Benchmarks/Pilot2/P2B1
 COMMON_DIR=$emews_root/../common/python
 export PYTHONPATH="$BENCHMARK_DIR:$COMMON_DIR"
-MODEL_CMD="python $emews_root/python/p2b1_runner.py $param_file $instance_directory $framework"
+
+arg_array=("$emews_root/python/p2b1_runner.py" "$parameter_string" "$instance_directory" "$framework" "$exp_id" "$run_id")
+MODEL_CMD="python ${arg_array[@]}"
+
 
 # Turn bash error checking off. This is
 # required to properly handle the model execution return value
 # the optional timeout.
 set +e
 echo $MODEL_CMD
-$TIMEOUT_CMD $MODEL_CMD
+$TIMEOUT_CMD python "${arg_array[@]}"
 # $? is the exit status of the most recently executed command (i.e the
 # line above)
 RES=$?