Merge branch 'main' into finalize-release-6.9.5

Author: mrmundt

pyomo/contrib/solver/plugins.py

@@ -14,6 +14,7 @@
 from .solvers.ipopt import Ipopt, LegacyIpoptSolver
 from .solvers.gurobi_persistent import GurobiPersistent
 from .solvers.gurobi_direct import GurobiDirect
+from .solvers.gurobi_direct_minlp import GurobiDirectMINLP
 from .solvers.highs import Highs
 from .solvers.knitro.direct import KnitroDirectSolver
 
@@ -32,6 +33,11 @@ def load():
         legacy_name="gurobi_direct_v2",
         doc="Direct (scipy-based) interface to Gurobi",
     )(GurobiDirect)
+    SolverFactory.register(
+        name='gurobi_direct_minlp',
+        legacy_name='gurobi_direct_minlp',
+        doc='Direct interface to Gurobi accommodating general MINLP',
+    )(GurobiDirectMINLP)
     SolverFactory.register(
         name="highs", legacy_name="highs", doc="Persistent interface to HiGHS"
     )(Highs)

pyomo/contrib/solver/solvers/gurobi_direct.py

@@ -117,7 +117,7 @@ def load_vars(self, vars_to_load=None, solution_number=0):
         if self._grb_model.SolCount == 0:
             raise NoSolutionError()
 
-        iterator = zip(self._pyo_vars, self._grb_vars.x.tolist())
+        iterator = zip(self._pyo_vars, map(operator.attrgetter('x'), self._grb_vars))
         if vars_to_load:
             vars_to_load = ComponentSet(vars_to_load)
             iterator = filter(lambda var_val: var_val[0] in vars_to_load, iterator)
@@ -130,7 +130,7 @@ def get_primals(self, vars_to_load=None, solution_number=0):
         if self._grb_model.SolCount == 0:
             raise NoSolutionError()
 
-        iterator = zip(self._pyo_vars, self._grb_vars.x.tolist())
+        iterator = zip(self._pyo_vars, map(operator.attrgetter('x'), self._grb_vars))
         if vars_to_load:
             vars_to_load = ComponentSet(vars_to_load)
             iterator = filter(lambda var_val: var_val[0] in vars_to_load, iterator)
@@ -143,24 +143,26 @@ def get_duals(self, cons_to_load=None):
         def dedup(_iter):
             last = None
             for con_info_dual in _iter:
-                if not con_info_dual[1] and con_info_dual[0][0] is last:
+                if not con_info_dual[1] and con_info_dual[0] is last:
                     continue
-                last = con_info_dual[0][0]
+                last = con_info_dual[0]
                 yield con_info_dual
 
-        iterator = dedup(zip(self._pyo_cons, self._grb_cons.getAttr('Pi').tolist()))
+        iterator = dedup(
+            zip(self._pyo_cons, map(operator.attrgetter('Pi'), self._grb_cons))
+        )
         if cons_to_load:
             cons_to_load = set(cons_to_load)
             iterator = filter(
-                lambda con_info_dual: con_info_dual[0][0] in cons_to_load, iterator
+                lambda con_info_dual: con_info_dual[0] in cons_to_load, iterator
             )
-        return {con_info[0]: dual for con_info, dual in iterator}
+        return {con_info: dual for con_info, dual in iterator}
 
     def get_reduced_costs(self, vars_to_load=None):
         if self._grb_model.Status != gurobipy.GRB.OPTIMAL:
             raise NoReducedCostsError()
 
-        iterator = zip(self._pyo_vars, self._grb_vars.getAttr('Rc').tolist())
+        iterator = zip(self._pyo_vars, map(operator.attrgetter('Rc'), self._grb_vars))
         if vars_to_load:
             vars_to_load = ComponentSet(vars_to_load)
             iterator = filter(lambda var_rc: var_rc[0] in vars_to_load, iterator)
@@ -374,7 +376,12 @@ def solve(self, model, **kwds) -> Results:
             timer,
             config,
             GurobiDirectSolutionLoader(
-                gurobi_model, A, x, repn.rows, repn.columns, repn.objectives
+                gurobi_model,
+                A,
+                x.tolist(),
+                list(map(operator.itemgetter(0), repn.rows)),
+                repn.columns,
+                repn.objectives,
             ),
         )