ArrayInterface 6

Author: chriselrod

Project.toml

@@ -1,10 +1,12 @@
 name = "LoopVectorization"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
 authors = ["Chris Elrod <[email protected]>"]
-version = "0.12.110"
+version = "0.12.111"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
+ArrayInterfaceOffsetArrays = "015c0d05-e682-4f19-8f0a-679ce4c54826"
+ArrayInterfaceStaticArrays = "b0d46f97-bff5-4637-a19a-dd75974142cd"
 CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 CloseOpenIntervals = "fb6a15b2-703c-40df-9091-08a04967cfa9"
@@ -25,7 +27,9 @@ UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
 
 [compat]
-ArrayInterface = "3.1.32, 3.2.1, 5.0.1"
+ArrayInterface = "6.0.1"
+ArrayInterfaceOffsetArrays = "0.1.2"
+ArrayInterfaceStaticArrays = "0.1.2"
 CPUSummary = "0.1.3 - 0.1.8, 0.1.11"
 ChainRulesCore = "1"
 CloseOpenIntervals = "0.1.2"

src/LoopVectorization.jl

@@ -1,7 +1,8 @@
 module LoopVectorization
 
 using Static: StaticInt, gt, static
-using VectorizationBase, SLEEFPirates, UnPack, OffsetArrays
+using VectorizationBase,
+  SLEEFPirates, UnPack, OffsetArrays, ArrayInterfaceOffsetArrays, ArrayInterfaceStaticArrays
 using VectorizationBase:
   mask,
   MM,

src/constructors.jl

@@ -176,15 +176,15 @@ end
 function replace_enumerate!(q, prepreamble)
   looprange = q.args[1]
   if Meta.isexpr(looprange, :block)
-    for i in 1:length(looprange.args)
+    for i = 1:length(looprange.args)
       replace_single_enumerate!(q, prepreamble, i)
     end
   else
     replace_single_enumerate!(q, prepreamble)
   end
   return q
 end
-function replace_single_enumerate!(q, prepreamble, i=nothing)
+function replace_single_enumerate!(q, prepreamble, i = nothing)
   if isnothing(i) # not nest loop
     looprange, body = q.args[1], q.args[2]
   else # nest loop
@@ -203,7 +203,7 @@ function replace_single_enumerate!(q, prepreamble, i=nothing)
     if Meta.isexpr(itersyms, :tuple, 2)
       indsym, varsym = itersyms.args[1]::Symbol, itersyms.args[2]::Symbol
       _replace_looprange!(q, i, indsym, iter)
-      pushfirst!(body.args, :($varsym = $iter[$indsym + firstindex($iter) - 1]))
+      pushfirst!(body.args, :($varsym = $iter[$indsym+firstindex($iter)-1]))
     elseif Meta.isexpr(itersyms, :tuple, 1) # like `for (i,) in enumerate(...)`
       indsym = itersyms.args[1]::Symbol
       _replace_looprange!(q, i, indsym, iter)
@@ -216,8 +216,10 @@ function replace_single_enumerate!(q, prepreamble, i=nothing)
   end
   return q
 end
-_replace_looprange!(q, ::Nothing, indsym, iter) = q.args[1] = :($indsym = Base.OneTo(length($iter)))
-_replace_looprange!(q, i::Int, indsym, iter) = q.args[1].args[i] = :($indsym = Base.OneTo(length($iter)))
+_replace_looprange!(q, ::Nothing, indsym, iter) =
+  q.args[1] = :($indsym = Base.OneTo(length($iter)))
+_replace_looprange!(q, i::Int, indsym, iter) =
+  q.args[1].args[i] = :($indsym = Base.OneTo(length($iter)))
 
 function turbo_macro(mod, src, q, args...)
   q = macroexpand(mod, q)

src/modeling/determinestrategy.jl

@@ -111,7 +111,8 @@ function cost(
         # cannot shuffle false means reject curly
         # either false means shuffle
         dont_shuffle =
-          (Wshift > 3) || (rejectinterleave(op) && (cannot_shuffle(op, u₁, u₂, contigind, indices)))
+          (Wshift > 3) ||
+          (rejectinterleave(op) && (cannot_shuffle(op, u₁, u₂, contigind, indices)))
         if dont_shuffle
           # offset = 0.0 # gather/scatter, alignment doesn't matter
           r = 1 << shifter

test/parsing_inputs.jl

@@ -72,8 +72,13 @@ end
   @test A == 1:4
   @test B == ones(4)
   @test A .* B' == C' == D
-  @test_throws ArgumentError check_inputs!(:(for ix in enumerate(A)
-    A[ix[1]] = ix[1] + ix[2]
-  end), Any[])
-  @test_throws ArgumentError check_inputs!(:(for () in enumerate(A); end), Any[])
+  @test_throws ArgumentError check_inputs!(:(
+    for ix in enumerate(A)
+      A[ix[1]] = ix[1] + ix[2]
+    end
+  ), Any[])
+  @test_throws ArgumentError check_inputs!(:(
+    for () in enumerate(A)
+    end
+  ), Any[])
 end