Skip to content

Added nested scatter conformance tests #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 23, 2022
Merged

Added nested scatter conformance tests #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f009d11
Added nested scatter conformance tests
GlassOfWhiskey Mar 21, 2022
ad4a413
Merge branch '1.2.1_proposed' into nested-scatter-tests
mr-c Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conformance_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3384,6 +3384,7 @@
- $import: tests/mixed-versions/test-index.yaml
- $import: tests/loadContents/test-index.yaml
- $import: tests/iwd/test-index.yaml
- $import: tests/scatter/test-index.yaml

- job: tests/empty.json
tool: tests/params_broken_null.cwl
Expand Down
86 changes: 86 additions & 0 deletions tests/scatter/dotproduct-dotproduct-scatter.cwl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
#!/usr/bin/env cwl-runner
cwlVersion: v1.2
class: Workflow

requirements:
InlineJavascriptRequirement: {}
ScatterFeatureRequirement: {}
SubworkflowFeatureRequirement: {}

inputs:
letters: string[]
letters2: string[]
numbers: int[]
numbers2: int[]
start_line: string
end_line: string

outputs:
result:
type:
type: array
items:
type: array
items: string
outputSource: scatterletters/alphanum

steps:
scatterletters:
run:
class: Workflow
inputs:
letter: string
letter2: string
numbers: int[]
numbers2: int[]
start_line: string
end_line: string
outputs:
alphanum:
type: string[]
outputSource: scatternumbers/alphanum
steps:
scatternumbers:
run:
class: ExpressionTool
inputs:
letter: string
letter2: string
number: int
number2: int
start_line: string
end_line: string
outputs:
alphanum:
type: string
expression: >
${
return {
'alphanum': (inputs.start_line +
inputs.number +
inputs.number2 +
inputs.letter +
inputs.letter2 +
inputs.end_line)
};
}
in:
letter: letter
letter2: letter2
number: numbers
number2: numbers2
start_line: start_line
end_line: end_line
scatter: [number, number2]
scatterMethod: dotproduct
out: [alphanum]
in:
letter: letters
letter2: letters2
numbers: numbers
numbers2: numbers2
start_line: start_line
end_line: end_line
scatter: [letter, letter2]
scatterMethod: dotproduct
out: [alphanum]
79 changes: 79 additions & 0 deletions tests/scatter/dotproduct-simple-scatter.cwl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#!/usr/bin/env cwl-runner
cwlVersion: v1.2
class: Workflow

requirements:
InlineJavascriptRequirement: {}
ScatterFeatureRequirement: {}
SubworkflowFeatureRequirement: {}

inputs:
letters: string[]
letters2: string[]
numbers: int[]
start_line: string
end_line: string

outputs:
result:
type:
type: array
items:
type: array
items: string
outputSource: scatterletters/alphanum

steps:
scatterletters:
run:
class: Workflow
inputs:
letter: string
letter2: string
numbers: int[]
start_line: string
end_line: string
outputs:
alphanum:
type: string[]
outputSource: scatternumbers/alphanum
steps:
scatternumbers:
run:
class: ExpressionTool
inputs:
letter: string
letter2: string
number: int
start_line: string
end_line: string
outputs:
alphanum:
type: string
expression: >
${
return {
'alphanum': (inputs.start_line +
inputs.number +
inputs.letter +
inputs.letter2 +
inputs.end_line)
};
}
in:
letter: letter
letter2: letter2
number: numbers
start_line: start_line
end_line: end_line
scatter: number
out: [alphanum]
in:
letter: letters
letter2: letters2
numbers: numbers
start_line: start_line
end_line: end_line
scatter: [letter, letter2]
scatterMethod: dotproduct
out: [alphanum]
86 changes: 86 additions & 0 deletions tests/scatter/flat-crossproduct-flat-crossproduct-scatter.cwl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
#!/usr/bin/env cwl-runner
cwlVersion: v1.2
class: Workflow

requirements:
InlineJavascriptRequirement: {}
ScatterFeatureRequirement: {}
SubworkflowFeatureRequirement: {}

inputs:
letters: string[]
letters2: string[]
numbers: int[]
numbers2: int[]
start_line: string
end_line: string

outputs:
result:
type:
type: array
items:
type: array
items: string
outputSource: scatterletters/alphanum

steps:
scatterletters:
run:
class: Workflow
inputs:
letter: string
letter2: string
numbers: int[]
numbers2: int[]
start_line: string
end_line: string
outputs:
alphanum:
type: string[]
outputSource: scatternumbers/alphanum
steps:
scatternumbers:
run:
class: ExpressionTool
inputs:
letter: string
letter2: string
number: int
number2: int
start_line: string
end_line: string
outputs:
alphanum:
type: string
expression: >
${
return {
'alphanum': (inputs.start_line +
inputs.number +
inputs.number2 +
inputs.letter +
inputs.letter2 +
inputs.end_line)
};
}
in:
letter: letter
letter2: letter2
number: numbers
number2: numbers2
start_line: start_line
end_line: end_line
scatter: [number, number2]
scatterMethod: flat_crossproduct
out: [alphanum]
in:
letter: letters
letter2: letters2
numbers: numbers
numbers2: numbers2
start_line: start_line
end_line: end_line
scatter: [letter, letter2]
scatterMethod: flat_crossproduct
out: [alphanum]
79 changes: 79 additions & 0 deletions tests/scatter/flat-crossproduct-simple-scatter.cwl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#!/usr/bin/env cwl-runner
cwlVersion: v1.2
class: Workflow

requirements:
InlineJavascriptRequirement: {}
ScatterFeatureRequirement: {}
SubworkflowFeatureRequirement: {}

inputs:
letters: string[]
letters2: string[]
numbers: int[]
start_line: string
end_line: string

outputs:
result:
type:
type: array
items:
type: array
items: string
outputSource: scatterletters/alphanum

steps:
scatterletters:
run:
class: Workflow
inputs:
letter: string
letter2: string
numbers: int[]
start_line: string
end_line: string
outputs:
alphanum:
type: string[]
outputSource: scatternumbers/alphanum
steps:
scatternumbers:
run:
class: ExpressionTool
inputs:
letter: string
letter2: string
number: int
start_line: string
end_line: string
outputs:
alphanum:
type: string
expression: >
${
return {
'alphanum': (inputs.start_line +
inputs.number +
inputs.letter +
inputs.letter2 +
inputs.end_line)
};
}
in:
letter: letter
letter2: letter2
number: numbers
start_line: start_line
end_line: end_line
scatter: number
out: [alphanum]
in:
letter: letters
letter2: letters2
numbers: numbers
start_line: start_line
end_line: end_line
scatter: [letter, letter2]
scatterMethod: flat_crossproduct
out: [alphanum]
Loading