Merge pull request #2090 from SciML/arrayinterface

Update to ArrayInterface v7

Author: ChrisRackauckas

Project.toml

@@ -5,7 +5,7 @@ version = "8.47.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
-ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
+ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
@@ -48,7 +48,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
 AbstractTrees = "0.3, 0.4"
-ArrayInterfaceCore = "0.1.1"
+ArrayInterface = "6, 7"
 Combinatorics = "1"
 Compat = "3.42, 4"
 ConstructionBase = "1"

src/ModelingToolkit.jl

@@ -10,7 +10,7 @@ using SciMLBase: StandardODEProblem, StandardNonlinearProblem, handle_varmap
 using Distributed
 using StaticArrays, LinearAlgebra, SparseArrays, LabelledArrays
 using InteractiveUtils
-using Latexify, Unitful, ArrayInterfaceCore
+using Latexify, Unitful, ArrayInterface
 using MacroTools
 @reexport using UnPack
 using Setfield, ConstructionBase

src/systems/diffeqs/abstractodesystem.jl

@@ -329,7 +329,7 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem, dvs = s
     elseif u0 === nothing || M === I
         M
     else
-        ArrayInterfaceCore.restructure(u0 .* u0', M)
+        ArrayInterface.restructure(u0 .* u0', M)
     end
 
     obs = observed(sys)
@@ -548,7 +548,7 @@ function ODEFunctionExpr{iip}(sys::AbstractODESystem, dvs = states(sys),
     elseif u0 === nothing || M === I
         M
     else
-        ArrayInterfaceCore.restructure(u0 .* u0', M)
+        ArrayInterface.restructure(u0 .* u0', M)
     end
 
     jp_expr = sparse ? :($similar($(get_jac(sys)[]), Float64)) : :nothing

src/systems/diffeqs/modelingtoolkitize.jl

@@ -13,12 +13,12 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem; kwargs...)
 
     _vars = define_vars(prob.u0, t)
 
-    vars = prob.u0 isa Number ? _vars : ArrayInterfaceCore.restructure(prob.u0, _vars)
+    vars = prob.u0 isa Number ? _vars : ArrayInterface.restructure(prob.u0, _vars)
     params = if has_p
         _params = define_params(p)
         p isa Number ? _params[1] :
         (p isa Tuple || p isa NamedTuple || p isa AbstractDict ? _params :
-         ArrayInterfaceCore.restructure(p, _params))
+         ArrayInterface.restructure(p, _params))
     else
         []
     end
@@ -43,7 +43,7 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem; kwargs...)
     end
 
     if DiffEqBase.isinplace(prob)
-        rhs = ArrayInterfaceCore.restructure(prob.u0, similar(vars, Num))
+        rhs = ArrayInterface.restructure(prob.u0, similar(vars, Num))
         fill!(rhs, 0)
         if prob.f isa ODEFunction &&
            prob.f.f isa FunctionWrappersWrappers.FunctionWrappersWrapper
@@ -168,12 +168,12 @@ function modelingtoolkitize(prob::DiffEqBase.SDEProblem; kwargs...)
 
     _vars = define_vars(prob.u0, t)
 
-    vars = prob.u0 isa Number ? _vars : ArrayInterfaceCore.restructure(prob.u0, _vars)
+    vars = prob.u0 isa Number ? _vars : ArrayInterface.restructure(prob.u0, _vars)
     params = if has_p
         _params = define_params(p)
         p isa Number ? _params[1] :
         (p isa Tuple || p isa NamedTuple ? _params :
-         ArrayInterfaceCore.restructure(p, _params))
+         ArrayInterface.restructure(p, _params))
     else
         []
     end

src/systems/diffeqs/sdesystem.jl

@@ -436,7 +436,7 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = states(sys),
     end
 
     M = calculate_massmatrix(sys)
-    _M = (u0 === nothing || M == I) ? M : ArrayInterfaceCore.restructure(u0 .* u0', M)
+    _M = (u0 === nothing || M == I) ? M : ArrayInterface.restructure(u0 .* u0', M)
 
     obs = observed(sys)
     observedfun = let sys = sys, dict = Dict()
@@ -527,7 +527,7 @@ function SDEFunctionExpr{iip}(sys::SDESystem, dvs = states(sys),
 
     M = calculate_massmatrix(sys)
 
-    _M = (u0 === nothing || M == I) ? M : ArrayInterfaceCore.restructure(u0 .* u0', M)
+    _M = (u0 === nothing || M == I) ? M : ArrayInterface.restructure(u0 .* u0', M)
 
     ex = quote
         f = $f

src/systems/nonlinear/modelingtoolkitize.jl

@@ -9,18 +9,18 @@ function modelingtoolkitize(prob::NonlinearProblem; kwargs...)
 
     _vars = reshape([variable(:x, i) for i in eachindex(prob.u0)], size(prob.u0))
 
-    vars = prob.u0 isa Number ? _vars : ArrayInterfaceCore.restructure(prob.u0, _vars)
+    vars = prob.u0 isa Number ? _vars : ArrayInterface.restructure(prob.u0, _vars)
     params = if has_p
         _params = define_params(p)
         p isa Number ? _params[1] :
         (p isa Tuple || p isa NamedTuple ? _params :
-         ArrayInterfaceCore.restructure(p, _params))
+         ArrayInterface.restructure(p, _params))
     else
         []
     end
 
     if DiffEqBase.isinplace(prob)
-        rhs = ArrayInterfaceCore.restructure(prob.u0, similar(vars, Num))
+        rhs = ArrayInterface.restructure(prob.u0, similar(vars, Num))
         prob.f(rhs, vars, params)
     else
         rhs = prob.f(vars, params)

src/systems/optimization/modelingtoolkitize.jl

@@ -11,10 +11,10 @@ function modelingtoolkitize(prob::DiffEqBase.OptimizationProblem; kwargs...)
         p = prob.p
     end
 
-    vars = ArrayInterfaceCore.restructure(prob.u0,
+    vars = ArrayInterface.restructure(prob.u0,
                                           [variable(:x, i) for i in eachindex(prob.u0)])
     params = p isa DiffEqBase.NullParameters ? [] :
-             ArrayInterfaceCore.restructure(p, [variable(:α, i) for i in eachindex(p)])
+             ArrayInterface.restructure(p, [variable(:α, i) for i in eachindex(p)])
 
     eqs = prob.f(vars, params)