Updates for ArrayInterface 7, fixes #168 (#169)

Project.toml

@@ -1,10 +1,9 @@
 name = "Octavian"
 uuid = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4"
 authors = ["Chris Elrod", "Dilum Aluthge", "Mason Protter", "contributors"]
-version = "0.3.20"
+version = "0.3.21"
 
 [deps]
-ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
 IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
@@ -13,19 +12,20 @@ PolyesterWeave = "1d0040c9-8b98-4ee7-8388-3f51789ca0ad"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SnoopPrecompile = "66db9d55-30c0-4569-8b51-7e840670fc0c"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
+StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718"
 ThreadingUtilities = "8290d209-cae3-49c0-8002-c8c24d57dab5"
 VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
 
 [compat]
-ArrayInterface = "3.1.14, 5.0.1, 6"
 CPUSummary = "0.1.26, 0.2.1"
 IfElse = "0.1"
 LoopVectorization = "0.12.86"
 ManualMemory = "0.1.1"
 PolyesterWeave = "0.1.1, 0.2"
 Requires = "1"
 SnoopPrecompile = "1"
-Static = "0.7.5, 0.8"
+Static = "0.8.4"
+StaticArrayInterface = "1"
 ThreadingUtilities = "0.5"
 VectorizationBase = "0.21.15"
 julia = "1.6"

src/Octavian.jl

@@ -2,7 +2,7 @@ module Octavian
 
 using Requires: @require
 
-using VectorizationBase, ArrayInterface, LoopVectorization
+using VectorizationBase, StaticArrayInterface, LoopVectorization
 
 using VectorizationBase:
   align,
@@ -18,7 +18,9 @@ using VectorizationBase:
   has_feature
 using CPUSummary: cache_size, num_cores, cache_inclusive, cache_linesize
 using LoopVectorization: preserve_buffer, CloseOpen, UpperBoundedInteger
-using ArrayInterface: size, strides, offsets, indices, axes, StrideIndex
+using StaticArrayInterface:
+  static_size, static_strides, offsets, indices, axes, StrideIndex
+const ArrayInterface = StaticArrayInterface
 using IfElse: ifelse
 using PolyesterWeave
 using Static:

src/complex_matmul.jl

@@ -1,6 +1,5 @@
 real_rep(a::AbstractArray{Complex{T},N}) where {T,N} =
   reinterpret(reshape, T, a)
-#PtrArray(Ptr{T}(pointer(a)), (StaticInt(2), size(a)...))
 
 for AT in [:AbstractVector, :AbstractMatrix]  # to avoid ambiguity error
   @eval begin

src/matmul.jl

@@ -120,7 +120,7 @@ end
 @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]
+@inline bytestride(A::AbstractStridedPointer, i) = static_strides(A)[i]
 @inline firstbytestride(A::AbstractStridedPointer) = bytestride(A, One())
 
 @inline function vectormultiple(bytex, ::Type{Tc}, ::Type{Ta}) where {Tc,Ta}
@@ -154,8 +154,8 @@ end
   B::AbstractMatrix{TB}
 ) where {TA,TB}
   # TODO: if `M` and `N` are statically sized, shouldn't return a `Matrix`.
-  M, KA = size(A)
-  KB, N = size(B)
+  M, KA = static_size(A)
+  KB, N = static_size(B)
   @assert KA == KB "Size mismatch."
   if M === StaticInt(1)
     transpose(Vector{promote_type(TA, TB)}(undef, N)), (M, KA, N)
@@ -168,7 +168,7 @@ end
   B::AbstractVector{TB}
 ) where {TA,TB}
   # TODO: if `M` and `N` are statically sized, shouldn't return a `Matrix`.
-  M, KA = size(A)
+  M, KA = static_size(A)
   KB = length(B)
   @assert KA == KB "Size mismatch."
   Vector{promote_type(TA, TB)}(undef, M), (M, KA, One())

src/utils.jl

@@ -9,9 +9,9 @@ Checks sizes for compatibility, and preserves the static size information if
 given a mix of static and dynamic sizes.
 """
 @inline function matmul_sizes(C, A, B)
-  MC, NC = size(C)
-  MA, KA = size(A)
-  KB, NB = size(B)
+  MC, NC = static_size(C)
+  MA, KA = static_size(A)
+  KB, NB = static_size(B)
   @assert ((MC == MA) & (KA == KB) & (NC == NB)) "Size mismatch."
   (_select(MA, MC), _select(KA, KB), _select(NB, NC))
 end
@@ -77,7 +77,7 @@ end
   Bn = Core.ifelse(B > 1, B + 1, B)
   quote
     $(Expr(:meta, :inline))
-    x = strides(sp)
+    x = static_strides(sp)
     x0 = $gf(x, 1, false)
     si = StrideIndex{$(N + 1),$Rn,$Cn}($xt, $ot)
     stridedpointer($gf(sp, :p), si, StaticInt{$Bn}())
@@ -97,7 +97,7 @@ end
   end
   quote
     $(Expr(:meta, :inline))
-    x = strides(sp)
+    x = static_strides(sp)
     o = offsets(sp)
     si = StrideIndex{$(N - 1),$rt,$Cn}($xt, $ot)
     stridedpointer($gf(sp, :p), si, StaticInt{$Bn}())