Avoid ReshapedArray error when contiguous_axis is nothing and fix dense_dims (#307)

Author: Tokazama

Project.toml

@@ -1,6 +1,6 @@
 name = "ArrayInterface"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "6.0.15"
+version = "6.0.16"
 
 [deps]
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"

src/stridelayout.jl

@@ -164,7 +164,8 @@ function contiguous_axis(::Type{T}) where {T<:PermutedDimsArray}
     end
 end
 function contiguous_axis(::Type{<:Base.ReshapedArray{T, N, A, Tuple{}}}) where {T, N, A}
-    if isone(-contiguous_axis(A))
+    c = contiguous_axis(A)
+    if c !== nothing && isone(-c)
         return StaticInt(-1)
     elseif dynamic(is_column_major(A) & is_dense(A))
         return StaticInt(1)
@@ -455,9 +456,17 @@ _dense_dims(::Type{S}, ::Nothing, ::Val{R}) where {R,N,NP,T,A<:AbstractArray{T,N
     end
 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}())
+function dense_dims(T::Type{<:Base.ReshapedArray})
+    d = dense_dims(parent_type(T))
+    if d === nothing
+        return nothing
+    elseif all(d)
+        return n_of_x(StaticInt(ndims(T)), True())
+    else
+        return n_of_x(StaticInt(ndims(T)), False())
+    end
 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()
@@ -466,19 +475,6 @@ _is_dense(t::Tuple{True}) = True()
 _is_dense(t::Tuple{}) = True()
 _is_dense(::Nothing) = False()
 
-
-_reshaped_dense_dims(_, __, ___, ____) = nothing
-function _reshaped_dense_dims(dense::Tuple, ::True, ::Val{N}, ::Val{0}) where {N}
-    if all(dense)
-        return _all_dense(Val{N}())
-    else
-        return nothing
-    end
-end
-function _reshaped_dense_dims(dense::Tuple{Static.False}, ::True, ::Val{N}, ::Val{0}) where {N}
-    return return ntuple(_ -> False(), Val{N}())
-end
-
 """
     known_strides(::Type{T}) -> Tuple
     known_strides(::Type{T}, dim) -> Union{Int,Nothing}

test/stridelayout.jl

@@ -160,6 +160,7 @@ end
     @test @inferred(ArrayInterface.contiguous_axis((3,4))) === StaticInt(1)
     @test @inferred(ArrayInterface.contiguous_axis(rand(4)')) === StaticInt(2)
     @test @inferred(ArrayInterface.contiguous_axis(view(@view(PermutedDimsArray(A,(3,1,2))[2:3,2,:])', :, 1)')) === StaticInt(-1)
+    @test @inferred(ArrayInterface.contiguous_axis(reshape(DummyZeros(3,4), (4, 3)))) === nothing
     @test @inferred(ArrayInterface.contiguous_axis(DummyZeros(3,4))) === nothing
     @test @inferred(ArrayInterface.contiguous_axis(PermutedDimsArray(DummyZeros(3,4), (2, 1)))) === nothing
     @test @inferred(ArrayInterface.contiguous_axis(view(DummyZeros(3,4), 1, :))) === nothing
@@ -259,6 +260,7 @@ end
     @test @inferred(ArrayInterface.dense_dims(@view(PermutedDimsArray(A,(3,1,2))[:,1:2,1])')) == (true,false)
     @test @inferred(ArrayInterface.dense_dims(@view(PermutedDimsArray(A,(3,1,2))[2:3,:,[1,2]]))) == (false,true,false)
     @test @inferred(ArrayInterface.dense_dims(@view(PermutedDimsArray(A,(3,1,2))[2:3,[1,2,3],:]))) == (false,false,false)
+    @test @inferred(ArrayInterface.dense_dims(reshape(view(randn(10, 10, 10), 3, :, :), 1, 100))) == (false, false)
     # TODO Currently Wrapper can't function the same as Array because Array can change
     # the dimensions on reshape. We should be rewrapping the result in `Wrapper` but we
     # first need to develop a standard method for reconstructing arrays