Escape entire expression in einsum (#240)

* Escape entire expression in einsum * Bump version
KeitaNakamura · Oct 31, 2024 · a816a13 · a816a13 · KeitaNakamura · Oct 31, 2024
1 parent 49fdfaf
commit a816a13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Tensorial"
 uuid = "98f94333-fa9f-48a9-ad80-1c66397b2b38"
 authors = ["Keita Nakamura <keita.nakamura.1109@gmail.com>"]
-version = "0.18.1"
+version = "0.18.2"
 
 [deps]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"

diff --git a/src/einsum.jl b/src/einsum.jl
@@ -32,10 +32,10 @@ end
 function einsum_exprssion(TT, expr)
     varname, freeinds, body = split_defexpr(expr)
     einex = einsum_instantiate(body, TT)
-    isnothing(freeinds) && return :($(esc(varname)) = $(einex.ex))
-    isempty(freeinds) && return :($(esc(varname)) = Tensor{Tuple{}}($(einex.ex)))
+    isnothing(freeinds) && return esc(:($varname = $(einex.ex)))
+    isempty(freeinds) && return esc(:($varname = Tensor{Tuple{}}($(einex.ex))))
     perm = find_perm(einex.freeinds => freeinds)
-    :($(esc(varname)) = permutedims($(einex.ex), $(ValTuple(perm...))))
+    esc(:($varname = permutedims($(einex.ex), $(ValTuple(perm...)))))
 end
 
 ValTuple(x...) = Val(x)
@@ -103,7 +103,7 @@ function einsum_instantiate(expr, TT) # TT is :Any if not given in @einsum or no
             end
         end
     elseif Meta.isexpr(expr, :ref)
-        ex = esc(expr.args[1])
+        ex = expr.args[1]
         allinds = expr.args[2:end]
         freeinds = find_freeindices(allinds)
         return einsum_instantiate_tensor(EinsumExpr(ex, freeinds, allinds))

diff --git a/test/einsum.jl b/test/einsum.jl
@@ -67,6 +67,7 @@ end
         @einsum ans[σ,μ,ν] := A[σp,σ]*A[μp,μ]*A[νp,ν]*B[σp,μp,νp]
         @test (@einsum Tensor{Tuple{4,@Symmetry{4,4}}, Float64} C[σ,μ,ν] := A[σp,σ]*A[μp,μ]*A[νp,ν]*B[σp,μp,νp])::Tensor{Tuple{4,@Symmetry{4,4}}, Float64} ≈ ans
         @test (@einsum Tensor{Tuple{4,@Symmetry{4,4}}, Float32} C[σ,μ,ν] := A[σp,σ]*A[μp,μ]*A[νp,ν]*B[σp,μp,νp])::Tensor{Tuple{4,@Symmetry{4,4}}, Float32} ≈ ans
+        @test (@einsum typeof(B) C[σ,μ,ν] := A[σp,σ]*A[μp,μ]*A[νp,ν]*B[σp,μp,νp])::Tensor{Tuple{4,@Symmetry{4,4}}, Float64} ≈ ans
     end
     @testset "errors" begin
         S1 = rand(SymmetricSecondOrderTensor{3})