Updates for ArrayInterface 3. (#63)

Author: chriselrod

Project.toml

@@ -1,7 +1,7 @@
 name = "Octavian"
 uuid = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4"
 authors = ["Mason Protter", "Chris Elrod", "Dilum Aluthge", "contributors"]
-version = "0.2.7"
+version = "0.2.8"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -10,10 +10,10 @@ ThreadingUtilities = "8290d209-cae3-49c0-8002-c8c24d57dab5"
 VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
 
 [compat]
-ArrayInterface = "2.14"
-LoopVectorization = "0.10"
+ArrayInterface = "3"
+LoopVectorization = "0.11"
 ThreadingUtilities = "0.2"
-VectorizationBase = "0.16"
+VectorizationBase = "0.17"
 julia = "1.5"
 
 [extras]

src/Octavian.jl

@@ -7,8 +7,7 @@ using VectorizationBase: align, AbstractStridedPointer, zstridedpointer,
     snum_cache_levels, scache_size, snum_cores, num_cores, cache_inclusivity, scacheline_size
 using LoopVectorization: maybestaticsize, matmul_params, preserve_buffer, CloseOpen
 using ArrayInterface: StaticInt, Zero, One, OptionallyStaticUnitRange, size, strides, offsets, indices,
-    static_length, static_first, static_last, axes,
-    dense_dims, DenseDims, stride_rank, StrideRank
+    static_length, static_first, static_last, axes, dense_dims, stride_rank
 
 using ThreadingUtilities:
     _atomic_add!, _atomic_umax!, _atomic_umin!,

src/matmul.jl

@@ -74,7 +74,7 @@ function matmul_st_pack_A_and_B!(
     nothing
 end
 
-@inline contiguousstride1(A) = ArrayInterface.contiguous_axis(A) === ArrayInterface.Contiguous{1}()
+@inline contiguousstride1(A) = ArrayInterface.contiguous_axis(A) === One()
 @inline contiguousstride1(A::AbstractStridedPointer{T,N,1}) where {T,N} = true
 # @inline bytestride(A::AbstractArray, i) = VectorizationBase.bytestrides(A)[i]
 @inline bytestride(A::AbstractStridedPointer, i) = strides(A)[i]
@@ -125,11 +125,11 @@ end
 @inline function matmul_serial!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β)
     matmul_serial!(C, A, B, α, β, nothing, ArrayInterface.contiguous_axis(C))
 end
-@inline function matmul_serial!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, MKN, ::ArrayInterface.Contiguous{2})
+@inline function matmul_serial!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, MKN, ::StaticInt{2})
     _matmul_serial!(C', B', A', α, β, nothing)
     return C
 end
-@inline function matmul_serial!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, MKN, ::ArrayInterface.Contiguous)
+@inline function matmul_serial!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, MKN, ::StaticInt)
     _matmul_serial!(C, A, B, α, β, nothing)
     return C
 end
@@ -210,11 +210,11 @@ end
 @inline function matmul!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, nthread)
     matmul!(C, A, B, α, β, nthread, nothing, ArrayInterface.contiguous_axis(C))
 end
-@inline function matmul!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, nthread, MKN, ::ArrayInterface.Contiguous{2})
+@inline function matmul!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, nthread, MKN, ::StaticInt{2})
     _matmul!(C', B', A', α, β, nthread, MKN)
     return C
 end
-@inline function matmul!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, nthread, MKN, ::ArrayInterface.Contiguous)
+@inline function matmul!(C::AbstractMatrix, A::AbstractMatrix, B::AbstractMatrix, α, β, nthread, MKN, ::StaticInt)
     _matmul!(C, A, B, α, β, nthread, MKN)
     return C
 end