Merge branch 'communicator_refactor' into nonant_bounds_buffer

Author: bknueven

Diff for: examples/netdes/drivertest.py

@@ -12,7 +12,7 @@
 # Hub and spoke SPBase classes
 from mpisppy.phbase import PHBase
 from mpisppy.opt.ph import PH
-from mpisppy.fwph.fwph import FWPH
+from mpisppy.opt.fwph import FWPH
 # Hub and spoke SPCommunicator classes
 from mpisppy.cylinders.fwph_spoke import FrankWolfeOuterBound
 from mpisppy.cylinders.lagrangian_bounder import LagrangianOuterBound

Diff for: examples/uc/uc4wood.py

@@ -18,7 +18,7 @@
 # Hub and spoke SPBase classes
 from mpisppy.phbase import PHBase
 from mpisppy.opt.ph import PH
-from mpisppy.fwph.fwph import FWPH
+from mpisppy.opt.fwph import FWPH
 from mpisppy.utils.xhat_eval import Xhat_Eval
 # Hub and spoke SPCommunicator classes
 from mpisppy.cylinders.fwph_spoke import FrankWolfeOuterBound

Diff for: mpisppy/cylinders/hub.py

@@ -218,6 +218,11 @@ def send_terminate(self):
         self.put_send_buffer(self.send_buffers[Field.SHUTDOWN], Field.SHUTDOWN)
         return
 
+    def sync_bounds(self):
+        self.receive_outerbounds()
+        self.receive_innerbounds()
+        self.send_boundsout()
+
 
 class PHHub(Hub):
 
@@ -244,24 +249,14 @@ def sync(self):
         """
             Manages communication with Spokes
         """
-        self.send_ws()
-        self.send_nonants()
-        self.send_boundsout()
-        self.receive_outerbounds()
-        self.receive_innerbounds()
-        self.receive_nonant_bounds()
-        if self.opt.extensions is not None:
-            self.opt.extobject.sync_with_spokes()
+        self.sync_Ws()
+        self.sync_nonants()
+        self.sync_bounds()
+        self.sync_extensions()
 
     def sync_with_spokes(self):
         self.sync()
 
-    def sync_bounds(self):
-        self.receive_outerbounds()
-        self.receive_innerbounds()
-        self.receive_nonant_bounds()
-        self.send_boundsout()
-
     def sync_extensions(self):
         if self.opt.extensions is not None:
             self.opt.extobject.sync_with_spokes()
@@ -275,6 +270,8 @@ def sync_Ws(self):
     def is_converged(self):
         if self.opt.best_bound_obj_val is not None:
             self.BestOuterBound = self.OuterBoundUpdate(self.opt.best_bound_obj_val)
+        if self.opt.best_solution_obj_val is not None:
+            self.BestInnerBound = self.InnerBoundUpdate(self.opt.best_solution_obj_val)
 
         if not self.receive_field_spcomms[Field.OBJECTIVE_INNER_BOUND]:
             if self.opt._PHIter == 1:
@@ -360,9 +357,7 @@ def sync(self, send_nonants=True):
         """
         if send_nonants:
             self.send_nonants()
-        self.receive_outerbounds()
-        self.receive_innerbounds()
-        self.receive_nonant_bounds()
+        self.sync_bounds()
         # in case LShaped ever gets extensions
         if getattr(self.opt, "extensions", None) is not None:
             self.opt.extobject.sync_with_spokes()
@@ -445,3 +440,10 @@ def finalize(self):
         #       to APH.post_loops
         Eobj = self.opt.post_loops()
         return Eobj
+
+class FWPHHub(PHHub):
+
+    _hub_algo_best_bound_provider = True
+
+    def main(self):
+        self.opt.fwph_main(finalize=False)

Diff for: mpisppy/fwph/__init__.py

@@ -175,6 +175,16 @@ def _do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_
                        rho_setter = rho_setter,
                        all_nodenames = all_nodenames,
                    )
+    elif cfg.fwph_hub:
+        # Vanilla FWPH hub
+        hub_dict = vanilla.fwph_hub(
+                       *beans,
+                       scenario_creator_kwargs=scenario_creator_kwargs,
+                       ph_extensions=None,
+                       ph_converger=ph_converger,
+                       rho_setter = rho_setter,
+                       all_nodenames = all_nodenames,
+                   )
     else:
         # Vanilla PH hub
         hub_dict = vanilla.ph_hub(*beans,