switch to receive_ paradigm for nonant bounds

Author: bknueven

Diff for: mpisppy/cylinders/fwph_spoke.py

@@ -28,7 +28,7 @@ def sync(self):
         self.bound = self.opt._local_bound
 
         # Update the nonant bounds, if possible
-        self.update_nonant_bounds()
+        self.receive_nonant_bounds()
 
     def finalize(self):
         # The FWPH spoke can call "finalize" before it

Diff for: mpisppy/cylinders/hub.py

@@ -249,7 +249,7 @@ def sync(self):
         self.send_boundsout()
         self.receive_outerbounds()
         self.receive_innerbounds()
-        self.update_nonant_bounds()
+        self.receive_nonant_bounds()
         if self.opt.extensions is not None:
             self.opt.extobject.sync_with_spokes()
 
@@ -259,7 +259,7 @@ def sync_with_spokes(self):
     def sync_bounds(self):
         self.receive_outerbounds()
         self.receive_innerbounds()
-        self.update_nonant_bounds()
+        self.receive_nonant_bounds()
         self.send_boundsout()
 
     def sync_extensions(self):
@@ -362,7 +362,7 @@ def sync(self, send_nonants=True):
             self.send_nonants()
         self.receive_outerbounds()
         self.receive_innerbounds()
-        self.update_nonant_bounds()
+        self.receive_nonant_bounds()
         # in case LShaped ever gets extensions
         if getattr(self.opt, "extensions", None) is not None:
             self.opt.extobject.sync_with_spokes()

Diff for: mpisppy/cylinders/lagrangian_bounder.py

@@ -20,7 +20,7 @@ def lagrangian_prep(self):
 
     def lagrangian(self, need_solution=True):
         # update the nonant bounds, if possible, for a tighter relaxation
-        self.update_nonant_bounds()
+        self.receive_nonant_bounds()
         verbose = self.opt.options['verbose']
         # This is sort of a hack, but might help folks:
         if "ipopt" in self.opt.options["solver_name"]:

Diff for: mpisppy/cylinders/reduced_costs_spoke.py

@@ -134,6 +134,10 @@ def lagrangian(self, need_solution=True):
         return bound
 
     def extract_and_store_reduced_costs(self):
+        # if it's time, don't bother
+        if self.got_kill_signal():
+            return
+
         self.opt.Compute_Xbar()
         # NaN will signal that the x values do not agree in
         # every scenario, we can't extract an expected reduced
@@ -206,13 +210,11 @@ def extract_and_store_reduced_costs(self):
         )
 
     def extract_and_store_updated_nonant_bounds(self, lr_outer_bound):
-        # update the best bound from the hub
-        # as a side effect, calls update_receive_buffers
-        # TODO: fix this side effect 
+        # if it's time, don't bother
         if self.got_kill_signal():
             return
 
-        self.update_innerbounds()        
+        self.receive_innerbounds()
 
         if math.isinf(self.BestInnerBound):
             # can do anything with no bound

Diff for: mpisppy/cylinders/spcommunicator.py

@@ -394,15 +394,16 @@ def get_receive_buffer(self,
             buf._is_new = False
             return False
 
-    def update_nonant_bounds(self):
-        """ update the bounds on the nonanticipative variables based on
-        Field.NONANT_LOWER_BOUNDS and Field.NONANT_UPPER_BOUNDS. The lower and
-        upper bound buffers should be up-to-date, which can be done by calling
-        `SPCommunicator.update_receive_buffers`.
+    def receive_nonant_bounds(self):
+        """ receive the bounds on the nonanticipative variables based on
+        Field.NONANT_LOWER_BOUNDS and Field.NONANT_UPPER_BOUNDS. Updates the
+        NONANT_LOWER_BOUNDS and NONANT_UPPER_BOUNDS buffers, and if new,
+        updates the corresponding Pyomo nonant variables
         """
         bounds_modified = 0
-        for _, _, recv_buf in self.receive_field_spcomms[Field.NONANT_LOWER_BOUNDS]:
-            if not recv_buf.is_new():
+        for idx, _, recv_buf in self.receive_field_spcomms[Field.NONANT_LOWER_BOUNDS]:
+            is_new = self.get_receive_buffer(recv_buf, Field.NONANT_LOWER_BOUNDS, idx)
+            if not is_new:
                 break
             for s in self.opt.local_scenarios.values():
                 for ci, (ndn_i, xvar) in enumerate(s._mpisppy_data.nonant_indices.items()):
@@ -412,8 +413,9 @@ def update_nonant_bounds(self):
                     if recv_buf[ci] > xvarlb:
                         xvar.lb = recv_buf[ci]
                         bounds_modified += 1
-        for _, _, recv_buf in self.receive_field_spcomms[Field.NONANT_UPPER_BOUNDS]:
-            if not recv_buf.is_new():
+        for idx, _, recv_buf in self.receive_field_spcomms[Field.NONANT_UPPER_BOUNDS]:
+            is_new = self.get_receive_buffer(recv_buf, Field.NONANT_UPPER_BOUNDS, idx)
+            if not is_new:
                 break
             for s in self.opt.local_scenarios.values():
                 for ci, (ndn_i, xvar) in enumerate(s._mpisppy_data.nonant_indices.items()):

Diff for: mpisppy/cylinders/spoke.py

@@ -39,13 +39,6 @@ def main(self):
         """
         pass
 
-    def update_receive_buffers(self):
-        for (key, recv_buf) in self.receive_buffers.items():
-            field, rank = self._split_key(key)
-            self.get_receive_buffer(recv_buf, field, rank)
-        ## End for
-        return
-
 
 class _BoundSpoke(Spoke):
     """ A base class for bound spokes