MOI update and Project.toml

Author: Vaibhavdixit02

Project.toml

@@ -10,6 +10,7 @@ DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
+OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
@@ -18,51 +19,22 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
 
-[weakdeps]
-Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
-FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
-ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
-ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
-SparseDiffTools = "47a9eef4-7e08-11e9-0b38-333d64bd3804"
-Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
-Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
-Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
-
-[extensions]
-OptimizationEnzymeExt = "Enzyme"
-OptimizationFiniteDiffExt = "FiniteDiff"
-OptimizationForwardDiffExt = "ForwardDiff"
-OptimizationMTKExt = "ModelingToolkit"
-OptimizationReverseDiffExt = "ReverseDiff"
-OptimizationSparseDiffExt = ["SparseDiffTools", "Symbolics", "ReverseDiff"]
-OptimizationTrackerExt = "Tracker"
-OptimizationZygoteExt = "Zygote"
-
 [compat]
 ADTypes = "0.2.5"
 ArrayInterface = "7.6"
 ConsoleProgressMonitor = "0.1.1"
 DocStringExtensions = "0.9"
-Enzyme = "0.11.11"
-FiniteDiff = "2.12"
-ForwardDiff = "0.10.26"
 LinearAlgebra = "1.10"
 Logging = "1.10"
 LoggingExtras = "0.4, 1"
-ModelingToolkit = "8.74"
 Pkg = "1"
 Printf = "1.10"
 ProgressLogging = "0.1"
 Reexport = "1.2"
-ReverseDiff = "1.14"
 SciMLBase = "2.23.0"
 SparseArrays = "1.10"
-SparseDiffTools = "2.14"
 Symbolics = "5.12"
 TerminalLoggers = "0.1"
-Tracker = "0.2.29"
-Zygote = "0.6.67"
 julia = "1.9"
 
 [extras]

lib/OptimizationMOI/src/nlp.jl

@@ -21,7 +21,7 @@ mutable struct MOIOptimizationNLPEvaluator{T, F <: OptimizationFunction, RC, LB,
 end
 
 function Base.getproperty(evaluator::MOIOptimizationNLPEvaluator, x::Symbol)
-    if x in fieldnames(Optimization.ReInitCache)
+    if x in fieldnames(OptimizationBase.ReInitCache)
         return getfield(evaluator.reinit_cache, x)
     end
     return getfield(evaluator, x)
@@ -37,15 +37,15 @@ end
 function Base.getproperty(cache::MOIOptimizationNLPCache{E}, name::Symbol) where {E}
     if name in fieldnames(E)
         return getfield(cache.evaluator, name)
-    elseif name in fieldnames(Optimization.ReInitCache)
+    elseif name in fieldnames(OptimizationBase.ReInitCache)
         return getfield(cache.evaluator.reinit_cache, name)
     end
     return getfield(cache, name)
 end
 function Base.setproperty!(cache::MOIOptimizationNLPCache{E}, name::Symbol, x) where {E}
     if name in fieldnames(E)
         return setfield!(cache.evaluator, name, x)
-    elseif name in fieldnames(Optimization.ReInitCache)
+    elseif name in fieldnames(OptimizationBase.ReInitCache)
         return setfield!(cache.evaluator.reinit_cache, name, x)
     end
     return setfield!(cache, name, x)
@@ -110,7 +110,7 @@ function MOIOptimizationNLPCache(prob::OptimizationProblem,
         mtkize = false,
         callback = nothing,
         kwargs...)
-    reinit_cache = Optimization.ReInitCache(prob.u0, prob.p) # everything that can be changed via `reinit`
+    reinit_cache = OptimizationBase.ReInitCache(prob.u0, prob.p) # everything that can be changed via `reinit`
 
     num_cons = prob.ucons === nothing ? 0 : length(prob.ucons)
     f = Optimization.instantiate_function(prob.f, reinit_cache, prob.f.adtype, num_cons)

src/Optimization.jl

@@ -5,7 +5,7 @@ module Optimization
 
 using DocStringExtensions
 using Reexport
-@reexport using SciMLBase, ADTypes
+@reexport using SciMLBase, ADTypes, OptimizationBase
 
 if !isdefined(Base, :get_extension)
     using Requires
@@ -15,15 +15,13 @@ using Logging, ProgressLogging, ConsoleProgressMonitor, TerminalLoggers, Logging
 using ArrayInterface, Base.Iterators, SparseArrays, LinearAlgebra
 using Pkg
 
+import OptimizationBase: instantiate_function
 import SciMLBase: OptimizationProblem,
     OptimizationFunction, ObjSense,
     MaxSense, MinSense, OptimizationStats
 export ObjSense, MaxSense, MinSense
 
 include("utils.jl")
-include("function.jl")
-include("adtypes.jl")
-include("cache.jl")
 include("state.jl")
 
 export solve, OptimizationCache