Use max_dp3_threads as coresMin for steps that take this input

bfb36176 · Frits Sweijen · 4f5eedfc · bfb36176 · bfb36176 · bfb36176
Commit bfb36176 authored 1 year ago by Frits Sweijen
--- a/steps/applybeam.cwl
+++ b/steps/applybeam.cwl
@@ -102,7 +102,7 @@ requirements:
        writable: true
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 4
+    coresMin: $(inputs.max_dp3_threads)
 hints:
  - class: DockerRequirement
    dockerPull: 'astronrd/linc'
--- a/steps/applycal.cwl
+++ b/steps/applycal.cwl
@@ -112,7 +112,7 @@ requirements:
        writable: true
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 4
+    coresMin: $(inputs.max_dp3_threads)
 hints:
  - class: DockerRequirement
    dockerPull: 'astronrd/linc'
--- a/steps/ddecal.cwl
+++ b/steps/ddecal.cwl
@@ -286,7 +286,7 @@ hints:
 requirements:
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 2
+    coresMin: $(inputs.max_dp3_threads)

 stdout: ddecal.log
 stderr: ddecal_err.log

--- a/steps/dp3_addcol.cwl
+++ b/steps/dp3_addcol.cwl
@@ -56,7 +56,7 @@ requirements:
      - entry: $(inputs.msin)
        writable: true
  - class: ResourceRequirement
-    coresMin: 2
+    coresMin: $(inputs.max_dp3_threads)
 hints:
  - class: DockerRequirement
    dockerPull: astronrd/linc

--- a/steps/dp3_prep_cal.cwl
+++ b/steps/dp3_prep_cal.cwl
@@ -122,4 +122,4 @@ stderr: DP3_err.log
 requirements:
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 8
+    coresMin: $(inputs.max_dp3_threads)
--- a/steps/dp3_prep_target.cwl
+++ b/steps/dp3_prep_target.cwl
@@ -178,4 +178,4 @@ stderr: DP3_err.log
 requirements:
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 4
+    coresMin: $(inputs.max_dp3_threads)
--- a/steps/filter_predict.cwl
+++ b/steps/filter_predict.cwl
@@ -129,7 +129,7 @@ requirements:
    inplaceUpdate: true
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 1
+    coresMin: $(inputs.max_dp3_threads)
 hints:
  - class: DockerRequirement
    dockerPull: astronrd/linc

--- a/steps/gaincal.cwl
+++ b/steps/gaincal.cwl
@@ -187,6 +187,6 @@ requirements:
    inplaceUpdate: true
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 2
+    coresMin: $(inputs.max_dp3_threads)
 $schema:
  - 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
--- a/steps/predict.cwl
+++ b/steps/predict.cwl
@@ -117,7 +117,7 @@ requirements:
        writable: true
  - class: InlineJavascriptRequirement
  - class: ResourceRequirement
-    coresMin: 2
+    coresMin: $(inputs.max_dp3_threads)
 hints:
  - class: DockerRequirement
    dockerPull: astronrd/linc