Merge branch 'master' into lazyarray-setindex

Author: jonniediegelman

.github/workflows/ci.yml

@@ -15,7 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.2'
           - '1.6'
           - '1.7'
           - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.

Project.toml

@@ -10,9 +10,10 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
+ArrayInterface = "6"
 ChainRulesCore = "0.8, 0.9, 0.10, 1"
 Requires = "1"
-julia = "1"
+julia = "1.6"
 
 [extras]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"

src/array_interface.jl

@@ -138,7 +138,6 @@ 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))
-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

src/show.jl

@@ -35,7 +35,7 @@ _print_type_short(io, ::Type{<:ComponentArray{T,N,<:SubArray}}; color=:normal) w
 _print_type_short(io, ::Type{<:ComponentArray{T,1,<:SubArray}}; color=:normal) where {T} = printstyled(io, "ComponentVector{$T,SubArray...}"; color=color)
 _print_type_short(io, ::Type{<:ComponentArray{T,2,<:SubArray}}; color=:normal) where {T} = printstyled(io, "ComponentMatrix{$T,SubArray...}"; color=color)
 
-@static if VERSION >= v"1.6"
+@static if v"1.6" ≤ VERSION < v"1.8"
     Base.print_type_stacktrace(io, CA::Type{<:ComponentArray}; color=:normal) = _print_type_short(io, CA; color=color)
 end