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

Author: ncollier

workflows/nt3_mlrMBO/swift/theta_workflow.sh

@@ -23,7 +23,7 @@ export PROCS=${PROCS:-320}
 # Cori has 32 cores per node, 128GB per node
 export PPN=${PPN:-1}
 
-export QUEUE="default"
+export QUEUE=${QUEUE:-default}
 export WALLTIME=${WALLTIME:-05:00:00}
 
 

workflows/p2b1_mlrMBO/swift/theta_workflow.sh

@@ -24,7 +24,7 @@ export PROCS=${PROCS:-10}
 export PPN=${PPN:-1}
 
 
-export QUEUE="default"
+export QUEUE=${QUEUE:-default}
 export WALLTIME=${WALLTIME:-02:00:00}
 
 # mlrMBO settings

workflows/p2b1_mlrMBO/swift/workflow3.swift

@@ -21,13 +21,14 @@ string exp_id = argv("exp_id");
 
 string code_template =
 """
+import os
+outdir = '%s'
+os.environ['THEANO_FLAGS']="base_compiledir={}".format(outdir)
+
 import p2b1_runner
-import json, os
+import json
 import theano
 
-outdir = '%s'
-theano.config.base_compiledir = outdir
-
 if not os.path.exists(outdir):
     os.makedirs(outdir)
 

workflows/p3b1_mlrMBO/swift/theta_workflow.sh

@@ -23,7 +23,7 @@ export PROCS=${PROCS:-10}
 export PPN=${PPN:-1}
 
 
-export QUEUE="default"
+export QUEUE=${QUEUE:-default}
 export WALLTIME=${WALLTIME:-02:00:00}
 
 # mlrMBO settings