remove *_to_* methods; nothing was really pushed anyways...

Author: bknueven

Diff for: mpisppy/cylinders/cross_scen_spoke.py

@@ -137,7 +137,7 @@ def make_eta_lb_cut(self):
             ## this cut  -- [ LB, -1, *0s ], i.e., -1*\eta + LB <= 0
             all_coefs[row_len*idx] = self._eta_lb_array[idx]
             all_coefs[row_len*idx+1] = -1
-        self.spoke_to_hub(all_coefs, Field.CROSS_SCENARIO_CUT)
+        self.put_send_buffer(all_coefs, Field.CROSS_SCENARIO_CUT)
 
     def make_cut(self):
 
@@ -295,7 +295,7 @@ def make_cut(self):
                 all_coefs[row_len*idx:row_len*(idx+1)] = coef_dict[k]
             elif feas_cuts:
                 all_coefs[row_len*idx:row_len*(idx+1)] = feas_cuts.pop()
-        self.spoke_to_hub(all_coefs, Field.CROSS_SCENARIO_CUT)
+        self.put_send_buffer(all_coefs, Field.CROSS_SCENARIO_CUT)
 
     def main(self):
         # call main cut generation routine

Diff for: mpisppy/cylinders/hub.py

@@ -116,7 +116,7 @@ def extension_send_field(self, field: Field, buf: SendArray):
         Send the data in the SendArray `buf` which stores the Field `field`. This will make
         the data available to the spokes in this strata.
         """
-        return self.hub_to_spoke(buf, field)
+        return self.put_send_buffer(buf, field)
 
     def sync_extension_fields(self):
         """
@@ -307,7 +307,7 @@ def send_boundsout(self):
         my_bounds = self.send_buffers[Field.BEST_OBJECTIVE_BOUNDS]
         self._populate_boundsout_cache(my_bounds.array())
         logging.debug("hub is sending bounds={}".format(my_bounds))
-        self.hub_to_spoke(my_bounds, Field.BEST_OBJECTIVE_BOUNDS)
+        self.put_send_buffer(my_bounds, Field.BEST_OBJECTIVE_BOUNDS)
         return
 
     def register_receive_fields(self):
@@ -336,38 +336,6 @@ def register_send_fields(self):
 
         return
 
-
-    def hub_to_spoke(self, buf: SendArray, field: Field):
-        """ Put the specified values into the specified locally-owned buffer
-            for the spoke to pick up.
-
-            Notes:
-                This automatically updates handles the write id.
-        """
-        return self._hub_to_spoke(buf.array(), field, buf._next_write_id())
-
-
-    def _hub_to_spoke(self, values: np.typing.NDArray, field: Field, write_id: int):
-        """ Put the specified values into the specified locally-owned buffer
-            for the spoke to pick up.
-
-            Notes:
-                This automatically does the -1 indexing
-
-                This assumes that values contains a slot at the end for the
-                write_id
-        """
-
-        if not isinstance(self.opt, APH):
-            self.cylinder_comm.Barrier()
-        ## End if
-
-        values[-1] = write_id
-        self.window.put(values, field)
-
-        return
-
-
     def hub_from_spoke(self,
                        buf: RecvArray,
                        spoke_num: int,
@@ -432,7 +400,7 @@ def send_terminate(self):
             processes (don't need to call them one at a time).
         """
         self.send_buffers[Field.SHUTDOWN][0] = 1.0
-        self.hub_to_spoke(self.send_buffers[Field.SHUTDOWN], Field.SHUTDOWN)
+        self.put_send_buffer(self.send_buffers[Field.SHUTDOWN], Field.SHUTDOWN)
         return
 
 
@@ -541,8 +509,7 @@ def send_nonants(self):
                 ci += 1
         logging.debug("hub is sending X nonants={}".format(nonant_send_buffer))
 
-        # self.hub_to_spoke(nonant_send_buffer.array(), Field.NONANT, nonant_send_buffer.next_write_id())
-        self.hub_to_spoke(nonant_send_buffer, Field.NONANT)
+        self.put_send_buffer(nonant_send_buffer, Field.NONANT)
 
         return
 
@@ -554,8 +521,7 @@ def send_ws(self):
         self.opt._populate_W_cache(my_ws.array(), padding=1)
         logging.debug("hub is sending Ws={}".format(my_ws.array()))
 
-        # self.hub_to_spoke(my_ws.array(), Field.DUALS, my_ws.next_write_id())
-        self.hub_to_spoke(my_ws, Field.DUALS)
+        self.put_send_buffer(my_ws, Field.DUALS)
 
         return
 
@@ -623,7 +589,7 @@ def send_nonants(self):
                 ci += 1
         logging.debug("hub is sending X nonants={}".format(nonant_send_buffer))
 
-        self.hub_to_spoke(nonant_send_buffer, Field.NONANT)
+        self.put_send_buffer(nonant_send_buffer, Field.NONANT)
 
         return
 

Diff for: mpisppy/cylinders/spcommunicator.py

@@ -82,9 +82,11 @@ def __setitem__(self, key, value):
 
     def _next_write_id(self) -> int:
         """
-        Updates the internal id field to the next write id and returns that id
+        Updates the internal id field to the next write id, uses that id in the field data,
+        and returns that id
         """
         self._id += 1
+        self._array[-1] = self._id
         return self._id
 
 
@@ -154,8 +156,6 @@ def __init__(self, spbase_object, fullcomm, strata_comm, cylinder_comm, communic
 
         self.register_receive_fields()
 
-        # TODO: check that we have something in receive_field_spcomms??
-
         return
 
     def _make_key(self, field: Field, origin: int):
@@ -236,13 +236,6 @@ def register_send_field(self, field: Field, length: int = -1) -> SendArray:
         assert field not in self.send_buffers, "Field {} is already registered".format(field)
         if length == -1:
             length = self._field_lengths[field]
-        # if field in self.send_buffers:
-        #     my_fa = self.send_buffers[field]
-        #     assert(length + 1 == np.size(my_fa.array()))
-        # else:
-        #     my_fa = SendArray(length)
-        #     self.send_buffers[field] = my_fa
-        # ## End if else
         my_fa = SendArray(length)
         self.send_buffers[field] = my_fa
         return my_fa
@@ -293,6 +286,10 @@ def register_send_fields(self) -> None:
     def register_receive_fields(self) -> None:
         # print(f"{self.__class__.__name__}: {self.receive_fields=}")
         for field in self.receive_fields:
+            # NOTE: If this list is empty after this method, it is up
+            #       to the caller to raise an error. Sometimes optional
+            #       receive fields are perfectly sensible, and sometimes
+            #       they are nonsensical.
             self.receive_field_spcomms[field] = []
             for strata_rank, comm in enumerate(self.communicators):
                 if strata_rank == self.strata_rank:
@@ -301,3 +298,14 @@ def register_receive_fields(self) -> None:
                 if field in self.ranks_to_fields[strata_rank]:
                     buff = self.register_recv_field(field, strata_rank)
                     self.receive_field_spcomms[field].append((strata_rank, cls, buff))
+
+    def put_send_buffer(self, buf: SendArray, field: Field):
+        """ Put the specified values into the specified locally-owned buffer
+            for the another cylinder to pick up.
+
+            Notes:
+                This automatically updates handles the write id.
+        """
+        buf._next_write_id()
+        self.window.put(buf.array(), field)
+        return

Diff for: mpisppy/cylinders/spoke.py

@@ -31,21 +31,6 @@ def __init__(self, spbase_object, fullcomm, strata_comm, cylinder_comm, communic
 
         return
 
-    def spoke_to_hub(self, buf: SendArray, field: Field):
-        """ Put the specified values into the locally-owned buffer for the hub
-            to pick up.
-
-            Notes:
-            Automatically handles write id updating and setting
-        """
-        return self._spoke_to_hub(buf.array(), field, buf._next_write_id())
-
-    def _spoke_to_hub(self, values: np.typing.NDArray, field: Field, write_id: int):
-        self.cylinder_comm.Barrier()
-        values[-1] = write_id
-        self.window.put(values, field)
-        return
-
     def spoke_from_hub(self,
                        buf: RecvArray,
                        field: Field,
@@ -172,7 +157,7 @@ def bound(self):
     def bound(self, value):
         self._append_trace(value)
         self._bound[0] = value
-        self.spoke_to_hub(self._bound, self.bound_type())
+        self.put_send_buffer(self._bound, self.bound_type())
         return
 
     @property