remove ambiguities, fix broken test

JuliaSIMD · Jun 15, 2022 · 6cfb3b0 · 6cfb3b0 · chriselrod · Jun 15, 2022
1 parent ac943fa
commit 6cfb3b0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/ptr_array.jl b/src/ptr_array.jl
@@ -309,19 +309,13 @@ end
 end
 @inline Base.axes(A::AbstractStrideArray, i::Integer) = axes(A, i)
 
-@inline function ArrayInterface.size(A::AbstractStrideVector, i::Integer)
-  d = Int(length(A))
-  ifelse(isone(i), d, one(d))
-end
 @inline function ArrayInterface.size(A::AbstractStrideVector, i::Int)
   d = Int(length(A))
   ifelse(isone(i), d, one(d))
 end
 @inline ArrayInterface.size(::AbstractStrideVector, ::StaticInt{N}) where {N} = One()
 @inline ArrayInterface.size(A::AbstractStrideVector, ::StaticInt{1}) = length(A)
 @inline ArrayInterface.size(A::AbstractStrideArray, ::StaticInt{N}) where {N} = size(A)[N]
-@inline ArrayInterface.size(A::AbstractStrideArray, i::Integer) =
-  type_stable_select(size(A), i)
 @inline ArrayInterface.size(A::AbstractStrideArray, i::Int) = type_stable_select(size(A), i)
 @inline Base.size(A::AbstractStrideArray, i::Integer) = size(A, i)
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -277,7 +277,7 @@ allocated_cartesianindexsum(x) = @allocated cartesianindexsum(x)
   end
   @testset "views" begin
     B0 = reshape(collect(1:12), 3, 4)
-    B1 = StrideArray(A)
+    B1 = StrideArray(B0)
     @test view(B0, :, 4:-1:1) == view(B1, :, 4:-1:1)
     @test view(B0, :, 1:2:4) == view(B1, :, 1:2:4)
     A = StrideArray{Float64}(undef, (100, 100)) .= rand.()