Merge pull request #216 from JuliaArrays/ReshapedArrayofadjiontvectors

Add some ReshapedArray of adjoint vector methods

Author: chriselrod

src/stridelayout.jl

@@ -151,6 +151,15 @@ function contiguous_axis(::Type{T}) where {T<:PermutedDimsArray}
         return from_parent_dims(T, c)
     end
 end
+function contiguous_axis(::Type{Base.ReshapedArray{T, 1, A, Tuple{}}}) where {T, A}
+  IfElse.ifelse(is_column_major(A) & is_dense(A), static(1), nothing)
+end
+function contiguous_axis(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Adjoint{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
+  IfElse.ifelse(is_column_major(A) & is_dense(A), static(1), nothing)
+end
+function contiguous_axis(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Transpose{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
+  IfElse.ifelse(is_column_major(A) & is_dense(A), static(1), nothing)
+end
 function contiguous_axis(::Type{T}) where {T<:SubArray}
     return _contiguous_axis(T, contiguous_axis(parent_type(T)))
 end
@@ -267,6 +276,16 @@ end
 function stride_rank(::Type{Base.ReshapedArray{T, N, P, Tuple{Vararg{Base.SignedMultiplicativeInverse{Int},M}}}}) where {T,N,P,M}
     _reshaped_striderank(is_column_major(P), Val{N}(), Val{M}())
 end
+function stride_rank(::Type{Base.ReshapedArray{T, 1, A, Tuple{}}}) where {T, A}
+    IfElse.ifelse(is_column_major(A) & is_dense(A), (static(1),), nothing)
+end
+function stride_rank(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Adjoint{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
+    IfElse.ifelse(is_dense(A), (static(1),), nothing)
+end
+function stride_rank(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Transpose{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
+    IfElse.ifelse(is_dense(A), (static(1),), nothing)
+end
+
 _reshaped_striderank(::True, ::Val{N}, ::Val{0}) where {N} = nstatic(Val(N))
 _reshaped_striderank(_, __, ___) = nothing
 
@@ -425,6 +444,14 @@ end
 function dense_dims(::Type{Base.ReshapedArray{T, N, P, Tuple{Vararg{Base.SignedMultiplicativeInverse{Int},M}}}}) where {T,N,P,M}
     return _reshaped_dense_dims(dense_dims(P), is_column_major(P), Val{N}(), Val{M}())
 end
+is_dense(A) = is_dense(typeof(A))
+is_dense(::Type{A}) where {A} = _is_dense(dense_dims(A))
+_is_dense(::Tuple{False,Vararg}) = False()
+_is_dense(t::Tuple{True,Vararg}) = _is_dense(Base.tail(t))
+_is_dense(t::Tuple{True}) = True()
+_is_dense(t::Tuple{}) = True()
+
+
 _reshaped_dense_dims(_, __, ___, ____) = nothing
 function _reshaped_dense_dims(dense::D, ::True, ::Val{N}, ::Val{0}) where {D,N}
     if all(dense)

test/array_index.jl

@@ -18,3 +18,10 @@ end
 @test @inferred(ArrayInterface.contiguous_axis(ArrayInterface.StrideIndex{2,(1,2),nothing,NTuple{2,Int},NTuple{2,Int}})) == nothing
 @test @inferred(ArrayInterface.stride_rank(ap_index)) == (1, 3)
 
+let v = Float64.(1:10)', v2 = transpose(parent(v))
+  sv = @view(v[1:5])'
+  sv2 = @view(v2[1:5])'
+  @test @inferred(ArrayInterface.StrideIndex(sv)) === @inferred(ArrayInterface.StrideIndex(sv2)) === ArrayInterface.StrideIndex{2, (2, 1), 2}((StaticInt(1), StaticInt(1)), (StaticInt(1), StaticInt(1)))
+  @test @inferred(ArrayInterface.stride_rank(parent(sv))) === @inferred(ArrayInterface.stride_rank(parent(sv2))) === (StaticInt(1),)
+end
+

test/runtests.jl

@@ -422,7 +422,10 @@ ArrayInterface.parent_type(::Type{DenseWrapper{T,N,P}}) where {T,N,P} = P
     @test @inferred(dense_dims(PermutedDimsArray(DummyZeros(3,4), (2, 1)))) === nothing
     @test @inferred(dense_dims(view(DummyZeros(3,4), :, 1))) === nothing
     @test @inferred(dense_dims(view(DummyZeros(3,4), :, 1)')) === nothing
+    @test @inferred(ArrayInterface.is_dense(A)) === @inferred(ArrayInterface.is_dense(A)) === @inferred(ArrayInterface.is_dense(PermutedDimsArray(A,(3,1,2)))) === @inferred(ArrayInterface.is_dense(Array{Float64,0}(undef))) === True()
+    @test @inferred(ArrayInterface.is_dense(@view(PermutedDimsArray(A,(3,1,2))[2:3,1:2,:]))) === @inferred(ArrayInterface.is_dense(@view(PermutedDimsArray(A,(3,1,2))[2:3,:,[1,2]]))) === @inferred(ArrayInterface.is_dense(@view(PermutedDimsArray(A,(3,1,2))[2:3,[1,2,3],:]))) === False()
 
+  
     C = Array{Int8}(undef, 2,2,2,2);
     doubleperm = PermutedDimsArray(PermutedDimsArray(C,(4,2,3,1)), (4,2,1,3));
     @test collect(strides(C))[collect(stride_rank(doubleperm))] == collect(strides(doubleperm))