Skip to content

Commit db2a4ff

Browse files
committed
More tests
1 parent 7971ec2 commit db2a4ff

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/stridelayout.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@ end
160160
function contiguous_axis(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Transpose{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
161161
IfElse.ifelse(is_column_major(A) & is_dense(A), static(1), nothing)
162162
end
163-
function stride_rank(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Transpose{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
164-
IfElse.ifelse(is_dense(A), (static(1),), nothing)
165-
end
166163
function contiguous_axis(::Type{T}) where {T<:SubArray}
167164
return _contiguous_axis(T, contiguous_axis(parent_type(T)))
168165
end
@@ -285,6 +282,9 @@ end
285282
function stride_rank(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Adjoint{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
286283
IfElse.ifelse(is_dense(A), (static(1),), nothing)
287284
end
285+
function stride_rank(::Type{Base.ReshapedArray{T, 1, LinearAlgebra.Transpose{T, A}, Tuple{}}}) where {T, A <: AbstractVector{T}}
286+
IfElse.ifelse(is_dense(A), (static(1),), nothing)
287+
end
288288

289289
_reshaped_striderank(::True, ::Val{N}, ::Val{0}) where {N} = nstatic(Val(N))
290290
_reshaped_striderank(_, __, ___) = nothing

test/array_index.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ end
2121
let v = Float64.(1:10)', v2 = transpose(parent(v))
2222
sv = @view(v[1:5])'
2323
sv2 = @view(v2[1:5])'
24-
@inferred(ArrayInterface.StrideIndex(sv)) === @inferred(ArrayInterface.StrideIndex(sv2)) === ArrayInterface.StrideIndex{2, (2, 1), 2}((StaticInt(1), StaticInt(1)), (StaticInt(1), StaticInt(1)))
24+
@test @inferred(ArrayInterface.StrideIndex(sv)) === @inferred(ArrayInterface.StrideIndex(sv2)) === ArrayInterface.StrideIndex{2, (2, 1), 2}((StaticInt(1), StaticInt(1)), (StaticInt(1), StaticInt(1)))
25+
@test @inferred(ArrayInterface.stride_rank(parent(sv))) === @inferred(ArrayInterface.stride_rank(parent(sv2))) === (StaticInt(1),)
2526
end
2627

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ ArrayInterface.parent_type(::Type{DenseWrapper{T,N,P}}) where {T,N,P} = P
422422
@test @inferred(dense_dims(PermutedDimsArray(DummyZeros(3,4), (2, 1)))) === nothing
423423
@test @inferred(dense_dims(view(DummyZeros(3,4), :, 1))) === nothing
424424
@test @inferred(dense_dims(view(DummyZeros(3,4), :, 1)')) === nothing
425-
@test @inferred(ArrayInterface.is_dense(A)) === @inferred(ArrayInterface.is_dense(A)) === @inferred(ArrayInterface.is_dense(PermutedDimsArray(A,(3,1,2)))) === True()
425+
@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()
426426
@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()
427427

428428

0 commit comments

Comments
 (0)