Merge branch 'master' into feature/enhance-docs

bsc-quantic · Sep 15, 2023 · bc53d77 · bc53d77
2 parents 7d80d17 + ef96be2
commit bc53d77
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/Project.toml b/Project.toml
@@ -37,7 +37,7 @@ Bijections = "0.1"
 ChainRulesCore = "1.0"
 Combinatorics = "1.0"
 DeltaArrays = "0.1.1"
-EinExprs = "0.5.2"
+EinExprs = "0.5.5"
 GraphMakie = "0.4,0.5"
 Graphs = "1.7"
 Makie = "0.18, 0.19"

diff --git a/docs/src/assets/youtube.css b/docs/src/assets/youtube.css
@@ -2,5 +2,4 @@
     margin-left: auto;
     margin-right: auto;
     text-align: center;
-    height: 315px;
 }
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -19,7 +19,7 @@ A video of its presentation at JuliaCon 2023 can be seen here:
 
 ```@raw html
 <div class="youtube-video">
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/8BHGtm6FRMk?si=bPXB6bPtK695HFIR" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+<iframe width="560" style="height='315'" src="https://www.youtube-nocookie.com/embed/8BHGtm6FRMk?si=bPXB6bPtK695HFIR" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 </div>
 ```
 

diff --git a/ext/TenetChainRulesCoreExt.jl b/ext/TenetChainRulesCoreExt.jl
@@ -32,11 +32,13 @@ function ChainRulesCore.ProjectTo(tn::T) where {T<:TensorNetwork}
     ProjectTo{T}(; tensors = ProjectTo(tn.tensors), metadata = tn.metadata)
 end
 
-function (projector::ProjectTo{T})(dx::Union{T,Tangent{T}}) where {A<:Ansatz,T<:TensorNetwork{A}}
-    TensorNetwork{A}(projector.tensors(dx.tensors); projector.metadata...)
+function (projector::ProjectTo{T})(dx::Union{T,Tangent{T}}) where {T<:TensorNetwork}
+    dx.tensors isa NoTangent && return NoTangent()
+    Tangent{TensorNetwork}(tensors = projector.tensors(dx.tensors))
 end
 
 function Base.:+(x::TensorNetwork{A}, Δ::Tangent{TensorNetwork}) where {A<:Ansatz}
+    # TODO match tensors by indices
     tensors = map(+, x.tensors, Δ.tensors)
     TensorNetwork{A}(tensors; x.metadata...)
 end

diff --git a/src/TensorNetwork.jl b/src/TensorNetwork.jl
@@ -480,16 +480,12 @@ The `kwargs` will be passed down to the [`einexpr`](@ref) function.
 
 See also: [`einexpr`](@ref), [`contract!`](@ref).
 """
-function contract(tn::TensorNetwork; kwargs...)
-    path = einexpr(tn; kwargs...)
+function contract(tn::TensorNetwork; path = einexpr(tn))
+    # TODO does `first` work always?
+    length(path.args) == 0 && return select(tn, inds(path)) |> first
 
-    tn = copy(tn)
-
-    for indices in contractorder(path)
-        contract!(tn, indices)
-    end
-
-    tensors(tn) |> only
+    intermediates = map(subpath -> contract(tn; path = subpath), path.args)
+    contract(intermediates...; dims = suminds(path))
 end
 
 contract!(t::Tensor, tn::TensorNetwork; kwargs...) = contract!(tn, t; kwargs...)

diff --git a/test/integration/ChainRules_test.jl b/test/integration/ChainRules_test.jl
@@ -17,6 +17,10 @@
     Base.collect(tn::TensorNetwork) = tensors(tn)
 
     @testset "TensorNetwork" begin
+        # TODO it crashes
+        # test_frule(TensorNetwork, Tensor[])
+        # test_rrule(TensorNetwork, Tensor[])
+
         a = Tensor(rand(4, 2), (:i, :j))
         b = Tensor(rand(2, 3), (:j, :k))