Add ResourceRequirement for demanding steps (RAP-126)

steps/Ateamclipper.cwl

@@ -40,4 +40,6 @@ hints:
   - class: DockerRequirement
     dockerPull: astronrd/linc
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 8
 stdout: Ateamclipper.log

steps/applybeam.cwl

@@ -95,6 +95,8 @@ requirements:
       - entry: $(inputs.msin)
         writable: true
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 4
 hints:
   - class: DockerRequirement
     dockerPull: 'astronrd/linc'

steps/applycal.cwl

@@ -85,6 +85,8 @@ requirements:
       - entry: $(inputs.msin)
         writable: true
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 4
 hints:
   - class: DockerRequirement
     dockerPull: 'astronrd/linc'

steps/applytarget.cwl

@@ -112,6 +112,8 @@ arguments:
   - 'steps=[applycal,count]'
 requirements:
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 2
 hints:
   - class: DockerRequirement
     dockerPull: 'astronrd/linc'

steps/average.cwl

@@ -88,6 +88,8 @@ arguments:
   - avg.type=average
 requirements:
   - class: ShellCommandRequirement
+  - class: ResourceRequirement
+    coresMin: 8
 hints:
   - class: DockerRequirement
     dockerPull: 'astronrd/linc'

steps/check_unflagged_fraction.cwl

@@ -96,5 +96,7 @@ outputs:
 hints:
   - class: DockerRequirement
     dockerPull: astronrd/linc
+  - class: ResourceRequirement
+    coresMin: 8
 stdout: check_unflagged_fraction.log
 stderr: check_unflagged_fraction_err.log

steps/ddecal.cwl

@@ -192,6 +192,8 @@ requirements:
   - class: InplaceUpdateRequirement
     inplaceUpdate: true
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 2
 
 stdout: ddecal.log
 stderr: ddecal_err.log

steps/dppp_prep_cal.cwl

@@ -115,3 +115,5 @@ stdout: DPPP.log
 stderr: DPPP_err.log
 requirements:
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 8
\ No newline at end of file

steps/dppp_prep_target.cwl

@@ -170,4 +170,6 @@ hints:
 stdout: DPPP.log
 stderr: DPPP_err.log
 requirements:
-  - class: InlineJavascriptRequirement
\ No newline at end of file
+  - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 4
\ No newline at end of file

steps/dpppconcat.cwl

@@ -151,6 +151,8 @@ arguments:
 requirements:
   - class: ShellCommandRequirement
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 8
 hints:
   - class: DockerRequirement
     dockerPull: 'astronrd/linc'

steps/filter_predict.cwl

@@ -122,6 +122,8 @@ requirements:
   - class: InplaceUpdateRequirement
     inplaceUpdate: true
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 1
 hints:
   - class: DockerRequirement
     dockerPull: astronrd/linc

steps/gaincal.cwl

@@ -180,5 +180,7 @@ requirements:
   - class: InplaceUpdateRequirement
     inplaceUpdate: true
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 2
 $schema:
   - 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'

steps/predict.cwl

@@ -99,6 +99,8 @@ requirements:
       - entry: $(inputs.msin)
         writable: true
   - class: InlineJavascriptRequirement
+  - class: ResourceRequirement
+    coresMin: 2
 hints:
   - class: DockerRequirement
     dockerPull: astronrd/linc