[Fix] makeblascontractable should return blascontractable objects. (#210)

Author: lkdvos

.github/workflows/FormatCheck.yml

@@ -32,7 +32,7 @@ jobs:
         #
         # julia  -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter", version="0.13.0"))'
         run: |
-          julia  -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))'
+          julia  -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter", version="1"))'
           julia  -e 'using JuliaFormatter; format(".", verbose=true)'
       - name: Format check
         run: |

Project.toml

@@ -1,7 +1,7 @@
 name = "TensorOperations"
 uuid = "6aa20fa7-93e2-5fca-9bc0-fbd0db3c71a2"
 authors = ["Lukas Devos <[email protected]>", "Maarten Van Damme <[email protected]>", "Jutho Haegeman <[email protected]>"]
-version = "5.2.0"
+version = "5.2.1"
 
 [deps]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"

src/implementation/blascontract.jl

@@ -85,7 +85,7 @@ function makeblascontractable(A, pA, TC, backend, allocator)
     flagA = isblascontractable(A, pA) && eltype(A) == TC
     if !flagA
         A_ = tensoralloc_add(TC, A, pA, false, Val(true), allocator)
-        Anew = SV(A_, size(A_), strides(A_), 0, A.op)
+        Anew = SV(A_)
         Anew = tensoradd!(Anew, A, pA, false, One(), Zero(), backend, allocator)
         pAnew = trivialpermutation(pA)
     else

test/tensor.jl

@@ -528,4 +528,45 @@ end
         C3 = ncon([A], [[-1, -3, -4, -2]], [true])
         @test C3 ≈ conj(C)
     end
+
+    @testset "methods for StridedBLAS" begin
+        using TensorOperations: isblascontractable, isblasdestination, makeblascontractable,
+                                StridedBLAS, DefaultAllocator
+        using Strided
+        backend = StridedBLAS()
+        allocator = DefaultAllocator()
+
+        A = StridedView(rand(ComplexF64, 4, 4, 4, 4))
+
+        p = ((1, 2), (3, 4))
+        @test isblascontractable(A, p)
+        Anew, pnew, flag = makeblascontractable(A, p, ComplexF64, backend, allocator)
+        @test isblascontractable(Anew, pnew)
+        @test Anew === A
+
+        @test !isblascontractable(conj(A), p)
+        Anew, pnew, flag = makeblascontractable(A, p, ComplexF64, backend, allocator)
+        @test isblascontractable(Anew, pnew)
+
+        for p in (((2, 1), (3, 4)), ((1,), (3, 2, 4)), ((2, 1, 4), (3,))),
+            op in (identity, conj)
+
+            @test !isblascontractable(op(A), p)
+            Anew, pnew, flag = makeblascontractable(op(A), p, ComplexF64, backend,
+                                                    allocator)
+            @test isblascontractable(Anew, pnew)
+        end
+
+        vA = view(A, 1:2, 1:2, 1:2, 1:2)
+        p = ((1, 2), (3, 4))
+        @test !isblascontractable(vA, p)
+        Anew, pnew, flag = makeblascontractable(vA, p, ComplexF64, backend, allocator)
+        @test !flag
+        @test isblascontractable(Anew, pnew)
+
+        pA = permutedims(A, (3, 4, 1, 2))
+        p = ((1, 2), (3, 4))
+        @test isblascontractable(pA, p)
+        @test isblascontractable(conj(pA), p)
+    end
 end