Add indices_do_not_alias closes #140

Author: jonniedie

Project.toml

@@ -1,7 +1,7 @@
 name = "ComponentArrays"
 uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
 authors = ["Jonnie Diegelman <47193959+jonniedie@users.noreply.github.com>"]
-version = "0.12.0"
+version = "0.12.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -10,7 +10,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
-ArrayInterface = "2, 3, 4, 5, 6"
 ChainRulesCore = "0.8, 0.9, 0.10, 1"
 Requires = "1"
 julia = "1"

src/ComponentArrays.jl

@@ -1,8 +1,9 @@
 module ComponentArrays
 
 import ChainRulesCore
+import ArrayInterface
+import ArrayInterface.ArrayInterfaceCore
 
-using ArrayInterface
 using LinearAlgebra
 using Requires
 

src/array_interface.jl

@@ -12,6 +12,9 @@ Base.reinterpret(::Type{T}, x::ComponentArray, args...) where T = ComponentArray
 
 Base.reshape(A::AbstractArray, axs::NTuple{N,<:CombinedAxis}) where {N} = reshape(A, _array_axis.(axs))
 
+ArrayInterfaceCore.indices_do_not_alias(::Type{ComponentArray{T,N,A,Axes}}) where {T,N,A,Axes} = ArrayInterfaceCore.indices_do_not_alias(A)
+ArrayInterfaceCore.instances_do_not_alias(::Type{ComponentArray{T,N,A,Axes}}) where {T,N,A,Axes} = ArrayInterfaceCore.instances_do_not_alias(A)
+
 # Cats
 # TODO: Make this a little less copy-pastey
 function Base.hcat(x::AbstractComponentVecOrMat, y::AbstractComponentVecOrMat)
@@ -135,12 +138,12 @@ Base.pointer(x::ComponentArray{T,N,A,Axes}) where {T,N,A<:DenseArray,Axes} = poi
 Base.unsafe_convert(::Type{Ptr{T}}, x::ComponentArray{T,N,A,Axes}) where {T,N,A,Axes} = Base.unsafe_convert(Ptr{T}, getdata(x))
 
 Base.strides(x::ComponentArray) = strides(getdata(x))
-ArrayInterface.strides(A::ComponentArray) = ArrayInterface.strides(parent(A))
+ArrayInterfaceCore.strides(A::ComponentArray) = ArrayInterfaceCore.strides(parent(A))
 for f in [:device, :stride_rank, :contiguous_axis, :contiguous_batch_size, :dense_dims] 
     @eval ArrayInterface.$f(::Type{ComponentArray{T,N,A,Axes}}) where {T,N,A,Axes} = ArrayInterface.$f(A)
 end
 
 Base.stride(x::ComponentArray, k) = stride(getdata(x), k)
 Base.stride(x::ComponentArray, k::Int64) = stride(getdata(x), k)
 
-ArrayInterface.parent_type(::Type{ComponentArray{T,N,A,Axes}}) where {T,N,A,Axes} = A
+ArrayInterfaceCore.parent_type(::Type{ComponentArray{T,N,A,Axes}}) where {T,N,A,Axes} = A

src/linear_algebra.jl

@@ -1,5 +1,5 @@
 ## https://github.com/SciML/DifferentialEquations.jl/issues/849
-function ArrayInterface.lu_instance(x::ComponentMatrix)
+function ArrayInterfaceCore.lu_instance(x::ComponentMatrix)
     T = eltype(x)
     noUnitT = typeof(zero(T))
     luT = LinearAlgebra.lutype(noUnitT)

test/Project.toml

@@ -1,4 +1,5 @@
 [deps]
+ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
 ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"
 FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"

test/runtests.jl

@@ -22,8 +22,8 @@ sq_mat = collect(reshape(1:9, 3, 3))
 
 ca = ComponentArray(nt)
 ca_Float32 = ComponentArray{Float32}(nt)
-ca_MVector = ComponentArray{MVector{10}}(nt)
-ca_SVector = ComponentArray{SVector{10}}(nt)
+ca_MVector = ComponentArray{MVector{10, Float64}}(nt) # TODO: Deprecate these
+ca_SVector = ComponentArray{SVector{10, Float64}}(nt)
 ca_composed = ComponentArray(a = 1, b = ca)
 
 ca2 = ComponentArray(nt2)
@@ -596,6 +596,10 @@ end
     # Issue #100
     chol = cholesky(cmat + I)
     @test convert(Cholesky{Float32,Matrix{Float32}}, chol).factors isa Matrix{Float32}
+
+    # Issue #140
+    @test ComponentArrays.ArrayInterfaceCore.indices_do_not_alias(typeof(ca)) == true
+    @test ComponentArrays.ArrayInterfaceCore.instances_do_not_alias(typeof(ca)) == false
 end
 
 @testset "Autodiff" begin