Merge pull request #626 from AayushSabharwal/as/indexing-rework

fix: use SII instead of explicitly accessing SciMLFunction.syms
SciML · Dec 14, 2023 · 5c01e51 · 5c01e51
2 parents aeaae4d + 50e1e9e
commit 5c01e51
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -17,6 +17,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
 
 [weakdeps]
@@ -61,6 +62,7 @@ ReverseDiff = "1"
 SciMLBase = "1.79.0, 2"
 SparseArrays = "1"
 SparseDiffTools = "2"
+SymbolicIndexingInterface = "0.3"
 Symbolics = "5"
 TerminalLoggers = "0.1"
 Tracker = "0.2"

diff --git a/lib/OptimizationMOI/src/nlp.jl b/lib/OptimizationMOI/src/nlp.jl
@@ -85,7 +85,7 @@ function SciMLBase.get_syms(sol::SciMLBase.OptimizationSolution{
     C <:
     MOIOptimizationNLPCache,
 }
-    sol.cache.evaluator.f.syms
+    variable_symbols(sol.cache.evaluator.f)
 end
 function SciMLBase.get_paramsyms(sol::SciMLBase.OptimizationSolution{
     T,
@@ -99,7 +99,7 @@ function SciMLBase.get_paramsyms(sol::SciMLBase.OptimizationSolution{
     C <:
     MOIOptimizationNLPCache,
 }
-    sol.cache.evaluator.f.paramsyms
+    parameter_symbols(sol.cache.evaluator.f)
 end
 
 function MOIOptimizationNLPCache(prob::OptimizationProblem,

diff --git a/src/Optimization.jl b/src/Optimization.jl
@@ -13,6 +13,7 @@ end
 
 using Logging, ProgressLogging, ConsoleProgressMonitor, TerminalLoggers, LoggingExtras
 using ArrayInterface, Base.Iterators, SparseArrays, LinearAlgebra
+using SymbolicIndexingInterface
 using Pkg
 
 import SciMLBase: OptimizationProblem, OptimizationFunction, ObjSense,

diff --git a/src/function.jl b/src/function.jl
@@ -68,7 +68,7 @@ function instantiate_function(f, x, ::SciMLBase.NoAD,
         cons_jac_prototype = cons_jac_prototype,
         cons_hess_prototype = cons_hess_prototype,
         expr = expr, cons_expr = cons_expr,
-        syms = f.syms, paramsyms = f.paramsyms,
+        sys = f.sys,
         observed = f.observed)
 end
 
@@ -97,7 +97,7 @@ function instantiate_function(f, cache::ReInitCache, ::SciMLBase.NoAD,
         cons_jac_prototype = cons_jac_prototype,
         cons_hess_prototype = cons_hess_prototype,
         expr = expr, cons_expr = cons_expr,
-        syms = f.syms, paramsyms = f.paramsyms,
+        sys = f.sys,
         observed = f.observed)
 end
 

diff --git a/test/Project.toml b/test/Project.toml
@@ -32,7 +32,7 @@ ComponentArrays = ">= 0.13.9"
 DiffEqFlux = ">= 2"
 Enzyme = ">= 0.11.0"
 FiniteDiff = ">= 2.8.1"
-Flux = "0.13"
+Flux = "0.13, 0.14"
 ForwardDiff = ">= 0.10.19"
 IterTools = ">= 1.3.0"
 Lux = ">= 0.4.50"