From adc0f36eeab40f4b8e0603247392b3c804d7272a Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 15 Apr 2022 11:51:08 -0400 Subject: [PATCH] 18994: Remove debug prints Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/arvados_cwl/pathmapper.py | 10 ---------- sdk/cwl/arvados_cwl/runner.py | 4 ---- 2 files changed, 14 deletions(-) diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py index 0cbf9eb56b..a5dd5ccf39 100644 --- a/sdk/cwl/arvados_cwl/pathmapper.py +++ b/sdk/cwl/arvados_cwl/pathmapper.py @@ -74,7 +74,6 @@ class ArvPathMapper(PathMapper): if isinstance(src, basestring) and src.startswith("keep:"): if collection_pdh_pattern.match(src): - #self._pathmap[src] = MapperEnt(src, self.collection_pattern % src[5:], srcobj["class"], True) self._pathmap[src] = MapperEnt(src, self.collection_pattern % urllib.parse.unquote(src[5:]), srcobj["class"], True) if arvados_cwl.util.collectionUUID in srcobj: @@ -94,12 +93,9 @@ class ArvPathMapper(PathMapper): raiseOSError=True) with SourceLine(srcobj, "location", WorkflowException, debug): if isinstance(st, arvados.commands.run.UploadFile): - print("VV", (src, ab, st)) uploadfiles.add((src, ab, st)) elif isinstance(st, arvados.commands.run.ArvFile): self._pathmap[src] = MapperEnt(st.fn, self.collection_pattern % urllib.parse.unquote(st.fn[5:]), "File", True) - - #self._pathmap[src] = MapperEnt(st.fn, self.collection_pattern % st.fn[5:], "File", True) else: raise WorkflowException("Input file path '%s' is invalid" % st) elif src.startswith("_:"): @@ -125,7 +121,6 @@ class ArvPathMapper(PathMapper): self.visit(l, uploadfiles) def addentry(self, obj, c, path, remap): - print(obj["location"], self._pathmap) if obj["location"] in self._pathmap: src, srcpath = self.arvrunner.fs_access.get_collection(self._pathmap[obj["location"]].resolved) if srcpath == "": @@ -170,9 +165,7 @@ class ArvPathMapper(PathMapper): prefix = loc+"/" suffix = "" - print("LLL", prefix+suffix, prefix+urllib.parse.quote(srcobj["basename"], "/+@")) if prefix+suffix != prefix+urllib.parse.quote(srcobj["basename"], "/+@"): - print("LLL -> needs new collection") return True if srcobj["class"] == "File" and loc not in self._pathmap: @@ -211,12 +204,9 @@ class ArvPathMapper(PathMapper): packed=False) for src, ab, st in uploadfiles: - print("BBBBB", src, ab, st.fn, urllib.parse.quote(st.fn, "/:+@")) self._pathmap[src] = MapperEnt(urllib.parse.quote(st.fn, "/:+@"), urllib.parse.quote(self.collection_pattern % st.fn[5:], "/:+@"), "Directory" if os.path.isdir(ab) else "File", True) - print("CCCCC", self._pathmap) - for srcobj in referenced_files: remap = [] if srcobj["class"] == "Directory" and srcobj["location"] not in self._pathmap: diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py index eae7a77896..ddd1d2bacf 100644 --- a/sdk/cwl/arvados_cwl/runner.py +++ b/sdk/cwl/arvados_cwl/runner.py @@ -403,8 +403,6 @@ def upload_dependencies(arvrunner, name, document_loader, else: del discovered[d] - print("NN", sc) - mapper = ArvPathMapper(arvrunner, sc, "", "keep:%s", "keep:%s/%s", @@ -412,8 +410,6 @@ def upload_dependencies(arvrunner, name, document_loader, single_collection=True, optional_deps=optional_deps) - print("whargh", mapper._pathmap) - def setloc(p): loc = p.get("location") if loc and (not loc.startswith("_:")) and (not loc.startswith("keep:")): -- 2.30.2