refactor: replace n_timesteps by cp_timesteps or op_timesteps

Author: speglich

pyrevolve/pyrevolve.py

@@ -70,7 +70,7 @@ def __init__(
         fwd_operator,
         rev_operator,
         n_checkpoints,
-        n_timesteps,
+        op_timesteps,
         storage_list=None,
         scheduler=None,
         timings=None,
@@ -84,10 +84,10 @@ def __init__(
         methods and a scheduler object must be provided as well. Otherwise
         NumpyStorage and CRevolve are used as default
         """
-        if n_timesteps is None:
+        if op_timesteps is None:
             raise Exception(
                 "Online checkpointing not yet supported. Specify \
-                              number of time steps!"
+                              number of Operator time steps!"
             )
 
         if profiler is None:
@@ -103,12 +103,14 @@ def __init__(
         self.checkpoint = checkpoint
         self.n_checkpoints = n_checkpoints
         self.block_size = block_size
-        self.n_timesteps = n_timesteps
+        self.op_timesteps = op_timesteps
         self.timings = timings
         self.fwd_operator = fwd_operator
         self.rev_operator = rev_operator
         self.scheduler = scheduler
 
+        self.cp_timesteps = int(math.ceil(self.op_timesteps / self.block_size))
+
     def addStorage(self, new_storage):
         self.storage_list.append(new_storage)
 
@@ -174,15 +176,6 @@ def addByteStorage(self, compression_params):
     def makespan(self):
         return 0
 
-    @property
-    def n_timesteps(self):
-        return self._n_timesteps
-
-    @n_timesteps.setter
-    def n_timesteps(self, n_timesteps):
-        self.op_timesteps = n_timesteps
-        self._n_timesteps = int(math.ceil(n_timesteps / self.block_size))
-
     @property
     def op_old_capo(self):
         return self.scheduler.old_capo * self.block_size
@@ -320,7 +313,7 @@ def __init__(
         fwd_operator,
         rev_operator,
         n_checkpoints,
-        n_timesteps,
+        op_timesteps,
         timings=None,
         profiler=None,
         compression_params=None,
@@ -335,7 +328,7 @@ def __init__(
             fwd_operator:       forward operator
             rev_operator:       backward operator
             n_checkpoints:      number of checkpoints
-            n_timesteps:        number of timesteps
+            op_timesteps:       number of timesteps
             timings:            timings
             profiler:           Profiler
             compression_params: compression scheme
@@ -348,7 +341,7 @@ def __init__(
             fwd_operator,
             rev_operator,
             n_checkpoints,
-            n_timesteps,
+            op_timesteps,
             timings=timings,
             profiler=profiler,
         )
@@ -357,11 +350,11 @@ def __init__(
         self.singlefile = singlefile
 
         if n_checkpoints is None:
-            self.n_checkpoints = cr.adjust(self.n_timesteps)
+            self.n_checkpoints = cr.adjust(self.cp_timesteps)
         else:
             self.n_checkpoints = n_checkpoints
 
-        self.scheduler = CRevolve(self.n_checkpoints, self.n_timesteps)
+        self.scheduler = CRevolve(self.n_checkpoints, self.cp_timesteps)
 
         # remove storage list to avoid memory overflow
         self.resetStorageList()
@@ -395,7 +388,7 @@ def __init__(
         checkpoint,
         fwd_operator,
         rev_operator,
-        n_timesteps,
+        op_timesteps,
         storage_list,
         timings=None,
         profiler=None,
@@ -416,7 +409,7 @@ def __init__(
             fwd_operator:       forward operator
             rev_operator:       backward operator
             n_checkpoints:      number of checkpoints
-            n_timesteps:        number of timesteps
+            op_timesteps:        number of timesteps
             timings:            timings
             profiler:           profiler
             storage_list:       list of storage objects
@@ -428,8 +421,8 @@ def __init__(
             checkpoint,
             fwd_operator,
             rev_operator,
-            n_timesteps,
-            n_timesteps,
+            op_timesteps,
+            op_timesteps,
             storage_list=storage_list,
             timings=timings,
             profiler=profiler,
@@ -462,7 +455,7 @@ def reload_scheduler(self, uf=1, ub=1, up=1):
             self.up = up
             self.arch = Architecture(self.storage_list)
             self.scheduler = HRevolve(
-                self.n_checkpoints, self.n_timesteps, self.arch, self.uf, self.ub, self.up
+                self.n_checkpoints, self.cp_timesteps, self.arch, self.uf, self.ub, self.up
             )
         else:
             raise ValueError(
@@ -502,7 +495,7 @@ def __init__(
         fwd_operator,
         rev_operator,
         n_checkpoints,
-        n_timesteps,
+        op_timesteps,
         timings=None,
         profiler=None,
         compression_params=None,
@@ -512,7 +505,7 @@ def __init__(
             fwd_operator,
             rev_operator,
             n_checkpoints,
-            n_timesteps,
+            op_timesteps,
             timings=timings,
             profiler=profiler,
             compression_params=compression_params,
@@ -541,7 +534,7 @@ def __init__(
         fwd_operator,
         rev_operator,
         n_checkpoints,
-        n_timesteps,
+        op_timesteps,
         timings=None,
         profiler=None,
         filedir="./",
@@ -552,7 +545,7 @@ def __init__(
             fwd_operator,
             rev_operator,
             n_checkpoints,
-            n_timesteps,
+            op_timesteps,
             timings=timings,
             profiler=profiler,
             diskstorage=True,