getting new bounds in hub; doesn't exactly match extension

Author: bknueven

mpisppy/cylinders/reduced_costs_spoke.py

@@ -77,14 +77,14 @@ def initialize_bound_fields(self):
                     dtype=float,
                     count=len(s._mpisppy_data.nonant_indices),
                 )
-            self._nonant_lower_bounds = np.maximum(self._nonant_lower_bounds, scenario_lower_bounds)
+            np.maximum(self._nonant_lower_bounds, scenario_lower_bounds, out=self._nonant_lower_bounds)
 
             scenario_upper_bounds = np.fromiter(
                     _ub_generator(s._mpisppy_data.nonant_indices.values()),
                     dtype=float,
                     count=len(s._mpisppy_data.nonant_indices),
                 )
-            self._nonant_upper_bounds = np.minimum(self._nonant_upper_bounds, scenario_upper_bounds)
+            np.minimum(self._nonant_upper_bounds, scenario_upper_bounds, out=self._nonant_upper_bounds)
 
     def create_integer_variable_where(self):
         self._integer_variable_where = np.full(len(self._nonant_lower_bounds), False)
@@ -221,8 +221,8 @@ def extract_and_store_updated_nonant_bounds(self, lr_outer_bound):
         nonzero_rc = np.where(self.rc_global==0, np.nan, self.rc_global)
         bound_tightening = np.divide(self.BestInnerBound - lr_outer_bound, nonzero_rc)
 
-        tighten_upper = np.where(bound_tightening>0, np.nan, bound_tightening)
-        tighten_lower = np.where(bound_tightening<0, np.nan, bound_tightening)
+        tighten_upper = np.where(bound_tightening>0, bound_tightening, np.nan)
+        tighten_lower = np.where(bound_tightening<0, bound_tightening, np.nan)
 
         tighten_upper += self._nonant_lower_bounds 
         tighten_lower += self._nonant_upper_bounds
@@ -237,7 +237,15 @@ def extract_and_store_updated_nonant_bounds(self, lr_outer_bound):
         np.ceil(self._nonant_lower_bounds, out=self._nonant_lower_bounds, where=self._integer_variable_where)
         # floor of upper bounds for integer variables
         np.floor(self._nonant_upper_bounds, out=self._nonant_upper_bounds, where=self._integer_variable_where)
-         
+
+        self.put_send_buffer(
+            self.send_buffers[Field.NONANT_LOWER_BOUNDS],
+            Field.NONANT_LOWER_BOUNDS,
+        )
+        self.put_send_buffer(
+            self.send_buffers[Field.NONANT_UPPER_BOUNDS],
+            Field.NONANT_UPPER_BOUNDS,
+        )
 
     def main(self):
         # need the solution for ReducedCostsSpoke

mpisppy/cylinders/spcommunicator.py

@@ -399,6 +399,8 @@ def update_nonant_bounds(self):
         """
         bounds_modified = 0
         for _, _, recv_buf in self.receive_field_spcomms[Field.NONANT_LOWER_BOUNDS]:
+            if not recv_buf.is_new():
+                break
             for s in self.opt.local_scenarios.values():
                 for ci, (ndn_i, xvar) in enumerate(s._mpisppy_data.nonant_indices.items()):
                     xvarlb = xvar.lb
@@ -408,6 +410,8 @@ def update_nonant_bounds(self):
                         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():
+                break
             for s in self.opt.local_scenarios.values():
                 for ci, (ndn_i, xvar) in enumerate(s._mpisppy_data.nonant_indices.items()):
                     xvarub = xvar.ub

mpisppy/extensions/cross_scen_extension.py

@@ -126,11 +126,11 @@ def _check_bound(self):
             cached_ph_obj[k].activate()
 
     def get_from_cross_cuts(self):
-        self.opt.spcomm.get_receive_buffer(
-            self.cuts,
-            Field.CROSS_SCENARIO_CUT,
-            self.cross_scenario_index,
-        )
+        # self.opt.spcomm.get_receive_buffer(
+        #     self.cuts,
+        #     Field.CROSS_SCENARIO_CUT,
+        #     self.cross_scenario_index,
+        # )
         if self.cuts.is_new():
             self.make_cuts(self.cuts.array())
 

mpisppy/extensions/reduced_costs_fixer.py

@@ -118,16 +118,16 @@ def sync_with_spokes(self, pre_iter0 = False):
         # NOTE: If we do this, then the heuristic reduced cost fixing might fix
         #       different variables in different subproblems. But this might be
         #       fine.
-        self.opt.spcomm.get_receive_buffer(
-            self.reduced_cost_buf,
-            Field.EXPECTED_REDUCED_COST,
-            self.reduced_costs_spoke_index,
-        )
-        self.opt.spcomm.get_receive_buffer(
-            self.outer_bound_buf,
-            Field.OBJECTIVE_OUTER_BOUND,
-            self.reduced_costs_spoke_index,
-        )
+        # self.opt.spcomm.get_receive_buffer(
+        #     self.reduced_cost_buf,
+        #     Field.EXPECTED_REDUCED_COST,
+        #     self.reduced_costs_spoke_index,
+        # )
+        # self.opt.spcomm.get_receive_buffer(
+        #     self.outer_bound_buf,
+        #     Field.OBJECTIVE_OUTER_BOUND,
+        #     self.reduced_costs_spoke_index,
+        # )
         if self.reduced_cost_buf.is_new() and self.reduced_cost_buf.id() == self.outer_bound_buf.id():
             reduced_costs = self.reduced_cost_buf.value_array()
             this_outer_bound = self.outer_bound_buf.value_array()[0]

mpisppy/extensions/reduced_costs_rho.py

@@ -54,11 +54,11 @@ def register_receive_fields(self):
         )
 
     def sync_with_spokes(self):
-        self.opt.spcomm.get_receive_buffer(
-            self.scenario_reduced_cost_buf,
-            Field.SCENARIO_REDUCED_COST,
-            self.reduced_costs_spoke_index,
-        )
+        # self.opt.spcomm.get_receive_buffer(
+        #     self.scenario_reduced_cost_buf,
+        #     Field.SCENARIO_REDUCED_COST,
+        #     self.reduced_costs_spoke_index,
+        # )
         if self.scenario_reduced_cost_buf.is_new():
             self._scenario_rc_buffer[:] = self.scenario_reduced_cost_buf.value_array()
             # print(f"In ReducedCostsRho; {self._scenario_rc_buffer=}")