X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3b4da80a23136c0cec743ee4cdad9b22b51ac3e0..4161dfe7f8f4ea790d286cd1745893e0a250a02f:/sdk/cwl/arvados_cwl/arvworkflow.py diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py index ba16b86630..e80c06f00d 100644 --- a/sdk/cwl/arvados_cwl/arvworkflow.py +++ b/sdk/cwl/arvados_cwl/arvworkflow.py @@ -15,13 +15,14 @@ from cwltool.process import shortname from cwltool.workflow import Workflow, WorkflowException from cwltool.pathmapper import adjustFileObjs, adjustDirObjs, visit_class from cwltool.builder import Builder +from cwltool.context import LoadingContext import ruamel.yaml as yaml from .runner import (upload_dependencies, packed_workflow, upload_workflow_collection, trim_anonymous_location, remove_redundant_fields, discover_secondary_files) from .pathmapper import ArvPathMapper, trim_listing -from .arvtool import ArvadosCommandTool +from .arvtool import ArvadosCommandTool, check_cluster_target from .perf import Perf logger = logging.getLogger('arvados.cwl-runner') @@ -51,13 +52,24 @@ def upload_workflow(arvRunner, tool, job_order, project_uuid, uuid=None, upload_dependencies(arvRunner, name, tool.doc_loader, packed, tool.tool["id"], False) - # TODO nowhere for submit_runner_ram to go. + if submit_runner_ram: + hints = main.get("hints", []) + found = False + for h in hints: + if h["class"] == "http://arvados.org/cwl#WorkflowRunnerResources": + h["ramMin"] = submit_runner_ram + found = True + break + if not found: + hints.append({"class": "http://arvados.org/cwl#WorkflowRunnerResources", + "ramMin": submit_runner_ram}) + main["hints"] = hints body = { "workflow": { "name": name, "description": tool.tool.get("doc", ""), - "definition":yaml.round_trip_dump(packed) + "definition":json.dumps(packed, sort_keys=True, indent=4, separators=(',',': ')) }} if project_uuid: body["workflow"]["owner_uuid"] = project_uuid @@ -109,167 +121,164 @@ def get_overall_res_req(res_reqs): class ArvadosWorkflow(Workflow): """Wrap cwltool Workflow to override selected methods.""" - def __init__(self, arvrunner, toolpath_object, **kwargs): - super(ArvadosWorkflow, self).__init__(toolpath_object, **kwargs) + def __init__(self, arvrunner, toolpath_object, loadingContext): + super(ArvadosWorkflow, self).__init__(toolpath_object, loadingContext) self.arvrunner = arvrunner - self.work_api = kwargs["work_api"] self.wf_pdh = None self.dynamic_resource_req = [] self.static_resource_req = [] + self.wf_reffiles = [] + self.loadingContext = loadingContext - def job(self, joborder, output_callback, **kwargs): - kwargs["work_api"] = self.work_api - req, _ = self.get_requirement("http://arvados.org/cwl#RunInSingleContainer") - if req: - with SourceLine(self.tool, None, WorkflowException, logger.isEnabledFor(logging.DEBUG)): - if "id" not in self.tool: - raise WorkflowException("%s object must have 'id'" % (self.tool["class"])) - document_loader, workflowobj, uri = (self.doc_loader, self.doc_loader.fetch(self.tool["id"]), self.tool["id"]) + def job(self, joborder, output_callback, runtimeContext): + + builder = self._init_job(joborder, runtimeContext) + check_cluster_target(self, builder, runtimeContext) - discover_secondary_files(self.tool["inputs"], joborder) + req, _ = self.get_requirement("http://arvados.org/cwl#RunInSingleContainer") + if not req: + return super(ArvadosWorkflow, self).job(joborder, output_callback, runtimeContext) + + # RunInSingleContainer is true + + with SourceLine(self.tool, None, WorkflowException, logger.isEnabledFor(logging.DEBUG)): + if "id" not in self.tool: + raise WorkflowException("%s object must have 'id'" % (self.tool["class"])) + document_loader, workflowobj, uri = (self.doc_loader, self.doc_loader.fetch(self.tool["id"]), self.tool["id"]) + + discover_secondary_files(self.tool["inputs"], joborder) + + with Perf(metrics, "subworkflow upload_deps"): + upload_dependencies(self.arvrunner, + os.path.basename(joborder.get("id", "#")), + document_loader, + joborder, + joborder.get("id", "#"), + False) + + if self.wf_pdh is None: + workflowobj["requirements"] = dedup_reqs(self.requirements) + workflowobj["hints"] = dedup_reqs(self.hints) + + packed = pack(document_loader, workflowobj, uri, self.metadata) + + def visit(item): + for t in ("hints", "requirements"): + if t not in item: + continue + for req in item[t]: + if req["class"] == "ResourceRequirement": + dyn = False + for k in max_res_pars + sum_res_pars: + if k in req: + if isinstance(req[k], basestring): + if item["id"] == "#main": + # only the top-level requirements/hints may contain expressions + self.dynamic_resource_req.append(req) + dyn = True + break + else: + with SourceLine(req, k, WorkflowException): + raise WorkflowException("Non-top-level ResourceRequirement in single container cannot have expressions") + if not dyn: + self.static_resource_req.append(req) + + visit_class(packed["$graph"], ("Workflow", "CommandLineTool"), visit) + + if self.static_resource_req: + self.static_resource_req = [get_overall_res_req(self.static_resource_req)] - with Perf(metrics, "subworkflow upload_deps"): upload_dependencies(self.arvrunner, - os.path.basename(joborder.get("id", "#")), + runtimeContext.name, document_loader, - joborder, - joborder.get("id", "#"), + packed, + uri, False) - if self.wf_pdh is None: - workflowobj["requirements"] = dedup_reqs(self.requirements) - workflowobj["hints"] = dedup_reqs(self.hints) - - packed = pack(document_loader, workflowobj, uri, self.metadata) - - builder = Builder() - builder.job = joborder - builder.requirements = workflowobj["requirements"] - builder.hints = workflowobj["hints"] - builder.resources = {} - - def visit(item): - for t in ("hints", "requirements"): - if t not in item: - continue - for req in item[t]: - if req["class"] == "ResourceRequirement": - dyn = False - for k in max_res_pars + sum_res_pars: - if k in req: - if isinstance(req[k], basestring): - if item["id"] == "#main": - # only the top-level requirements/hints may contain expressions - self.dynamic_resource_req.append(req) - dyn = True - break - else: - with SourceLine(req, k, WorkflowException): - raise WorkflowException("Non-top-level ResourceRequirement in single container cannot have expressions") - if not dyn: - self.static_resource_req.append(req) - - visit_class(packed["$graph"], ("Workflow", "CommandLineTool"), visit) - - if self.static_resource_req: - self.static_resource_req = [get_overall_res_req(self.static_resource_req)] - - upload_dependencies(self.arvrunner, - kwargs.get("name", ""), - document_loader, - packed, - uri, - False) - - if self.dynamic_resource_req: - builder = Builder() - builder.job = joborder - builder.requirements = self.requirements - builder.hints = self.hints - builder.resources = {} - - # Evaluate dynamic resource requirements using current builder - rs = copy.copy(self.static_resource_req) - for dyn_rs in self.dynamic_resource_req: - eval_req = {"class": "ResourceRequirement"} - for a in max_res_pars + sum_res_pars: - if a in dyn_rs: - eval_req[a] = builder.do_eval(dyn_rs[a]) - rs.append(eval_req) - job_res_reqs = [get_overall_res_req(rs)] - else: - job_res_reqs = self.static_resource_req - - with Perf(metrics, "subworkflow adjust"): - joborder_resolved = copy.deepcopy(joborder) - joborder_keepmount = copy.deepcopy(joborder) - - reffiles = [] - visit_class(joborder_keepmount, ("File", "Directory"), reffiles.append) - reffiles2 = [] - visit_class(packed, ("File", "Directory"), reffiles2.append) - - mapper = ArvPathMapper(self.arvrunner, reffiles+reffiles2, kwargs["basedir"], - "/keep/%s", - "/keep/%s/%s", - **kwargs) - - kwargs["extra_reffiles"] = copy.deepcopy(reffiles2) - - def keepmount(obj): - remove_redundant_fields(obj) - with SourceLine(obj, None, WorkflowException, logger.isEnabledFor(logging.DEBUG)): - if "location" not in obj: - raise WorkflowException("%s object is missing required 'location' field: %s" % (obj["class"], obj)) - with SourceLine(obj, "location", WorkflowException, logger.isEnabledFor(logging.DEBUG)): - if obj["location"].startswith("keep:"): - obj["location"] = mapper.mapper(obj["location"]).target - if "listing" in obj: - del obj["listing"] - elif obj["location"].startswith("_:"): - del obj["location"] - else: - raise WorkflowException("Location is not a keep reference or a literal: '%s'" % obj["location"]) - - visit_class(joborder_keepmount, ("File", "Directory"), keepmount) - - def resolved(obj): - if obj["location"].startswith("keep:"): - obj["location"] = mapper.mapper(obj["location"]).resolved - - visit_class(joborder_resolved, ("File", "Directory"), resolved) - - if self.wf_pdh is None: - adjustFileObjs(packed, keepmount) - adjustDirObjs(packed, keepmount) - self.wf_pdh = upload_workflow_collection(self.arvrunner, shortname(self.tool["id"]), packed) - - wf_runner = cmap({ - "class": "CommandLineTool", - "baseCommand": "cwltool", - "inputs": self.tool["inputs"], - "outputs": self.tool["outputs"], - "stdout": "cwl.output.json", - "requirements": self.requirements+job_res_reqs+[ - { - "class": "InitialWorkDirRequirement", - "listing": [{ - "entryname": "workflow.cwl", - "entry": { - "class": "File", - "location": "keep:%s/workflow.cwl" % self.wf_pdh - } - }, { - "entryname": "cwl.input.yml", - "entry": json.dumps(joborder_keepmount, indent=2, sort_keys=True, separators=(',',': ')).replace("\\", "\\\\").replace('$(', '\$(').replace('${', '\${') - }] - }], - "hints": self.hints, - "arguments": ["--no-container", "--move-outputs", "--preserve-entire-environment", "workflow.cwl#main", "cwl.input.yml"], - "id": "#" - }) - kwargs["loader"] = self.doc_loader - kwargs["avsc_names"] = self.doc_schema - return ArvadosCommandTool(self.arvrunner, wf_runner, **kwargs).job(joborder_resolved, output_callback, **kwargs) + # Discover files/directories referenced by the + # workflow (mainly "default" values) + visit_class(packed, ("File", "Directory"), self.wf_reffiles.append) + + + if self.dynamic_resource_req: + # Evaluate dynamic resource requirements using current builder + rs = copy.copy(self.static_resource_req) + for dyn_rs in self.dynamic_resource_req: + eval_req = {"class": "ResourceRequirement"} + for a in max_res_pars + sum_res_pars: + if a in dyn_rs: + eval_req[a] = builder.do_eval(dyn_rs[a]) + rs.append(eval_req) + job_res_reqs = [get_overall_res_req(rs)] else: - return super(ArvadosWorkflow, self).job(joborder, output_callback, **kwargs) + job_res_reqs = self.static_resource_req + + with Perf(metrics, "subworkflow adjust"): + joborder_resolved = copy.deepcopy(joborder) + joborder_keepmount = copy.deepcopy(joborder) + + reffiles = [] + visit_class(joborder_keepmount, ("File", "Directory"), reffiles.append) + + mapper = ArvPathMapper(self.arvrunner, reffiles+self.wf_reffiles, runtimeContext.basedir, + "/keep/%s", + "/keep/%s/%s") + + # For containers API, we need to make sure any extra + # referenced files (ie referenced by the workflow but + # not in the inputs) are included in the mounts. + if self.wf_reffiles: + runtimeContext = runtimeContext.copy() + runtimeContext.extra_reffiles = copy.deepcopy(self.wf_reffiles) + + def keepmount(obj): + remove_redundant_fields(obj) + with SourceLine(obj, None, WorkflowException, logger.isEnabledFor(logging.DEBUG)): + if "location" not in obj: + raise WorkflowException("%s object is missing required 'location' field: %s" % (obj["class"], obj)) + with SourceLine(obj, "location", WorkflowException, logger.isEnabledFor(logging.DEBUG)): + if obj["location"].startswith("keep:"): + obj["location"] = mapper.mapper(obj["location"]).target + if "listing" in obj: + del obj["listing"] + elif obj["location"].startswith("_:"): + del obj["location"] + else: + raise WorkflowException("Location is not a keep reference or a literal: '%s'" % obj["location"]) + + visit_class(joborder_keepmount, ("File", "Directory"), keepmount) + + def resolved(obj): + if obj["location"].startswith("keep:"): + obj["location"] = mapper.mapper(obj["location"]).resolved + + visit_class(joborder_resolved, ("File", "Directory"), resolved) + + if self.wf_pdh is None: + adjustFileObjs(packed, keepmount) + adjustDirObjs(packed, keepmount) + self.wf_pdh = upload_workflow_collection(self.arvrunner, shortname(self.tool["id"]), packed) + + wf_runner = cmap({ + "class": "CommandLineTool", + "baseCommand": "cwltool", + "inputs": self.tool["inputs"], + "outputs": self.tool["outputs"], + "stdout": "cwl.output.json", + "requirements": self.requirements+job_res_reqs+[ + {"class": "InlineJavascriptRequirement"}, + { + "class": "InitialWorkDirRequirement", + "listing": [{ + "entryname": "workflow.cwl", + "entry": '$({"class": "File", "location": "keep:%s/workflow.cwl"})' % self.wf_pdh + }, { + "entryname": "cwl.input.yml", + "entry": json.dumps(joborder_keepmount, indent=2, sort_keys=True, separators=(',',': ')).replace("\\", "\\\\").replace('$(', '\$(').replace('${', '\${') + }] + }], + "hints": self.hints, + "arguments": ["--no-container", "--move-outputs", "--preserve-entire-environment", "workflow.cwl#main", "cwl.input.yml"], + "id": "#" + }) + return ArvadosCommandTool(self.arvrunner, wf_runner, self.loadingContext).job(joborder_resolved, output_callback, runtimeContext)