Merge branch 'main' into mps

Author: DLWoodruff

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

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

mpisppy/cylinders/hub.py

@@ -590,12 +590,12 @@ def sync(self):
             self.send_ws()
         if self.has_nonant_spokes:
             self.send_nonants()
-        if self.has_bounds_only_spokes:
-            self.send_boundsout()
         if self.has_outerbound_spokes:
             self.receive_outerbounds()
         if self.has_innerbound_spokes:
             self.receive_innerbounds()
+        if self.has_bounds_only_spokes:
+            self.send_boundsout()
         if self.opt.extensions is not None:
             self.sync_extension_fields()
             self.opt.extobject.sync_with_spokes()
@@ -626,6 +626,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.has_innerbound_spokes:
             if self.opt._PHIter == 1:
@@ -669,6 +671,7 @@ def send_nonants(self):
         """ Gather nonants and send them to the appropriate spokes
             TODO: Will likely fail with bundling
         """
+        # TODO: why save here? We get the values directly from the variables
         self.opt._save_nonants()
         ci = 0  ## index to self.nonant_send_buffer
         # my_nonants = self._sends[Field.NONANT]
@@ -815,3 +818,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)

mpisppy/fwph/__init__.py

@@ -177,6 +177,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,