Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "TensorAlgebra"
uuid = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a"
version = "0.9.3"
version = "0.9.4"
authors = ["ITensor developers <support@itensor.org> and contributors"]

[workspace]
Expand Down
30 changes: 6 additions & 24 deletions src/contract/contract_matricize.jl
Original file line number Diff line number Diff line change
@@ -1,39 +1,21 @@
using LinearAlgebra: mul!

function contractopadd!(
algorithm::Matricize,
a_dest::AbstractArray, biperm_dest_codomain, biperm_dest_domain,
op1, a1::AbstractArray, biperm1_codomain, biperm1_domain,
op2, a2::AbstractArray, biperm2_codomain, biperm2_domain,
α::Number, β::Number
)
return contractopadd!_matricize(
algorithm,
a_dest, biperm_dest_codomain, biperm_dest_domain,
op1, a1, biperm1_codomain, biperm1_domain,
op2, a2, biperm2_codomain, biperm2_domain,
α, β
)
end

function contractopadd!_matricize(
algorithm::Matricize,
a_dest::AbstractArray, perm_dest_codomain, perm_dest_domain,
op1, a1::AbstractArray, perm1_codomain, perm1_domain,
op2, a2::AbstractArray, perm2_codomain, perm2_domain,
α::Number, β::Number
)
perm_dest = (perm_dest_codomain..., perm_dest_domain...)
biperm_dest = (biperm_dest_codomain..., biperm_dest_domain...)
invperm_codomain, invperm_domain =
blocks(biperm(invperm(perm_dest), length(perm1_codomain)))
blocks(biperm(invperm(biperm_dest), length(biperm1_codomain)))
check_input(
contract!,
a_dest, invperm_codomain, invperm_domain,
a1, perm1_codomain, perm1_domain,
a2, perm2_codomain, perm2_domain
a1, biperm1_codomain, biperm1_domain,
a2, biperm2_codomain, biperm2_domain
)
a1_mat = matricizeop(algorithm.fusion_style, op1, a1, perm1_codomain, perm1_domain)
a2_mat = matricizeop(algorithm.fusion_style, op2, a2, perm2_codomain, perm2_domain)
a1_mat = matricizeop(algorithm.fusion_style, op1, a1, biperm1_codomain, biperm1_domain)
a2_mat = matricizeop(algorithm.fusion_style, op2, a2, biperm2_codomain, biperm2_domain)
a_dest_mat = a1_mat * a2_mat
unmatricizeadd!(
algorithm.fusion_style, a_dest, a_dest_mat, invperm_codomain, invperm_domain, α, β
Expand Down
Loading