Skip to content

Replace deprecated Pyomo 'undo' with 'reverse' for relax_integer_vars #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DLWoodruff wants to merge 4 commits into from
Closed

Replace deprecated Pyomo 'undo' with 'reverse' for relax_integer_vars #631

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
641870f
Replace deprecated 'undo' with 'reverse' for Pyomo relax_integer_vars
DLWoodruff Mar 13, 2026
2f92971
Merge remote-tracking branch 'upstream/main' into pyomo_catchup
DLWoodruff Mar 14, 2026
ac0484e
Fix Pyomo reverse transformation to use token instead of boolean
DLWoodruff Mar 14, 2026
eb9ea5b
Bump minimum Pyomo version to 6.9.3
DLWoodruff Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions mpisppy/extensions/integer_relax_then_enforce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,18 @@ def __init__(self, opt):

def pre_iter0(self):
global_toc(f"{self.__class__.__name__}: relaxing integrality constraints", self.opt.cylinder_rank == 0)
for s in self.opt.local_scenarios.values():
self.integer_relaxer.apply_to(s)
self._reverse_tokens = {}
for sname, s in self.opt.local_scenarios.items():
self._reverse_tokens[sname] = self.integer_relaxer.apply_to(s)
self._integers_relaxed = True

def _unrelax_integers(self):
for sub in self.opt.local_scenarios.values():
for sname, sub in self.opt.local_scenarios.items():
subproblem_solver = sub._solver_plugin
vlist = None
if is_persistent(subproblem_solver):
vlist = list(v for v,d in sub._relaxed_integer_vars[None].values())
self.integer_relaxer.apply_to(sub, options={"undo":True})
self.integer_relaxer.apply_to(sub, options={"reverse": self._reverse_tokens[sname]})
if is_persistent(subproblem_solver):
for v in vlist:
subproblem_solver.update_var(v)
Expand Down
4 changes: 2 additions & 2 deletions mpisppy/utils/nonant_sensitivities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def nonant_sensitivies(s):
for var in s.component_data_objects(pyo.Var):
solution_cache[var] = var._value
relax_int = pyo.TransformationFactory('core.relax_integer_vars')
relax_int.apply_to(s)
reverse_token = relax_int.apply_to(s)

assert hasattr(s, "_relaxed_integer_vars")

Expand Down Expand Up @@ -82,7 +82,7 @@ def nonant_sensitivies(s):
sensitivity = grad_vec_kkt_inv @ -e_x
nonant_sensis[ndn_i] = sensitivity

relax_int.apply_to(s, options={"undo":True})
relax_int.apply_to(s, options={"reverse": reverse_token})
assert not hasattr(s, "_relaxed_integer_vars")
del s.ipopt_zL_out
del s.ipopt_zU_out
Expand Down
Loading