Changeset 26339

Timestamp:

06/30/21 21:22:20 (4 years ago)

Author:

schlegel

Message:

BUG: qmu should check nprocs function not np, since not all clusters have np

Location:

issm/trunk-jpl/src/m/classes

Files:

• qmu.m (modified) (2 diffs)
• qmu.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/qmu.m

@@ -88 +88 @@
                                         md = checkmessage(md,['evaluation_scheduling in qmu.params should be set to ''master''']);
                                 end
-                                if md.cluster.np<=1,
+                                if md.cluster.nprocs()<=1,
                                         md = checkmessage(md,['in parallel library mode, Dakota needs to run on at least 2 cpus, 1 cpu for the master, 1 cpu for the slave. Modify md.cluster.np accordingly.']);
                                 end
@@ -95 +95 @@
                                         md = checkmessage(md,['in parallel library mode, Dakota needs to run at least one slave on one cpu (md.qmu.params.processors_per_evaluation >=1)!']);
                                 end
-                                if mod(md.cluster.np-1,self.params.processors_per_evaluation),
+                                if mod(md.cluster.nprocs()-1,self.params.processors_per_evaluation),
                                         %md = checkmessage(md,['in parallel library mode, the requirement is for md.cluster.np = md.qmu.params.processors_per_evaluation * number_of_slaves, where number_of_slaves will automatically be determined by Dakota. Modify md.cluster.np accordingly']);
                                 end

issm/trunk-jpl/src/m/classes/qmu.py

@@ -149 +149 @@
                 md.checkmessage('evaluation_scheduling in qmu.params should be set to "master"')
 
-            if md.cluster.np <= 1:
+            if md.cluster.nprocs() <= 1:
                 md.checkmessage('in parallel library mode, Dakota needs to run on at least 2 cpus, 1 cpu for the master, 1 cpu for the slave. Modify md.cluster.np accordingly.')
 
@@ -155 +155 @@
                 md.checkmessage('in parallel library mode, Dakota needs to run at least one slave on one cpu (md.qmu.params.processors_per_evaluation >= 1)!')
 
-            if np.mod(md.cluster.np - 1, self.params.processors_per_evaluation):
+            if np.mod(md.cluster.nprocs() - 1, self.params.processors_per_evaluation):
                 #md.checkmessage('in parallel library mode, the requirement is for md.cluster.np = md.qmu.params.processors_per_evaluation * number_of_slaves, where number_of_slaves will automatically be determined by Dakota. Modify md.cluster.np accordingly')
                 pass