Merge pull request #124 from SciML/core

Use ArrayInterfaceCore

Project.toml

@@ -1,10 +1,10 @@
 name = "LabelledArrays"
 uuid = "2ee39098-c373-598a-b85f-a56591580800"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "1.11.0"
+version = "1.11.1"
 
 [deps]
-ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
+ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
 ArrayInterfaceStaticArrays = "b0d46f97-bff5-4637-a19a-dd75974142cd"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -14,7 +14,7 @@ PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
 RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
 
 [compat]
-ArrayInterface = "2.8, 3.0, 4, 5, 6"
+ArrayInterfaceCore = "0.1.13"
 ArrayInterfaceStaticArrays = "0.1"
 ChainRulesCore = "1"
 MacroTools = "0.5"

src/LabelledArrays.jl

@@ -1,6 +1,6 @@
 module LabelledArrays
 
-using LinearAlgebra, StaticArrays, ArrayInterface
+using LinearAlgebra, StaticArrays, ArrayInterfaceCore
 import RecursiveArrayTools, PreallocationTools
 
 include("slarray.jl")
@@ -59,10 +59,10 @@ end
 Base.NamedTuple(x::Union{LArray, SLArray}) = NamedTuple{symnames(typeof(x))}(x.__x)
 @inline Base.reshape(a::SLArray, s::Size) = StaticArrays.similar_type(a, s)(Tuple(a))
 
-function ArrayInterface.ismutable(::Type{<:LArray{T, N, Syms}}) where {T, N, Syms}
-    ArrayInterface.ismutable(T)
+function ArrayInterfaceCore.ismutable(::Type{<:LArray{T, N, Syms}}) where {T, N, Syms}
+    ArrayInterfaceCore.ismutable(T)
 end
-ArrayInterface.can_setindex(::Type{<:SLArray}) = false
+ArrayInterfaceCore.can_setindex(::Type{<:SLArray}) = false
 
 function PreallocationTools.get_tmp(dc::PreallocationTools.DiffCache,
                                     u::LArray{T, N, D, Syms}) where {T, N, D, Syms}

src/larray.jl

@@ -142,9 +142,10 @@ function Base.convert(::Type{AbstractArray{T, N}},
 end
 Base.convert(::Type{AbstractArray{T, N}}, x::LArray{T, N}) where {T, N} = x
 
-function ArrayInterface.restructure(x::LArray{T, N, D, Syms},
-                                    y::LArray{T2, N2, D2, Syms}) where {T, N, D, T2, N2, D2,
-                                                                        Syms}
+function ArrayInterfaceCore.restructure(x::LArray{T, N, D, Syms},
+                                        y::LArray{T2, N2, D2, Syms}) where {T, N, D, T2, N2,
+                                                                            D2,
+                                                                            Syms}
     reshape(y, size(x)...)
 end