From 9f42cb85807ebad098aaf6e0ab3218f763b712e2 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 6 Feb 2023 14:50:11 -0500
Subject: [PATCH] 19385: Clean up debug prints

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---
 sdk/cwl/arvados_cwl/arvcontainer.py |  1 -
 sdk/cwl/arvados_cwl/arvworkflow.py  | 27 ---------------------------
 sdk/cwl/arvados_cwl/executor.py     |  7 -------
 sdk/cwl/arvados_cwl/runner.py       |  6 ------
 4 files changed, 41 deletions(-)

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index ceae0dc02e..742906c616 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -546,7 +546,6 @@ class RunnerContainer(Runner):
             main = self.loadingContext.loader.idx["_:main"]
             if main.get("id") == "_:main":
                 del main["id"]
-            #print(json.dumps(main, indent=2))
             workflowpath = "/var/lib/cwl/workflow.json#main"
             container_req["mounts"]["/var/lib/cwl/workflow.json"] = {
                 "kind": "json",
diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py
index 2bc8232224..c7082b04dc 100644
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@ -133,21 +133,16 @@ def rel_ref(s, baseuri, urlexpander, merged_map, jobmapper):
     if s.startswith("keep:"):
         return s
 
-    #print("BBB", s, baseuri)
     uri = urlexpander(s, baseuri)
-    #print("CCC", uri)
 
     if uri.startswith("keep:"):
         return uri
 
     fileuri = urllib.parse.urldefrag(baseuri)[0]
 
-    #print("BBB", s, baseuri, uri)
-
     for u in (baseuri, fileuri):
         if u in merged_map:
             replacements = merged_map[u].resolved
-            #print("RRR", u, uri, replacements)
             if uri in replacements:
                 return replacements[uri]
 
@@ -158,14 +153,10 @@ def rel_ref(s, baseuri, urlexpander, merged_map, jobmapper):
     p2 = os.path.dirname(uri_file_path(uri))
     p3 = os.path.basename(uri_file_path(uri))
 
-    #print("PPP", p1, p2, p3)
-
     r = os.path.relpath(p2, p1)
     if r == ".":
         r = ""
 
-    #print("RRR", r)
-
     return os.path.join(r, p3)
 
 def is_basetype(tp):
@@ -242,9 +233,7 @@ def fix_schemadef(req, baseuri, urlexpander, merged_map, jobmapper, pdh):
         path, frag = urllib.parse.urldefrag(r)
         rel = rel_ref(r, baseuri, urlexpander, merged_map, jobmapper)
         merged_map.setdefault(path, FileUpdates({}, {}))
-        #print("PPP", path, r, frag)
         rename = "keep:%s/%s" %(pdh, rel)
-        #rename = "#%s" % frag
         for mm in merged_map:
             merged_map[mm].resolved[r] = rename
     return req
@@ -306,8 +295,6 @@ def new_upload_workflow(arvRunner, tool, job_order, project_uuid,
 
     col = arvados.collection.Collection(api_client=arvRunner.api)
 
-    #print(merged_map)
-
     for w in workflow_files | import_files:
         # 1. load YAML
 
@@ -465,29 +452,15 @@ def new_upload_workflow(arvRunner, tool, job_order, project_uuid,
         for g in git_info:
             doc[g] = git_info[g]
 
-    #print("MMM", main["id"])
-    #print(yamlloader.dump(wrapper, stream=sys.stdout))
-
     for i, r in enumerate(wrapper["requirements"]):
         if r["class"] == "SchemaDefRequirement":
             wrapper["requirements"][i] = fix_schemadef(r, main["id"], tool.doc_loader.expand_url, merged_map, jobmapper, col.portable_data_hash())
 
-    # print()
-    # print("merrrrged maaap", merged_map)
-    # print()
-    #print("update_refs", main["id"], runfile)
-
-    #print(yamlloader.dump(wrapper, stream=sys.stdout))
-
     update_refs(wrapper, main["id"], tool.doc_loader.expand_url, merged_map, jobmapper, False, runtimeContext, main["id"]+"#", "#main/")
 
     # Remove any lingering file references.
     drop_ids(wrapper)
 
-    #print("HHH")
-
-    #print(yamlloader.dump(wrapper, stream=sys.stdout))
-
     return doc
 
 
diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 1134a0a025..c42d7bf325 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -734,15 +734,8 @@ The 'jobs' API is no longer supported.
 
             # Reload just the wrapper workflow.
             self.fast_submit = True
-            #print("bah bah", loadingContext.requirements)
-            #workflow_wrapper, _ = loadingContext.loader.resolve_all(cmap(workflow_wrapper), "_:main", checklinks=True)
-
-            #tool = load_tool(workflow_wrapper[0], loadingContext)
-            #print("AAA", json.dumps(loadingContext.loader.idx["_:main"], indent=2))
             tool = load_tool(workflow_wrapper, loadingContext)
-
             loadingContext.loader.idx["_:main"] = workflow_wrapper
-            #print("BBB", json.dumps(loadingContext.loader.idx["_:main"], indent=2))
 
         if not submitting:
             update_from_merged_map(tool, merged_map)
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 4d569df339..54af2be517 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -334,8 +334,6 @@ def upload_dependencies(arvrunner, name, document_loader,
     if optional_deps:
         sc_result.extend(optional_deps)
 
-    #print("BOING", uri, sc_result)
-
     sc = []
     uuids = {}
 
@@ -735,8 +733,6 @@ def upload_job_order(arvrunner, name, tool, job_order, runtimeContext):
 
     update_from_mapper(job_order, jobmapper)
 
-    #print(json.dumps(job_order, indent=2))
-
     return job_order, jobmapper
 
 FileUpdates = namedtuple("FileUpdates", ["resolved", "secondaryFiles"])
@@ -781,8 +777,6 @@ def upload_workflow_deps(arvrunner, tool, runtimeContext):
         for k,v in pm.items():
             toolmap[k] = v.resolved
 
-        #print("visited", deptool["id"], toolmap, discovered_secondaryfiles)
-
         merged_map[deptool["id"]] = FileUpdates(toolmap, discovered_secondaryfiles)
 
     return merged_map
-- 
2.30.2