diff --git a/lib/OptimizationIpopt/Project.toml b/lib/OptimizationIpopt/Project.toml index 0bf5a4f006..5c52f373fd 100644 --- a/lib/OptimizationIpopt/Project.toml +++ b/lib/OptimizationIpopt/Project.toml @@ -7,7 +7,6 @@ ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" -Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SciMLLogging = "a6db7da4-7206-11f0-1eab-35f2a5dbe1d1" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" @@ -23,7 +22,6 @@ ModelingToolkit = "11.32" OptimizationBase = "5.5.0" Pkg = "1" Random = "1.10" -Reexport = "1.2" ReverseDiff = "1" SafeTestsets = "0.1" SciMLBase = "3" diff --git a/lib/OptimizationIpopt/src/OptimizationIpopt.jl b/lib/OptimizationIpopt/src/OptimizationIpopt.jl index 972d506c7e..20176b25d9 100644 --- a/lib/OptimizationIpopt/src/OptimizationIpopt.jl +++ b/lib/OptimizationIpopt/src/OptimizationIpopt.jl @@ -1,17 +1,14 @@ module OptimizationIpopt -using Reexport # Not re-exported: the optimization API comes from `Optimization`/`OptimizationBase`, # which the user loads directly. This package's public surface is its own solvers. -using OptimizationBase -using Ipopt -using LinearAlgebra -using SparseArrays -using SciMLBase +using OptimizationBase: OptimizationBase, OptimizationCache +using Ipopt: Ipopt +using SparseArrays: SparseArrays, SparseMatrixCSC, findnz, nonzeros +using SciMLBase: SciMLBase, ReturnCode import ADTypes using SciMLLogging: @SciMLMessage import SciMLLogging -using SymbolicIndexingInterface export IpoptOptimizer diff --git a/lib/OptimizationIpopt/test/qa/qa.jl b/lib/OptimizationIpopt/test/qa/qa.jl index 4fccb219a9..4cd0ed08e9 100644 --- a/lib/OptimizationIpopt/test/qa/qa.jl +++ b/lib/OptimizationIpopt/test/qa/qa.jl @@ -4,9 +4,6 @@ using Test include(normpath(joinpath(@__DIR__, "..", "..", "..", "..", "test", "qa", "rendered_docs.jl"))) # ExplicitImports findings, all tracked against SciML/Optimization.jl: -# * no_implicit_imports broken: the module relies on `@reexport`/`using` -# module names (SciMLBase/OptimizationBase/Reexport/...) that cannot be made -# explicit without restructuring. # * the ignored *_are_public / *_via_owners names are owned by SciMLBase, # OptimizationBase, the backend, or Base and are not (yet) declared public; # the proper fix is upstream `public` declarations, not a local change. @@ -17,5 +14,4 @@ run_qa( all_qualified_accesses_via_owners = (; ignore = (:OptimizationStats,)), all_qualified_accesses_are_public = (; ignore = (Symbol("@logmsg"), :ApplicationReturnStatus, :Diverging_Iterates, :Feasible_Point_Found, :GetIpoptCurrentIterate, :Infeasible_Problem_Detected, :LogLevel, :Maximum_CpuTime_Exceeded, :Maximum_Iterations_Exceeded, :Maximum_WallTime_Exceeded, :OptimizationState, :OptimizationStats, :Search_Direction_Becomes_Too_Small, :Solve_Succeeded, :Solved_To_Acceptable_Level, :User_Requested_Stop, :__solve, :_check_and_convert_maxiters, :_check_and_convert_maxtime, :allowscallback, :instantiate_function, :requiresconshess, :requiresconsjac, :requiresgradient, :requireshessian, :requireslagh, :supports_sense)), ), - ei_broken = (:no_implicit_imports,), )