From c84aa42472f0232bf986f4a288453bd572d65ad8 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 13 Sep 2016 11:17:44 +0000
Subject: [PATCH] Fix nrCoresPerTask to 21, since the user or MoM not specify
it correctly in all cases, and we want to use full nodes for now anyway.
---
MAC/Services/src/PipelineControl.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/MAC/Services/src/PipelineControl.py b/MAC/Services/src/PipelineControl.py
index ce5f9e06857..12c19e86f50 100755
--- a/MAC/Services/src/PipelineControl.py
+++ b/MAC/Services/src/PipelineControl.py
@@ -143,10 +143,10 @@ class Parset(dict):
return result
def processingNumberOfCoresPerTask(self):
- result = int(self[PARSET_PREFIX + "Observation.Cluster.ProcessingCluster.numberOfCoresPerTask"]) or "20"
- if result < 1 or result > 20:
- logger.warn('Invalid Observation.Cluster.ProcessingCluster.numberOfCoresPerTask: %s, defaulting to %s', result, max(1, min(20, result)))
- return max(1, min(20, result))
+ result = int(self[PARSET_PREFIX + "Observation.Cluster.ProcessingCluster.numberOfCoresPerTask"]) or "21"
+ if result != 21:
+ logger.warn('Invalid Observation.Cluster.ProcessingCluster.numberOfCoresPerTask: %s, defaulting to %s', result, 21)
+ return 21
def processingNumberOfTasks(self):
""" Parse the number of nodes to allocate from "Observation.Cluster.ProcessingCluster.numberOfTasks",
--
GitLab