option driving cylinder columns

Author: Bernard Knueven

mpisppy/opt/fwph.py

@@ -373,7 +373,7 @@ def _sync_after_mip_solve(self):
         # add columns from cylinder(s)
         self._swap_nonant_vars_back()
         # spoke or hub (FWPH_Cylinder)
-        if hasattr(self.spcomm, "add_cylinder_columns"):
+        if self.FW_options.get("add_cylinder_columns", False) and hasattr(self.spcomm, "add_cylinder_columns"):
             self.spcomm.add_cylinder_columns()
         # hub
         if hasattr(self.spcomm, "sync_bounds"):
@@ -450,7 +450,7 @@ def SDM(self, model_name, mip_solver_options, dtiming, tee, verbose, sdm_iter_li
                     gamma_t = self._compute_gamma_t_objgap(cutoff, inner_bound, outer_bound)
                 else:
                     gamma_t = self._compute_gamma_t(cutoff, inner_bound)
-                print(f"{model_name=}, {itr=}, {gamma_t=:.2e}, {FW_conv_thresh=:.2e}")
+                # print(f"{model_name=}, {itr=}, {gamma_t=:.2e}, {FW_conv_thresh=:.2e}")
 
                 # tbcol = time.perf_counter()
                 self._add_QP_column(model_name)
@@ -490,7 +490,7 @@ def SDM(self, model_name, mip_solver_options, dtiming, tee, verbose, sdm_iter_li
                 dual_bound = mip._mpisppy_data.outer_bound
 
             if itr + 1 == sdm_iter_limit or not mip._mpisppy_data.solution_available or gamma_t < FW_conv_thresh:
-                print(f"\tSTOPPING: {model_name=}, {itr=}, {gamma_t=:.2e}, {FW_conv_thresh=:.2e}")
+                # print(f"\tSTOPPING: {model_name=}, {itr=}, {gamma_t=:.2e}, {FW_conv_thresh=:.2e}")
                 return dual_bound
             else:
                 yield dual_bound
@@ -912,8 +912,10 @@ def _setup_shared_column_generation(self):
         self._xhatter.post_iter0()
 
     def _generate_initial_columns_if_needed(self):
+        if self.FW_options["objgap_mode"]:
+            return
         if self.spcomm is not None:
-            if self.spcomm.receive_field_spcomms[Field.BEST_XHAT]:
+            if self.FW_options.get("add_cylinder_columns", False) and self.spcomm.receive_field_spcomms[Field.BEST_XHAT]:
                 # we'll get the initial columns from the incumbent finder spoke
                 return
         number_initial_column_tries = self.options.get("FW_initialization_attempts", 10)

mpisppy/utils/cfg_vanilla.py

@@ -991,6 +991,7 @@ def _fwph_options(cfg):
         "objgap_decrease_base" : cfg.fwph_objgap_decrease_base,
         "objgap_decrease_coeff" : cfg.fwph_objgap_decrease_coeff,
         "objgap_initial_floor" : cfg.fwph_objgap_initial_gap_floor,
+        "add_cylinder_columns" : cfg.fwph_add_cylinder_columns,
     }
 
     # Separate MIP/QP solvers (issue #712). FWPH falls back to solver_name

mpisppy/utils/config.py

@@ -950,6 +950,11 @@ def fwph_args(self):
                            domain=float,
                            default=1)
 
+        self.add_to_config("fwph_add_cylinder_columns",
+                           description="Inject columns calculated by xhat spokes into the FWPH algorithm",
+                           domain=bool,
+                           default=False)
+
     def cg_args(self):
 
         self.add_to_config(name="cg_hub",