Skip to content

Commit 365496b

Browse files
author
Peter Amstutz
committed
Merge commit '1caef73514cd2c2e8faf61a7f146ef33bf2b6151' into resource-requirement
2 parents 3b54132 + 1caef73 commit 365496b

40 files changed

+98
-39
lines changed

cwltool/schemas/draft-3/cwl-avro.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,3 +2044,62 @@
20442044
the expression engine. The semantics of this field are defined by the
20452045
underlying expression engine. Intended for uses such as providing
20462046
function definitions that will be called from CWL expressions.
2047+
2048+
2049+
- type: record
2050+
name: ResourceRequirement
2051+
extends: "#ProcessRequirement"
2052+
doc: |
2053+
Specify basic hardware resource requirements.
2054+
2055+
"min" is the minimum amount of a resource that must be reserved to schedule
2056+
a job. If "min" cannot be satisfied, the job should not be run.
2057+
2058+
"max" is the maximum amount of a resource that the job shall be permitted
2059+
to use. If a node has sufficient resources, multiple jobs may be scheduled
2060+
on a single node provided each job's "max" resource requirements are
2061+
met. If a job attempts to exceed its "max" resource allocation, an
2062+
implementation may deny additional resources, which may result in job
2063+
failure.
2064+
2065+
If "min" is specified but "max" is not, then "max" == "min"
2066+
If "max" is specified by "min" is not, then "min" == "max".
2067+
2068+
It is an error if max < min.
2069+
2070+
It is an error if the value of any of these fields is negative.
2071+
2072+
If neither "min" nor "max" is specified for a resource, an implementation may provide a default.
2073+
2074+
fields:
2075+
- name: coresMin
2076+
type: ["null", long, string, "#Expression"]
2077+
doc: Minimum reserved number of CPU cores
2078+
2079+
- name: coresMax
2080+
type: ["null", int, string, "#Expression"]
2081+
doc: Maximum reserved number of CPU cores
2082+
2083+
- name: ramMin
2084+
type: ["null", long, string, "#Expression"]
2085+
doc: Minimum reserved RAM in mebibytes (2**20)
2086+
2087+
- name: ramMax
2088+
type: ["null", long, string, "#Expression"]
2089+
doc: Maximum reserved RAM in mebibytes (2**20)
2090+
2091+
- name: tmpdirMin
2092+
type: ["null", long, string, "#Expression"]
2093+
doc: Minimum reserved filesystem based storage for the designated temporary directory, in mebibytes (2**20)
2094+
2095+
- name: tmpdirMax
2096+
type: ["null", long, string, "#Expression"]
2097+
doc: Maximum reserved filesystem based storage for the designated temporary directory, in mebibytes (2**20)
2098+
2099+
- name: outdirMin
2100+
type: ["null", long, string, "#Expression"]
2101+
doc: Minimum reserved filesystem based storage for the designated output directory, in mebibytes (2**20)
2102+
2103+
- name: outdirMax
2104+
type: ["null", long, string, "#Expression"]
2105+
doc: Maximum reserved filesystem based storage for the designated output directory, in mebibytes (2**20)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/add-lines-wf.cwl
1+
../../draft-2/draft-2/add-lines-wf.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/binding-test.cwl
1+
../../draft-2/draft-2/binding-test.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/bwa-mem-job.json
1+
../../draft-2/draft-2/bwa-mem-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat-job.json
1+
../../draft-2/draft-2/cat-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat-n-job.json
1+
../../draft-2/draft-2/cat-n-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat1-tool.cwl
1+
../../draft-2/draft-2/cat1-tool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat2-tool.cwl
1+
../../draft-2/draft-2/cat2-tool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat3-tool.cwl
1+
../../draft-2/draft-2/cat3-tool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat4-tool.cwl
1+
../../draft-2/draft-2/cat4-tool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat5-tool.cwl
1+
../../draft-2/draft-2/cat5-tool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/count-lines3-job.json
1+
../../draft-2/draft-2/count-lines3-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/count-lines4-job.json
1+
../../draft-2/draft-2/count-lines4-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/count-lines6-job.json
1+
../../draft-2/draft-2/count-lines6-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/echo-tool.cwl
1+
../../draft-2/draft-2/echo-tool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/empty.json
1+
../../draft-2/draft-2/empty.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/env-job.json
1+
../../draft-2/draft-2/env-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/env-tool1.cwl
1+
../../draft-2/draft-2/env-tool1.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/env-tool2.cwl
1+
../../draft-2/draft-2/env-tool2.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/hello.txt
1+
../../draft-2/draft-2/hello.txt
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/index.py
1+
../../draft-2/draft-2/index.py
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/node-engine.cwl
1+
../../draft-2/draft-2/node-engine.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/number.txt
1+
../../draft-2/draft-2/number.txt
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/parseInt-job.json
1+
../../draft-2/draft-2/parseInt-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/rename-job.json
1+
../../draft-2/draft-2/rename-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/rename.cwl
1+
../../draft-2/draft-2/rename.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/revsort-job.json
1+
../../draft-2/draft-2/revsort-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/revtool.cwl
1+
../../draft-2/draft-2/revtool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-job1.json
1+
../../draft-2/draft-2/scatter-job1.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-job2.json
1+
../../draft-2/draft-2/scatter-job2.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-wf1.cwl
1+
../../draft-2/draft-2/scatter-wf1.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-wf2.cwl
1+
../../draft-2/draft-2/scatter-wf2.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/search-job.json
1+
../../draft-2/draft-2/search-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/search.py
1+
../../draft-2/draft-2/search.py
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/sorttool.cwl
1+
../../draft-2/draft-2/sorttool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/tmap-job.json
1+
../../draft-2/draft-2/tmap-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/underscore.js
1+
../../draft-2/draft-2/underscore.js
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/wc-job.json
1+
../../draft-2/draft-2/wc-job.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/wc-tool.cwl
1+
../../draft-2/draft-2/wc-tool.cwl
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/whale.txt
1+
../../draft-2/draft-2/whale.txt

0 commit comments

Comments
 (0)