Dealt with dangerous business of restarts a little bit

Author: Thomas Baumann

pySDC/core/Hooks.py

@@ -7,9 +7,13 @@ class hooks(object):
     """
     Hook class to contain the functions called during the controller runs (e.g. for calling user-routines)
 
+    When deriving a custom hook from this class make sure to always call the parent method using e.g.
+    `super().post_step(step, level_number)`. Otherwise bugs may arise when using `filer_recomputed` from the stats
+    helper for post processing.
+
     Attributes:
-        __num_restarts (int): number of restarts of the current step
         logger: logger instance for output
+        __num_restarts (int): number of restarts of the current step
         __stats (dict): dictionary for gathering the statistics of a run
         __entry (namedtuple): statistics entry containing all information to identify the value
     """
@@ -120,7 +124,7 @@ def pre_predict(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
-        pass
+        self.__num_restarts = step.status.get('restarts_in_a_row') if step is not None else 0
 
     def pre_step(self, step, level_number):
         """

pySDC/implementations/hooks/default_hook.py

@@ -21,13 +21,10 @@ class DefaultHooks(hooks):
         __t1_sweep (float): private variable to get end time of the sweep
         __t1_setup (float): private variable to get end time of setup
         __t1_comm (list): private variable to hold timing of the communication (!)
-        logger: logger instance for output
-        __stats (dict): dictionary for gathering the statistics of a run
-        __entry (namedtuple): statistics entry containing all information to identify the value
     """
 
     def __init__(self):
-        super(DefaultHooks, self).__init__()
+        super().__init__()
         self.__t0_setup = None
         self.__t0_run = None
         self.__t0_predict = None
@@ -51,6 +48,7 @@ def pre_setup(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().pre_setup(step, level_number)
         self.__t0_setup = time.perf_counter()
 
     def pre_run(self, step, level_number):
@@ -61,6 +59,7 @@ def pre_run(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().pre_run(step, level_number)
         self.__t0_run = time.perf_counter()
 
     def pre_predict(self, step, level_number):
@@ -71,6 +70,7 @@ def pre_predict(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().pre_predict(step, level_number)
         self.__t0_predict = time.perf_counter()
 
     def pre_step(self, step, level_number):
@@ -81,6 +81,7 @@ def pre_step(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().pre_step(step, level_number)
         self.__t0_step = time.perf_counter()
 
     def pre_iteration(self, step, level_number):
@@ -91,6 +92,7 @@ def pre_iteration(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().pre_iteration(step, level_number)
         self.__t0_iteration = time.perf_counter()
 
     def pre_sweep(self, step, level_number):
@@ -101,6 +103,7 @@ def pre_sweep(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().pre_sweep(step, level_number)
         self.__t0_sweep = time.perf_counter()
 
     def pre_comm(self, step, level_number):
@@ -111,6 +114,7 @@ def pre_comm(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().pre_comm(step, level_number)
         if len(self.__t0_comm) >= level_number + 1:
             self.__t0_comm[level_number] = time.perf_counter()
         else:
@@ -131,6 +135,7 @@ def post_comm(self, step, level_number, add_to_stats=False):
             level_number (int): the current level number
             add_to_stats (bool): set if result should go to stats object
         """
+        super().post_comm(step, level_number)
         assert len(self.__t1_comm) >= level_number + 1
         self.__t1_comm[level_number] += time.perf_counter() - self.__t0_comm[level_number]
 
@@ -156,6 +161,7 @@ def post_sweep(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().post_sweep(step, level_number)
         self.__t1_sweep = time.perf_counter()
 
         L = step.levels[level_number]
@@ -198,6 +204,7 @@ def post_iteration(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().post_iteration(step, level_number)
         self.__t1_iteration = time.perf_counter()
 
         L = step.levels[level_number]
@@ -229,6 +236,7 @@ def post_step(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().post_step(step, level_number)
         self.__t1_step = time.perf_counter()
 
         L = step.levels[level_number]
@@ -275,6 +283,7 @@ def post_predict(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().post_predict(step, level_number)
         self.__t1_predict = time.perf_counter()
 
         L = step.levels[level_number]
@@ -297,6 +306,7 @@ def post_run(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().post_run(step, level_number)
         self.__t1_run = time.perf_counter()
 
         L = step.levels[level_number]
@@ -319,6 +329,7 @@ def post_setup(self, step, level_number):
             step (pySDC.Step.step): the current step
             level_number (int): the current level number
         """
+        super().post_setup(step, level_number)
         self.__t1_setup = time.perf_counter()
 
         self.add_to_stats(

pySDC/implementations/hooks/log_embedded_error_estimate.py

@@ -17,7 +17,8 @@ def post_step(self, step, level_number):
         Returns:
             None
         """
-        # some abbreviations
+        super().post_step(step, level_number)
+
         L = step.levels[level_number]
 
         self.add_to_stats(

pySDC/implementations/hooks/log_extrapolated_error_estimate.py

@@ -17,6 +17,8 @@ def post_step(self, step, level_number):
         Returns:
             None
         """
+        super().post_step(step, level_number)
+
         # some abbreviations
         L = step.levels[level_number]
 

pySDC/implementations/hooks/log_solution.py

@@ -17,7 +17,8 @@ def post_step(self, step, level_number):
         Returns:
             None
         """
-        # some abbreviations
+        super().post_step(step, level_number)
+
         L = step.levels[level_number]
         L.sweep.compute_end_point()
 

pySDC/implementations/hooks/log_step_size.py

@@ -17,7 +17,8 @@ def post_step(self, step, level_number):
         Returns:
             None
         """
-        # some abbreviations
+        super().post_step(step, level_number)
+
         L = step.levels[level_number]
 
         self.add_to_stats(

pySDC/projects/Resilience/hook.py

@@ -17,17 +17,18 @@ def pre_run(self, step, level_number):
         """
         Record los conditiones initiales
         """
+        super().pre_run(step, level_number)
+
         L = step.levels[level_number]
         self.add_to_stats(process=0, time=0, level=0, iter=0, sweep=0, type='u0', value=L.u[0])
 
     def post_step(self, step, level_number):
         """
         Record final solutions as well as step size and error estimates
         """
-        # some abbreviations
-        L = step.levels[level_number]
+        super().post_step(step, level_number)
 
-        L.sweep.compute_end_point()
+        L = step.levels[level_number]
 
         self.add_to_stats(
             process=step.status.slot,