Merge branch 'empty-scatter' of https://github.com/StarvingMarvin/common-workflow-language into StarvingMarvin-empty-scatter

Peter Amstutz · Peter Amstutz · commit f6a71a0cf690 · 2017-07-23T04:32:07.000-04:00
diff --git a/v1.0/Workflow.yml b/v1.0/Workflow.yml
@@ -349,6 +349,9 @@ $graph:
     All output parameter types are also implicitly wrapped in arrays.  Each job
     in the scatter results in an entry in the output array.
 
+    If a scattered input is an empty list, step can be skipped, and all of it's
+    outputs set to an empty list(s), according to applicable scattering rules.
+
     If `scatter` declares more than one input parameter, `scatterMethod`
     describes how to decompose the input into a discrete set of jobs.
 
diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
@@ -256,6 +256,36 @@
   tool: "v1.0/scatter-wf4.cwl#main"
   doc: Test workflow scatter with two scatter parameters and dotproduct join method
 
+- job: v1.0/scatter-empty-job1.json
+  output:
+    out: []
+  tool: v1.0/scatter-wf1.cwl
+  doc: Test workflow scatter with single empty list parameter
+
+- job: v1.0/scatter-empty-job2.json
+  output:
+    out: [[], []]
+  tool: v1.0/scatter-wf2.cwl
+  doc: Test workflow scatter with two scatter parameters and nested_crossproduct join method with second list empty
+
+- job: v1.0/scatter-empty-job3.json
+  output:
+    out: []
+  tool: "v1.0/scatter-wf3.cwl#main"
+  doc: Test workflow scatter with two scatter parameters and nested_crossproduct join method with first list empty
+
+- job: v1.0/scatter-empty-job2.json
+  output:
+    out: []
+  tool: "v1.0/scatter-wf3.cwl#main"
+  doc: Test workflow scatter with two scatter parameters, one of which is empty and flat_crossproduct join method
+
+- job: v1.0/scatter-empty-job4.json
+  output:
+    out: []
+  tool: "v1.0/scatter-wf4.cwl#main"
+  doc: Test workflow scatter with two empty scatter parameters and dotproduct join method
+
 - tool: v1.0/echo-tool.cwl
   job: v1.0/env-job.json
   output:
diff --git a/v1.0/v1.0/scatter-empty-job1.json b/v1.0/v1.0/scatter-empty-job1.json
@@ -0,0 +1,3 @@
+{
+  "inp": []
+}
diff --git a/v1.0/v1.0/scatter-empty-job2.json b/v1.0/v1.0/scatter-empty-job2.json
@@ -0,0 +1,4 @@
+{
+  "inp1": ["one", "two"],
+  "inp2": []
+}
diff --git a/v1.0/v1.0/scatter-empty-job3.json b/v1.0/v1.0/scatter-empty-job3.json
@@ -0,0 +1,4 @@
+{
+  "inp1": [],
+  "inp2": ["one", "two"]
+}
diff --git a/v1.0/v1.0/scatter-empty-job4.json b/v1.0/v1.0/scatter-empty-job4.json
@@ -0,0 +1,4 @@
+{
+  "inp1": [],
+  "inp2": []
+}
diff --git a/v1.1.0-dev1/Workflow.yml b/v1.1.0-dev1/Workflow.yml
@@ -355,6 +355,9 @@ $graph:
     All output parameter types are also implicitly wrapped in arrays.  Each job
     in the scatter results in an entry in the output array.
 
+    If a scattered input is an empty list, step can be skipped, and all of it's
+    outputs set to an empty list(s), according to applicable scattering rules.
+
     If `scatter` declares more than one input parameter, `scatterMethod`
     describes how to decompose the input into a discrete set of jobs.
 
diff --git a/v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml b/v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml
@@ -267,6 +267,36 @@
   tool: "v1.1.0-dev1/scatter-wf4.cwl#main"
   doc: Test workflow scatter with two scatter parameters and dotproduct join method
 
+- job: v1.1.0-dev1/scatter-empty-job1.json
+  output:
+    out: []
+  tool: v1.1.0-dev1/scatter-wf1.cwl
+  doc: Test workflow scatter with single empty list parameter
+
+- job: v1.1.0-dev1/scatter-empty-job2.json
+  output:
+    out: [[], []]
+  tool: v1.1.0-dev1/scatter-wf2.cwl
+  doc: Test workflow scatter with two scatter parameters and nested_crossproduct join method with second list empty
+
+- job: v1.1.0-dev1/scatter-empty-job3.json
+  output:
+    out: []
+  tool: "v1.1.0-dev1/scatter-wf3.cwl#main"
+  doc: Test workflow scatter with two scatter parameters and nested_crossproduct join method with first list empty
+
+- job: v1.1.0-dev1/scatter-empty-job2.json
+  output:
+    out: []
+  tool: "v1.1.0-dev1/scatter-wf3.cwl#main"
+  doc: Test workflow scatter with two scatter parameters, one of which is empty and flat_crossproduct join method
+
+- job: v1.1.0-dev1/scatter-empty-job4.json
+  output:
+    out: []
+  tool: "v1.1.0-dev1/scatter-wf4.cwl#main"
+  doc: Test workflow scatter with two empty scatter parameters and dotproduct join method
+
 - tool: v1.1.0-dev1/echo-tool.cwl
   job: v1.1.0-dev1/env-job.json
   output:
diff --git a/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job1.json b/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job1.json
@@ -0,0 +1,3 @@
+{
+  "inp": []
+}
diff --git a/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job2.json b/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job2.json
@@ -0,0 +1,4 @@
+{
+  "inp1": ["one", "two"],
+  "inp2": []
+}
diff --git a/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job3.json b/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job3.json
@@ -0,0 +1,4 @@
+{
+  "inp1": [],
+  "inp2": ["one", "two"]
+}
diff --git a/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job4.json b/v1.1.0-dev1/v1.1.0-dev1/scatter-empty-job4.json
@@ -0,0 +1,4 @@
+{
+  "inp1": [],
+  "inp2": []
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "inp1": ["one", "two"],
 +  "inp2": []
 +}