Skip to content

Commit 00ab113

Browse files
committed
partially revert 4e970cd
1 parent 952935b commit 00ab113

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

mpisppy/extensions/cross_scen_extension.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ def _check_bound(self):
126126
cached_ph_obj[k].activate()
127127

128128
def get_from_cross_cuts(self):
129-
# self.opt.spcomm.get_receive_buffer(
130-
# self.cuts,
131-
# Field.CROSS_SCENARIO_CUT,
132-
# self.cross_scenario_index,
133-
# )
129+
self.opt.spcomm.get_receive_buffer(
130+
self.cuts,
131+
Field.CROSS_SCENARIO_CUT,
132+
self.cross_scenario_index,
133+
)
134134
if self.cuts.is_new():
135135
self.make_cuts(self.cuts.array())
136136

mpisppy/extensions/reduced_costs_fixer.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,16 @@ def sync_with_spokes(self, pre_iter0 = False):
118118
# NOTE: If we do this, then the heuristic reduced cost fixing might fix
119119
# different variables in different subproblems. But this might be
120120
# fine.
121-
# self.opt.spcomm.get_receive_buffer(
122-
# self.reduced_cost_buf,
123-
# Field.EXPECTED_REDUCED_COST,
124-
# self.reduced_costs_spoke_index,
125-
# )
126-
# self.opt.spcomm.get_receive_buffer(
127-
# self.outer_bound_buf,
128-
# Field.OBJECTIVE_OUTER_BOUND,
129-
# self.reduced_costs_spoke_index,
130-
# )
121+
self.opt.spcomm.get_receive_buffer(
122+
self.reduced_cost_buf,
123+
Field.EXPECTED_REDUCED_COST,
124+
self.reduced_costs_spoke_index,
125+
)
126+
self.opt.spcomm.get_receive_buffer(
127+
self.outer_bound_buf,
128+
Field.OBJECTIVE_OUTER_BOUND,
129+
self.reduced_costs_spoke_index,
130+
)
131131
if self.reduced_cost_buf.is_new() and self.reduced_cost_buf.id() == self.outer_bound_buf.id():
132132
reduced_costs = self.reduced_cost_buf.value_array()
133133
this_outer_bound = self.outer_bound_buf.value_array()[0]

mpisppy/extensions/reduced_costs_rho.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ def register_receive_fields(self):
5454
)
5555

5656
def sync_with_spokes(self):
57-
# self.opt.spcomm.get_receive_buffer(
58-
# self.scenario_reduced_cost_buf,
59-
# Field.SCENARIO_REDUCED_COST,
60-
# self.reduced_costs_spoke_index,
61-
# )
57+
self.opt.spcomm.get_receive_buffer(
58+
self.scenario_reduced_cost_buf,
59+
Field.SCENARIO_REDUCED_COST,
60+
self.reduced_costs_spoke_index,
61+
)
6262
if self.scenario_reduced_cost_buf.is_new():
6363
self._scenario_rc_buffer[:] = self.scenario_reduced_cost_buf.value_array()
6464
# print(f"In ReducedCostsRho; {self._scenario_rc_buffer=}")

0 commit comments

Comments
 (0)