Int sizes + axes tests

JuliaArrays · Feb 15, 2021 · 93dd634 · 93dd634
1 parent b360be7
commit 93dd634
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/ArrayInterface.jl b/src/ArrayInterface.jl
@@ -775,14 +775,14 @@ include("stridelayout.jl")
 
 abstract type AbstractArray2{T,N} <: AbstractArray{T,N} end
 
-Base.size(A::AbstractArray2) = ArrayInterface.size(A)
-Base.size(A::AbstractArray2, dim) = ArrayInterface.size(A, dim)
+Base.size(A::AbstractArray2) = map(Int, ArrayInterface.size(A))
+Base.size(A::AbstractArray2, dim) = Int(ArrayInterface.size(A, dim))
 
 Base.axes(A::AbstractArray2) = ArrayInterface.axes(A)
 Base.axes(A::AbstractArray2, dim) = ArrayInterface.axes(A, dim)
 
-Base.strides(A::AbstractArray2) = ArrayInterface.strides(A)
-Base.strides(A::AbstractArray2, dim) = ArrayInterface.strides(A, dim)
+Base.strides(A::AbstractArray2) = map(Int, ArrayInterface.strides(A))
+Base.strides(A::AbstractArray2, dim) = Int(ArrayInterface.strides(A, dim))
 
 function Base.length(A::AbstractArray2)
     len = known_length(A)

diff --git a/src/axes.jl b/src/axes.jl
@@ -27,6 +27,7 @@ end
 Returns the type of the axes for `T`
 """
 axes_types(x) = axes_types(typeof(x))
+axes_types(::Type{T}) where {T<:Array} = Tuple{Vararg{OneTo{Int},ndims(T)}}
 function axes_types(::Type{T}) where {T}
     if parent_type(T) <: T
         return Tuple{Vararg{OptionallyStaticUnitRange{One,Int},ndims(T)}}

diff --git a/test/dimensions.jl b/test/dimensions.jl
@@ -108,6 +108,7 @@ val_has_dimnames(x) = Val(ArrayInterface.has_dimnames(x))
     @test @inferred(dimnames(view(x, :, :, :))) === (static(:x),static(:y), static(:_))
     @test @inferred(dimnames(view(x, :, 1, :))) === (static(:x), static(:_))
     @test @inferred(dimnames(x, ArrayInterface.One())) === static(:x)
+    @test @inferred(dimnames(parent(x), ArrayInterface.One())) === static(:_)
 end
 
 @testset "to_dims" begin
@@ -121,6 +122,7 @@ end
         @test @inferred(ArrayInterface.to_dims(x, (:y, :x))) == (2, 1)
         @test @inferred(ArrayInterface.to_dims(x, :x)) == 1
         @test @inferred(ArrayInterface.to_dims(x, :y)) == 2
+        @test_throws DimensionMismatch ArrayInterface.to_dims(x, static(:z))  # not found
         @test_throws DimensionMismatch ArrayInterface.to_dims(x, :z)  # not found
     end
 
@@ -140,6 +142,7 @@ end
     @test @inferred(ArrayInterface.size(y')) == (1, size(parent(x), 1))
     @test @inferred(axes(x, first(d))) == axes(parent(x), 1)
     @test strides(x, :x) == ArrayInterface.strides(parent(x))[1]
+    @test @inferred(ArrayInterface.axes_types(x, static(:x))) <: Base.OneTo{Int}
 
     x[x = 1] = [2, 3]
     @test @inferred(getindex(x, x = 1)) == [2, 3]

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -493,6 +493,7 @@ end
     @test @inferred(ArrayInterface.known_size(Rnr, static(1))) === 4
     @test @inferred(ArrayInterface.known_size(Ar)) === (nothing,nothing, nothing,)
     @test @inferred(ArrayInterface.known_size(Ar, static(1))) === nothing
+    @test @inferred(ArrayInterface.known_size(Ar, static(4))) === 1
 
     @test @inferred(ArrayInterface.known_size(S)) === (2, 3, 4)
     @test @inferred(ArrayInterface.known_size(Wrapper(S))) === (2, 3, 4)