Fixes for PermutedDimsArrays.

Author: chriselrod

Project.toml

@@ -1,7 +1,7 @@
 name = "LoopVectorization"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
 authors = ["Chris Elrod <[email protected]>"]
-version = "0.8.17"
+version = "0.8.18"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
@@ -18,7 +18,7 @@ OffsetArrays = "1"
 SIMDPirates = "0.8.16"
 SLEEFPirates = "0.5.4"
 UnPack = "0,1"
-VectorizationBase = "0.12.15"
+VectorizationBase = "0.12.24"
 julia = "1.1"
 
 [extras]

src/reconstruct_loopset.jl

@@ -138,18 +138,18 @@ function add_mref!(
     ls::LoopSet, ar::ArrayReferenceMeta, i::Int, ::Type{S}, name
 ) where {S1, S2, T, P, S <: VectorizationBase.PermutedDimsStridedPointer{S1,S2,T,P}}
     gensymname = gensym(name)
-    add_mref!(ls, ar, i, P, gensymname)
-    pushpreamble!(ls, Expr(:(=), name, Expr(:(.), gensymname, QuoteNode(:ptr))))
     li = ar.loopedindex; inds = getindices(ar)
     lib = similar(li); indsb = similar(inds)
     for i ∈ eachindex(li, inds)
         lib[i] = li[i]
         indsb[i] = inds[i]
     end
     for i ∈ eachindex(li, inds)
-        li[i] = lib[S1[i]]
-        inds[i] = indsb[S1[i]]
+        li[i] = lib[S2[i]]
+        inds[i] = indsb[S2[i]]
     end
+    add_mref!(ls, ar, i, P, gensymname)
+    pushpreamble!(ls, Expr(:(=), name, Expr(:(.), gensymname, QuoteNode(:ptr))))
 end
 function add_mref!(
     ls::LoopSet, ar::ArrayReferenceMeta, i::Int, ::Type{OffsetStridedPointer{T,N,P}}, name

test/arraywrappers.jl

@@ -24,6 +24,7 @@ using LoopVectorization, Test#, OffsetArrays
 
     A = rand(12,13,14,15);
     pA = PermutedDimsArray(A, (3,1,4,2));
+    @test addone!(similar(pA), pA) == pA .+ 1
     ppA = PermutedDimsArray(pA, (4,2,3,1));
     @test LoopVectorization.check_args(ppA)
     @test addone!(similar(ppA), ppA) == ppA .+ 1

test/tensors.jl

@@ -28,6 +28,7 @@ function contracttest1!(tiJaB_d_temp3, tiJaB_i, Wmnij)
             tiJaB_d_temp3[j,i,b,a] = temp
         end
     end
+    tiJaB_d_temp3
 end
 function contracttest2!(tiJaB_d_temp3, tiJaB_i, Wmnij)
     rvir = axes(tiJaB_d_temp3, 4)
@@ -43,6 +44,7 @@ function contracttest2!(tiJaB_d_temp3, tiJaB_i, Wmnij)
             tiJaB_d_temp3[j,i,b,a] = temp
         end
     end
+    tiJaB_d_temp3
 end
 
 @testset "Tensors" begin
@@ -58,11 +60,13 @@ end
     # C2 = similar(C1); C3 = similar(C1);
 
     contract!(C1, A, B)
-    contracttest1!(C2, A, B)
-    contracttest2!(C3, A, B)
+    @test C1 ≈ contracttest1!(C2, A, B)
+    @test C1 ≈ contracttest2!(C3, A, B)
 
-    @test C1 ≈ C2
-    @test C1 ≈ C3
+    Apermute = PermutedDimsArray(permutedims(A, (2,4,1,3)), (3,1,4,2));
+    Bpermute = PermutedDimsArray(permutedims(B, (2,1,4,3)), (2,1,4,3));
+    @test C1 ≈ contracttest1!(C2, Apermute, Bpermute)
+    @test C1 ≈ contracttest2!(C3, Apermute, Bpermute)
 end