From 271020792ba199d15fd74a82292c835ea1b6ff98 Mon Sep 17 00:00:00 2001 From: Robert Parker Date: Fri, 30 Jun 2023 14:14:36 -0600 Subject: [PATCH 1/3] clean up imports in implicit_functions.py --- .../algorithms/solvers/implicit_functions.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py b/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py index bec50bdfc53..f91feba2485 100644 --- a/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py +++ b/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py @@ -30,20 +30,16 @@ pyomo_nlp = attempt_import('pyomo.contrib.pynumero.interfaces.pyomo_nlp')[0] nlp_proj = attempt_import('pyomo.contrib.pynumero.interfaces.nlp_projections')[0] from pyomo.contrib.pynumero.algorithms.solvers.cyipopt_solver import CyIpoptSolver -from pyomo.contrib.pynumero.interfaces.cyipopt_interface import ( - cyipopt_available, - CyIpoptNLP, -) +from pyomo.contrib.pynumero.interfaces.cyipopt_interface import CyIpoptNLP from pyomo.contrib.pynumero.algorithms.solvers.scipy_solvers import ( FsolveNlpSolver, - RootNlpSolver, NewtonNlpSolver, SecantNewtonNlpSolver, ) -from pyomo.contrib.incidence_analysis.interface import get_structural_incidence_matrix -from pyomo.contrib.incidence_analysis.matching import maximum_matching from pyomo.contrib.incidence_analysis import IncidenceGraphInterface -from pyomo.contrib.incidence_analysis.util import generate_strongly_connected_components +from pyomo.contrib.incidence_analysis.scc_solver import ( + generate_strongly_connected_components +) class NlpSolverBase(object): From 84c1a2a308ec638edb7f45e97cac008e939e21c2 Mon Sep 17 00:00:00 2001 From: Robert Parker Date: Fri, 30 Jun 2023 14:17:52 -0600 Subject: [PATCH 2/3] trailing comma in import --- pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py b/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py index f91feba2485..ef3abd63b38 100644 --- a/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py +++ b/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py @@ -38,7 +38,7 @@ ) from pyomo.contrib.incidence_analysis import IncidenceGraphInterface from pyomo.contrib.incidence_analysis.scc_solver import ( - generate_strongly_connected_components + generate_strongly_connected_components, ) From 688668bc76180279cd66e1ecf6cfdf7d76097eed Mon Sep 17 00:00:00 2001 From: Robert Parker Date: Fri, 30 Jun 2023 14:20:19 -0600 Subject: [PATCH 3/3] remove more unusd imports --- .../contrib/pynumero/algorithms/solvers/implicit_functions.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py b/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py index ef3abd63b38..e0bc0170d33 100644 --- a/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py +++ b/pyomo/contrib/pynumero/algorithms/solvers/implicit_functions.py @@ -9,13 +9,9 @@ # This software is distributed under the 3-clause BSD License. # ___________________________________________________________________________ -from collections import namedtuple - from pyomo.common.collections import ComponentSet, ComponentMap from pyomo.common.timing import HierarchicalTimer from pyomo.common.dependencies import attempt_import, numpy as np -from pyomo.core.base.constraint import Constraint -from pyomo.core.base.var import Var from pyomo.core.base.objective import Objective from pyomo.core.base.suffix import Suffix from pyomo.core.expr.visitor import identify_variables