Basic resources works.

Author: Peter Amstutz

cwltool/main.py

@@ -299,6 +299,7 @@ def load_tool(argsworkflow, updateonly, strict, makeTool, debug, print_pre=False
 def main(args=None,
          executor=single_job_executor,
          makeTool=workflow.defaultMakeTool,
+         selectResources=None,
          parser=None,
          stdin=sys.stdin,
          stdout=sys.stdout,
@@ -434,7 +435,8 @@ def main(args=None,
                        tmpdir_prefix=args.tmpdir_prefix,
                        rm_tmpdir=args.rm_tmpdir,
                        makeTool=makeTool,
-                       move_outputs=args.move_outputs
+                       move_outputs=args.move_outputs,
+                       select_resources=selectResources
                        )
         # This is the workflow output, it needs to be written
         stdout.write(json.dumps(out, indent=4))

cwltool/process.py

@@ -186,7 +186,8 @@ def _init_job(self, joborder, input_basedir, **kwargs):
 
         builder.bindings.extend(builder.bind_input(self.inputs_record_schema, builder.job))
 
-        builder.resources = self.evalResources(builder)
+        builder.resources = {}
+        builder.resources = self.evalResources(builder, kwargs)
 
         return builder
 
@@ -199,7 +200,7 @@ def evalResources(self, builder, kwargs):
             "ramMax": 1024,
             "tmpdirMin": 1024,
             "tmpdirMax": 1024,
-            "outdirMin": 1024
+            "outdirMin": 1024,
             "outdirMax": 1024
         }
         for a in ("cores", "ram", "tmpdir", "outdir"):
@@ -225,7 +226,7 @@ def evalResources(self, builder, kwargs):
                 "cores": request["coresMin"],
                 "ram":   request["ramMin"],
                 "tmpdir": request["tmpdirMin"],
-                "outdir": request["outdirMiax"],
+                "outdir": request["outdirMin"],
             }
 
     def validate_hints(self, hints, strict):

node-expr-engine/cwlNodeEngine.js

@@ -34,6 +34,7 @@ process.stdin.on('end', function() {
 
     fn += "var $job = " + JSON.stringify(j.job) + ";\n";
     fn += "var $self = " + JSON.stringify(j.context) + ";\n"
+    fn += "var $resources = " + JSON.stringify(j.resources) + ";\n"
 
     fn += "(function()" + exp + ")()";