Skip to content

Commit 819c81a

Browse files
authored
use 1024MiB as the default memory size in v1.0, else use 256MiB (#1061)
1 parent 691dea2 commit 819c81a

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

cwltool/process.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ def eval_resource(builder, resource_req): # type: (Builder, Text) -> Any
439439
return builder.do_eval(resource_req)
440440
return resource_req
441441

442+
442443
# Threshold where the "too many files" warning kicks in
443444
FILE_COUNT_WARNING = 5000
444445

@@ -619,6 +620,7 @@ def _init_job(self, joborder, runtime_context):
619620
continue
620621
v = job[k]
621622
dircount = [0]
623+
622624
def inc(d): # type: (List[int]) -> None
623625
d[0] += 1
624626
visit_class(v, ("Directory",), lambda x: inc(dircount))
@@ -766,11 +768,17 @@ def evalResources(self, builder, runtimeContext):
766768
resourceReq, _ = self.get_requirement("ResourceRequirement")
767769
if resourceReq is None:
768770
resourceReq = {}
771+
cwl_version = self.metadata.get(
772+
"http://commonwl.org/cwltool#original_cwlVersion", None)
773+
if cwl_version == "v1.0":
774+
ram = 1024
775+
else:
776+
ram = 256
769777
request = {
770778
"coresMin": 1,
771779
"coresMax": 1,
772-
"ramMin": 256,
773-
"ramMax": 256,
780+
"ramMin": ram,
781+
"ramMax": ram,
774782
"tmpdirMin": 1024,
775783
"tmpdirMax": 1024,
776784
"outdirMin": 1024,

0 commit comments

Comments
 (0)