Change to ArrayInterfaceCore

Author: ChrisRackauckas

Project.toml

@@ -5,7 +5,7 @@ version = "8.11.6"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
-ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
+ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -45,7 +45,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
 AbstractTrees = "0.3"
-ArrayInterface = "3.1.39, 4, 5"
+ArrayInterfaceCore = "0.1.1"
 Combinatorics = "1"
 ConstructionBase = "1"
 DataStructures = "0.17, 0.18"

src/ModelingToolkit.jl

@@ -8,7 +8,7 @@ using DiffEqBase, SciMLBase, Reexport
 using Distributed
 using StaticArrays, LinearAlgebra, SparseArrays, LabelledArrays
 using InteractiveUtils
-using Latexify, Unitful, ArrayInterface
+using Latexify, Unitful, ArrayInterfaceCore
 using MacroTools
 @reexport using UnPack
 using Setfield, ConstructionBase

src/systems/diffeqs/abstractodesystem.jl

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

src/systems/diffeqs/modelingtoolkitize.jl

@@ -13,10 +13,10 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem; kwargs...)
 
     _vars = define_vars(prob.u0,t)
 
-    vars = prob.u0 isa Number ? _vars : ArrayInterface.restructure(prob.u0,_vars)
+    vars = prob.u0 isa Number ? _vars : ArrayInterfaceCore.restructure(prob.u0,_vars)
     params = if has_p
         _params = define_params(p)
-        p isa Number ? _params[1] : (p isa Tuple || p isa NamedTuple ? _params : ArrayInterface.restructure(p,_params))
+        p isa Number ? _params[1] : (p isa Tuple || p isa NamedTuple ? _params : ArrayInterfaceCore.restructure(p,_params))
     else
         []
     end
@@ -41,7 +41,7 @@ function modelingtoolkitize(prob::DiffEqBase.ODEProblem; kwargs...)
     end
 
     if DiffEqBase.isinplace(prob)
-        rhs = ArrayInterface.restructure(prob.u0,similar(vars, Num))
+        rhs = ArrayInterfaceCore.restructure(prob.u0,similar(vars, Num))
         prob.f(rhs, vars, params, t)
     else
         rhs = prob.f(vars, params, t)
@@ -119,10 +119,10 @@ function modelingtoolkitize(prob::DiffEqBase.SDEProblem; kwargs...)
 
     _vars = define_vars(prob.u0,t)
 
-    vars = prob.u0 isa Number ? _vars : ArrayInterface.restructure(prob.u0,_vars)
+    vars = prob.u0 isa Number ? _vars : ArrayInterfaceCore.restructure(prob.u0,_vars)
     params = if has_p
         _params = define_params(p)
-        p isa Number ? _params[1] : (p isa Tuple || p isa NamedTuple ? _params : ArrayInterface.restructure(p,_params))
+        p isa Number ? _params[1] : (p isa Tuple || p isa NamedTuple ? _params : ArrayInterfaceCore.restructure(p,_params))
     else
         []
     end

src/systems/diffeqs/sdesystem.jl

@@ -244,7 +244,7 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = states(sys), ps = par
     end
 
     M = calculate_massmatrix(sys)
-    _M = (u0 === nothing || M == I) ? M : ArrayInterface.restructure(u0 .* u0',M)
+    _M = (u0 === nothing || M == I) ? M : ArrayInterfaceCore.restructure(u0 .* u0',M)
 
     sts = states(sys)
     SDEFunction{iip}(f,g,
@@ -309,7 +309,7 @@ function SDEFunctionExpr{iip}(sys::SDESystem, dvs = states(sys),
 
     M = calculate_massmatrix(sys)
 
-    _M = (u0 === nothing || M == I) ? M : ArrayInterface.restructure(u0 .* u0',M)
+    _M = (u0 === nothing || M == I) ? M : ArrayInterfaceCore.restructure(u0 .* u0',M)
 
     ex = quote
         f = $f

src/systems/nonlinear/modelingtoolkitize.jl

@@ -9,16 +9,16 @@ 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 : ArrayInterface.restructure(prob.u0, _vars)
+    vars = prob.u0 isa Number ? _vars : ArrayInterfaceCore.restructure(prob.u0, _vars)
     params = if has_p
         _params = define_params(p)
-        p isa Number ? _params[1] : (p isa Tuple || p isa NamedTuple ? _params : ArrayInterface.restructure(p, _params))
+        p isa Number ? _params[1] : (p isa Tuple || p isa NamedTuple ? _params : ArrayInterfaceCore.restructure(p, _params))
     else
         []
     end
 
     if DiffEqBase.isinplace(prob)
-        rhs = ArrayInterface.restructure(prob.u0, similar(vars, Num))
+        rhs = ArrayInterfaceCore.restructure(prob.u0, similar(vars, Num))
         prob.f(rhs, vars, params)
     else
         rhs = prob.f(vars, params)