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

Author: pbalapra

workflows/common/python/runner_utils.py

@@ -1,5 +1,5 @@
 import numpy as np
-import json
+import json, os
 
 DATA_TYPES = {type(np.float16): 'f16', type(np.float32): 'f32', type(np.float64): 'f64'}
 
@@ -11,6 +11,9 @@ def init(param_file, instance_directory, framework, out_dir_key):
     with open(param_file) as f_in:
         hyper_parameter_map = json.load(f_in)
 
+    if not os.path.exists(instance_directory):
+        os.makedirs(instance_directory)
+
     hyper_parameter_map['framework'] = framework
     hyper_parameter_map[out_dir_key] = '{}/output'.format(instance_directory)
     hyper_parameter_map['instance_directory'] = instance_directory

workflows/p2b1_mlrMBO/swift/ai_workflow3.swift

@@ -17,7 +17,7 @@ int max_budget = toint(argv("mb", "110"));
 int max_iterations = toint(argv("mi", "10"));
 int design_size = toint(argv("ds", "10"));
 string param_set = argv("param_set_file");
-file model_script = input("%s/scripts/theta_run_model.sh" % (emews_root));
+file model_script = input(argv("script_file"));
 
 string FRAMEWORK = "keras";
 

workflows/p2b1_mlrMBO/swift/workflow3.swift

@@ -21,13 +21,18 @@ string param_set = argv("param_set_file");
 string code_template =
 """
 import p2b1_runner
-import json
+import json, os
+
+outdir = '%s'
+
+if not os.path.exists(outdir):
+    os.makedirs(outdir)
 
 hyper_parameter_map = json.loads('%s')
 hyper_parameter_map['framework'] = 'keras'
+hyper_parameter_map['save'] = '{}/output'.format(outdir)
+hyper_parameter_map['instance_directory'] = outdir
 
-hyper_parameter_map['save'] = '%s/output'
-hyper_parameter_map['instance_directory'] = '%s'
 
 validation_loss = p2b1_runner.run(hyper_parameter_map)
 """;
@@ -42,8 +47,8 @@ max.budget = %d, max.iterations = %d, design.size=%d, propose.points=%d, param.s
 
 (string obj_result) obj(string params, string iter_indiv_id) {
   string outdir = "%s/run_%s" % (turbine_output, iter_indiv_id);
-  string code = code_template % (params, outdir, outdir);
-  make_dir(outdir) =>
+  string code = code_template % (outdir, params);
+  //make_dir(outdir) =>
   obj_result = python_persist(code, "str(validation_loss)");
   printf(obj_result);
 }

workflows/p3b1_mlrMBO/python/p3b1_runner.py

@@ -27,8 +27,7 @@ def run(hyper_parameter_map):
         params[k] = v
 
     runner_utils.write_params(params, hyper_parameter_map)
-    #loss_history = pkg.run(params)
-    pkg.do_n_fold(params)
+    avg_loss = pkg.do_n_fold(params)
 
     if framework == 'keras':
         # works around this error:
@@ -39,8 +38,7 @@ def run(hyper_parameter_map):
         except AttributeError:      # theano does not have this function
             pass
 
-    # TODO fix with appropriate value
-    return 0.3
+    return avg_loss
 
 if __name__ == '__main__':
     param_file = sys.argv[1]

workflows/p3b1_mlrMBO/swift/workflow3.swift

@@ -21,13 +21,17 @@ string param_set = argv("param_set_file");
 string code_template =
 """
 import p3b1_runner
-import json
+import json, os
+
+outdir = '%s'
+
+if not os.path.exists(outdir):
+    os.makedirs(outdir)
 
 hyper_parameter_map = json.loads('%s')
 hyper_parameter_map['framework'] = 'keras'
-
-hyper_parameter_map['save'] = '%s/output'
-hyper_parameter_map['instance_directory'] = '%s'
+hyper_parameter_map['save'] = '{}/output'.format(outdir)
+hyper_parameter_map['instance_directory'] = outdir
 
 validation_loss = p3b1_runner.run(hyper_parameter_map)
 """;
@@ -42,8 +46,8 @@ max.budget = %d, max.iterations = %d, design.size=%d, propose.points=%d, param.s
 
 (string obj_result) obj(string params, string iter_indiv_id) {
   string outdir = "%s/run_%s" % (turbine_output, iter_indiv_id);
-  string code = code_template % (params, outdir, outdir);
-  make_dir(outdir) =>
+  string code = code_template % (outdir, params);
+  //make_dir(outdir) =>
   obj_result = python_persist(code, "str(validation_loss)");
   printf(obj_result);
 }