#611: pushing the part that now works (still incomplete)

Author: ppebay

config/synthetic-blocks.yaml

@@ -12,7 +12,7 @@ work_model:
   parameters:
     beta: 0.0
     gamma: 0.0
-    delta: 0.1
+    delta: 0.0
     upper_bounds:
       max_memory_usage: 45.0
 

src/lbaf/Execution/lbsTemperedWithUpdatesCriterion.py

@@ -66,6 +66,8 @@ def compute(self, r_src: Rank, o_src: list, r_dst: Rank, o_dst: Optional[list]=N
             self._work_model.compute(r_src),
             self._work_model.compute(r_dst))
 
+        # Compute update formulae
+
         # Move objects into proposed new arrangement
         self._phase.transfer_objects(r_src, o_src, r_dst, o_dst)
 

src/lbaf/Model/lbsAffineCombinationWorkModel.py

@@ -93,7 +93,6 @@ def affine_combination(self, a, l, v1, v2, h):
 
     def compute(self, rank: Rank):
         """A work model with affine combination of load and communication.
-
         alpha * load + beta * max(sent, received) + gamma + delta * homing,
         under optional strict upper bounds.
         """
@@ -111,3 +110,19 @@ def compute(self, rank: Rank):
             rank.get_received_volume(),
             rank.get_sent_volume(),
             rank.get_homing())
+    
+    def update_load(self, rank: Rank, o_snd: list, o_rcv: list):
+        """Update total load if objects are to be sent and received."""
+        return rank.get_load() + sum(
+            o.get_load() for o in o_rcv) - sum(
+                o.get_load() for o in o_snd)
+
+    def update(self, rank: Rank, o_snd: list, o_rcv: list):
+        """Update work if objects are to be sent and received."""
+        # Return combination of load and volumes
+        return self.affine_combination(
+            rank.get_alpha(),
+            rank.update_load(),
+            rank.get_received_volume(),
+            rank.get_sent_volume(),
+            rank.get_homing())

src/lbaf/Model/lbsLoadOnlyWorkModel.py

@@ -60,6 +60,11 @@ def __init__(self, _, lgr: Logger):
         self.__logger.info("Instantiated concrete work model")
 
     def compute(self, rank: Rank):
-        """A work model summing all object loads on given rank."""
-        # Return total load on this rank
+        """This work model only considers total object load."""
         return rank.get_load()
+
+    def update(self, rank: Rank, o_snd: list, o_rcv: list):
+        """Update total load if objects are to be sent and received."""
+        return rank.get_load() + sum(
+            o.get_load() for o in o_rcv) - sum(
+                o.get_load() for o in o_snd)

src/lbaf/Model/lbsWorkModelBase.py

@@ -79,5 +79,10 @@ def factory(work_name, parameters, lgr: Logger):
 
     @abc.abstractmethod
     def compute(self, rank):
-        """Return value of work for given rank."""
+        """Return value of work on given rank."""
+        # Must be implemented by concrete subclass
+
+    @abc.abstractmethod
+    def update(self, rank, o_snd, o_rcv):
+        """Compute updated work on given rank if sending and receiving objects."""
         # Must be implemented by concrete subclass