fixed classic MPI

Author: pancetta

pySDC/implementations/controller_classes/allinclusive_classic_MPI.py

@@ -43,6 +43,8 @@ def __init__(self, controller_params, description, comm):
 
         num_levels = len(self.S.levels)
 
+        assert not (num_procs > 1 and num_levels == 1), "ERROR: classic cannot do MSSDC"
+
         if num_procs > 1 and num_levels > 1:
             for L in self.S.levels:
                 if not L.sweep.coll.right_is_node or L.sweep.params.do_coll_update:
@@ -136,7 +138,7 @@ def restart_block(self, size, time, u0):
         self.S.init_step(u0)
         # reset some values
         self.S.status.done = False
-        self.S.status.iter = 1
+        self.S.status.iter = 0
         self.S.status.stage = 'SPREAD'
         for l in self.S.levels:
             l.tag = None
@@ -257,7 +259,7 @@ def pfasst(self, comm, num_procs):
 
             # update stage
             self.hooks.pre_iteration(step=self.S, level_number=0)
-            self.S.status.stage = 'IT_FINE'
+            self.S.status.stage = 'IT_CHECK'
 
         elif stage == 'IT_FINE':
 
@@ -283,21 +285,27 @@ def pfasst(self, comm, num_procs):
                 self.req_send.append(comm.isend(self.S.levels[0].uend, dest=self.S.next, tag=0))
 
             # update stage
-            self.S.status.stage = 'IT_CHECK'
+            # multi-level or single-level?
+            if len(self.S.levels) > 1:  # MLSDC or PFASST
+                self.S.status.stage = 'IT_UP'
+            else:  # SDC
+                self.S.status.stage = 'IT_CHECK'
 
         elif stage == 'IT_CHECK':
 
             # check whether to stop iterating (parallel)
 
-            self.hooks.post_iteration(step=self.S, level_number=0)
-
             # check if an open request of the status send is pending
             if self.req_status is not None:
                 self.req_status.wait()
 
             # check for convergence or abort
+            self.S.levels[0].sweep.compute_residual()
             self.S.status.done = self.check_convergence(self.S)
 
+            if self.S.status.iter > 0:
+                self.hooks.post_iteration(step=self.S, level_number=0)
+
             # send status forward
             if not self.S.status.last:
                 self.logger.debug('isend status: status %s, process %s, time %s, target %s, tag %s, iter %s' %
@@ -318,15 +326,7 @@ def pfasst(self, comm, num_procs):
                 # increment iteration count here (and only here)
                 self.S.status.iter += 1
                 self.hooks.pre_iteration(step=self.S, level_number=0)
-                # multi-level or single-level?
-                if len(self.S.levels) > 1:  # MLSDC or PFASST
-                    self.S.status.stage = 'IT_UP'
-                elif num_procs > 1:  # MSSDC
-                    self.S.status.stage = 'IT_COARSE_RECV'
-                elif num_procs == 1:  # SDC
-                    self.S.status.stage = 'IT_FINE'
-                else:
-                    raise ControllerError("Weird stage in IT_CHECK")
+                self.S.status.stage = 'IT_FINE'
 
             else:
                 self.S.levels[0].sweep.compute_end_point()
@@ -397,10 +397,7 @@ def pfasst(self, comm, num_procs):
                 self.send(source=self.S.levels[-1], target=self.S.next, tag=len(self.S.levels) - 1, comm=comm)
 
             # update stage
-            if len(self.S.levels) > 1:  # MLSDC or PFASST
-                self.S.status.stage = 'IT_DOWN'
-            else:  # MSSDC
-                self.S.status.stage = 'IT_CHECK'
+            self.S.status.stage = 'IT_DOWN'
 
         elif stage == 'IT_DOWN':
 
@@ -427,7 +424,7 @@ def pfasst(self, comm, num_procs):
                     self.hooks.post_sweep(step=self.S, level_number=l - 1)
 
             # update stage
-            self.S.status.stage = 'IT_FINE'
+            self.S.status.stage = 'IT_CHECK'
 
         else:
 

pySDC/implementations/controller_classes/allinclusive_classic_nonMPI.py

@@ -218,17 +218,9 @@ def pfasst(self, S, num_procs):
             # update stage
             if len(S.levels) > 1 and self.params.predict:  # MLSDC or PFASST with predict
                 S.status.stage = 'PREDICT_RESTRICT'
-            elif len(S.levels) > 1:  # MLSDC or PFASST without predict
+            else:  # SDC
                 self.hooks.pre_iteration(step=S, level_number=0)
-                S.status.stage = 'IT_FINE_SWEEP'
-            elif num_procs > 1:  # MSSDC
-                self.hooks.pre_iteration(step=S, level_number=0)
-                S.status.stage = 'IT_COARSE_SWEEP'
-            elif num_procs == 1:  # SDC
-                self.hooks.pre_iteration(step=S, level_number=0)
-                S.status.stage = 'IT_FINE_SWEEP'
-            else:
-                raise ControllerError("Don't know what to do after spread, aborting")
+                S.status.stage = 'IT_CHECK'
 
             return S
 

tutorial/step_7/B_multistep_SDC.py

@@ -127,7 +127,7 @@ def main():
     show_residual_across_simulation(stats_mssdc, 'step_7_residuals_mssdc.png')
 
     assert os.path.isfile('step_7_residuals_mssdc.png')
-    assert diff < 5.15E-11, "ERROR: difference between PFASST and MSSDC controller is too large, got %s" % diff
+    assert diff < 1E-10, "ERROR: difference between PFASST and MSSDC controller is too large, got %s" % diff
 
 
 if __name__ == "__main__":