Fix contract methods

Project.toml

@@ -30,7 +30,7 @@ TenetQuacExt = "Quac"
 Bijections = "0.1"
 Combinatorics = "1.0"
 DeltaArrays = "0.1.1"
-EinExprs = "0.5.1"
+EinExprs = "0.5.2"
 GraphMakie = "0.4,0.5"
 Graphs = "1.7"
 Makie = "0.18, 0.19"

src/TensorNetwork.jl

@@ -456,15 +456,15 @@ EinExprs.einexpr(tn::TensorNetwork; optimizer = Greedy, outputs = inds(tn, :open
 # TODO sequence of indices?
 # TODO what if parallel neighbour indices?
 """
-    contract!(tn::TensorNetwork, index::Symbol)
+    contract!(tn::TensorNetwork, index)
 
 In-place contraction of tensors connected to `index`.
 
 See also: [`contract`](@ref).
 """
-function contract!(tn::TensorNetwork, i::Symbol)
+function contract!(tn::TensorNetwork, i)
     tensor = reduce(pop!(tn, i)) do acc, tensor
-        contract(acc, tensor, i)
+        contract(acc, tensor, dims = i)
     end
 
     push!(tn, tensor)
@@ -480,10 +480,22 @@ The `kwargs` will be passed down to the [`einexpr`](@ref) function.
 
 See also: [`einexpr`](@ref), [`contract!`](@ref).
 """
-contract(tn::TensorNetwork; outputs = inds(tn, :open), kwargs...) = contract(einexpr(tn; outputs = outputs, kwargs...))
+function contract(tn::TensorNetwork; kwargs...)
+    path = einexpr(tn; kwargs...)
 
+    tn = copy(tn)
+
+    for indices in contractorder(path)
+        contract!(tn, indices)
+    end
+
+    tensors(tn) |> only
+end
+
+contract!(t::Tensor, tn::TensorNetwork; kwargs...) = contract!(tn, t; kwargs...)
+contract!(tn::TensorNetwork, t::Tensor; kwargs...) = (push!(tn, t); contract(tn; kwargs...))
 contract(t::Tensor, tn::TensorNetwork; kwargs...) = contract(tn, t; kwargs...)
-contract(tn::TensorNetwork, t::Tensor; kwargs...) = (tn = copy(tn); push!(tn, t); contract(tn; kwargs...))
+contract(tn::TensorNetwork, t::Tensor; kwargs...) = contract!(copy(tn), t; kwargs...)
 
 struct TNSampler{A<:Ansatz,NT<:NamedTuple} <: Random.Sampler{TensorNetwork{A}}
     parameters::NT

test/MatrixProductOperator_test.jl

@@ -224,7 +224,7 @@
 
     @testset "norm" begin
         mpo = rand(MatrixProduct{Operator,Open}, n = 8, p = 2, χ = 8)
-        @test_skip norm(mpo) ≈ 1
+        @test norm(mpo) ≈ 1
     end
 
     # @testset "Initialization" begin

test/MatrixProductState_test.jl

@@ -210,6 +210,6 @@
 
     @testset "norm" begin
         mps = rand(MatrixProduct{State,Open}, n = 8, p = 2, χ = 8)
-        @test_skip norm(mps) ≈ 1
+        @test norm(mps) ≈ 1
     end
 end

test/TensorNetwork_test.jl

@@ -197,12 +197,12 @@
 
     @testset "contract" begin
         tn = rand(TensorNetwork, 5, 3)
-        @test_skip contract(tn) isa Tensor
+        @test contract(tn) isa Tensor
 
         A = Tensor(rand(2, 2, 2), (:i, :j, :k))
         B = Tensor(rand(2, 2, 2), (:k, :l, :m))
         tn = TensorNetwork([A, B])
-        @test_skip contract(tn) isa Tensor
+        @test contract(tn) isa Tensor
     end
 
     @testset "Base.replace!" begin

test/Transformations_test.jl

@@ -76,7 +76,7 @@
             )
 
             # Test that the resulting contraction returns the same as the original
-            @test_skip contract(reduced) ≈ contract(tn)
+            @test contract(reduced) ≈ contract(tn)
         end
 
         @testset "openinds" begin
@@ -111,7 +111,7 @@
             end
 
             # Test that the resulting contraction returns the same as the original
-            @test_skip contract(reduced) ≈ contract(tn)
+            @test contract(reduced) ≈ contract(tn)
         end
     end
 
@@ -136,7 +136,7 @@
         @test length(tensors(reduced)) ≤ length(tensors(tn))
 
         # Test that the resulting contraction contains the same as the original
-        @test_skip contract(reduced) ≈ contract(tn)
+        @test contract(reduced) ≈ contract(tn)
     end
 
     @testset "AntiDiagonalGauging" begin
@@ -185,7 +185,7 @@
         end
 
         # Test that the resulting contraction is the same as the original
-        @test_skip contract(gauged) ≈ contract(tn)
+        @test contract(gauged) ≈ contract(tn)
     end
 
     @testset "ColumnReduction" begin
@@ -214,7 +214,7 @@
             @test length(tn.indices) > length(reduced.indices)
 
             # Test that the resulting contraction is the same as the original
-            @test_skip contract(reduced) ≈ contract(contract(A, B; dims = []), C)
+            @test contract(reduced) ≈ contract(contract(A, B; dims = []), C)
         end
 
         @testset "index size reduction" begin
@@ -239,7 +239,7 @@
             @test length(tn.indices) == length(reduced.indices)
 
             # Test that the resulting contraction is the same as the original
-            @test_skip contract(reduced) ≈ view(contract(tn), :j => 1:2:3)
+            @test contract(reduced) ≈ view(contract(tn), :j => 1:2:3)
         end
     end
 
@@ -266,6 +266,6 @@
         @test smallest_deleted > largest_new
 
         # Test that the resulting contraction is the same as the original
-        @test_skip contract(reduced) ≈ contract(tn)
+        @test contract(reduced) ≈ contract(tn)
     end
 end