Skip to content
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

Jump to bottom

Remove deprecated gurobipy addConstr call #3350

Merged
merged 11 commits into from
Aug 28, 2024
Merged

Remove deprecated gurobipy addConstr call #3350

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
02d2dd2
remove deprecated addConstr call
quantresearch1 Aug 18, 2024
b72310a
remove unused import in gurobi_direct
quantresearch1 Aug 18, 2024
d1aa3c0
implement jsiirola's suggestion
quantresearch1 Aug 20, 2024
cf23302
Merge branch 'main' into gurobipy_addconstr_deprecated
quantresearch1 Aug 20, 2024
eee27c4
Merge branch 'main' into gurobipy_addconstr_deprecated
blnicho Aug 20, 2024
5bfdcae
fix unit tests after adding _addConstr
quantresearch1 Aug 20, 2024
d6573a4
Merge branch 'gurobipy_addconstr_deprecated' of https://github.com/qu…
quantresearch1 Aug 20, 2024
bfdd222
Merge branch 'main' into gurobipy_addconstr_deprecated
quantresearch1 Aug 20, 2024
6dce762
fix laxy constraint issue after changing _get_expr_from_pyomo_expr
quantresearch1 Aug 21, 2024
903dd2b
Merge branch 'main' into gurobipy_addconstr_deprecated
quantresearch1 Aug 22, 2024
79f4954
Merge branch 'main' into gurobipy_addconstr_deprecated
jsiirola Aug 22, 2024
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
45 changes: 27 additions & 18 deletions pyomo/solvers/plugins/solvers/gurobi_direct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
from pyomo.opt.results.solver import TerminationCondition, SolverStatus
from pyomo.opt.base import SolverFactory
from pyomo.core.base.suffix import Suffix
import pyomo.core.base.var


logger = logging.getLogger('pyomo.solvers')
Expand Down Expand Up @@ -308,7 +307,7 @@ def _get_expr_from_pyomo_repn(self, repn, max_degree=2):

new_expr += repn.constant

return new_expr, referenced_vars
return new_expr, referenced_vars, degree

def _get_expr_from_pyomo_expr(self, expr, max_degree=2):
if max_degree == 2:
Expand All @@ -317,15 +316,15 @@ def _get_expr_from_pyomo_expr(self, expr, max_degree=2):
repn = generate_standard_repn(expr, quadratic=False)

try:
gurobi_expr, referenced_vars = self._get_expr_from_pyomo_repn(
gurobi_expr, referenced_vars, degree = self._get_expr_from_pyomo_repn(
repn, max_degree
)
except DegreeError as e:
msg = e.args[0]
msg += '\nexpr: {0}'.format(expr)
raise DegreeError(msg)

return gurobi_expr, referenced_vars
return gurobi_expr, referenced_vars, degree

def _gurobi_lb_ub_from_var(self, var):
if var.is_fixed():
Expand Down Expand Up @@ -404,10 +403,12 @@ def _create_model(self, model):
self._init_env()
if self._solver_model is not None:
self._solver_model.close()
if model.name is not None:
self._solver_model = gurobipy.Model(model.name, env=self._env)
else:
self._solver_model = gurobipy.Model(env=self._env)

self._solver_model = (
gurobipy.Model(model.name, env=self._env)
if model.name is not None
else gurobipy.Model(env=self._env)
)

def close(self):
"""Frees local Gurobi resources used by this solver instance.
Expand Down Expand Up @@ -489,6 +490,15 @@ def _set_instance(self, model, kwds={}):
def _add_block(self, block):
DirectOrPersistentSolver._add_block(self, block)

def _addConstr(self, degree, lhs, sense=None, rhs=None, name=""):
if degree == 1:
con = self._solver_model.addLConstr(lhs, sense, rhs, name)
elif degree == 2:
con = self._solver_model.addQConstr(lhs, sense, rhs, name)
else:
raise DegreeError('GurobiModel.addConstr: Unsupported degree: %s' % degree)
return con

def _add_constraint(self, con):
if not con.active:
return None
Expand All @@ -499,15 +509,11 @@ def _add_constraint(self, con):
conname = self._symbol_map.getSymbol(con, self._labeler)

if con._linear_canonical_form:
gurobi_expr, referenced_vars = self._get_expr_from_pyomo_repn(
gurobi_expr, referenced_vars, degree = self._get_expr_from_pyomo_repn(
con.canonical_form(), self._max_constraint_degree
)
# elif isinstance(con, LinearCanonicalRepn):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this commented block something that should be kept ? Happy to leave it as is to minimize the diff

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that is completely removable (looking back, I think LinearCanonicalRepn disappeared from Pyomo more than 7 years ago).

# gurobi_expr, referenced_vars = self._get_expr_from_pyomo_repn(
# con,
# self._max_constraint_degree)
else:
gurobi_expr, referenced_vars = self._get_expr_from_pyomo_expr(
gurobi_expr, referenced_vars, degree = self._get_expr_from_pyomo_expr(
con.body, self._max_constraint_degree
)

Expand All @@ -523,7 +529,8 @@ def _add_constraint(self, con):
)

if con.equality:
gurobipy_con = self._solver_model.addConstr(
gurobipy_con = self._addConstr(
degree=degree,
lhs=gurobi_expr,
sense=gurobipy.GRB.EQUAL,
rhs=value(con.lower),
Expand All @@ -535,14 +542,16 @@ def _add_constraint(self, con):
)
self._range_constraints.add(con)
elif con.has_lb():
gurobipy_con = self._solver_model.addConstr(
gurobipy_con = self._addConstr(
degree=degree,
lhs=gurobi_expr,
sense=gurobipy.GRB.GREATER_EQUAL,
rhs=value(con.lower),
name=conname,
)
elif con.has_ub():
gurobipy_con = self._solver_model.addConstr(
gurobipy_con = self._addConstr(
degree=degree,
lhs=gurobi_expr,
sense=gurobipy.GRB.LESS_EQUAL,
rhs=value(con.upper),
Expand Down Expand Up @@ -636,7 +645,7 @@ def _set_objective(self, obj):
else:
raise ValueError('Objective sense is not recognized: {0}'.format(obj.sense))

gurobi_expr, referenced_vars = self._get_expr_from_pyomo_expr(
gurobi_expr, referenced_vars, degree = self._get_expr_from_pyomo_expr(
obj.expr, self._max_obj_degree
)

Expand Down
Loading