Merge pull request #15 from tensor4all/support_ITensors0.7

Support ITensors 0.7.x

Author: shinaoka

Project.toml

@@ -4,23 +4,23 @@ authors = ["Hiroshi Shinaoka <[email protected]> and contributors"]
 version = "0.2.5"
 
 [deps]
-ITensorTDVP = "25707e16-a4db-4a07-99d9-4d67b7af0342"
+ITensorMPS = "0d1a4710-d33b-49a5-8f18-73bdf49b47e2"
 ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-ITensorTDVP = "^0.4"
-ITensors = "^0.3.62, 0.6"
+ITensorMPS = "0.3.1"
+ITensors = "0.7"
 StaticArrays = "1"
 julia = "1"
 
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
 test = ["Test", "Random", "Aqua", "JET", "StableRNGs"]

src/FastMPOContractions.jl

@@ -3,10 +3,10 @@ module FastMPOContractions
 using StaticArrays
 
 using ITensors
-import ITensors.ITensorMPS:
+import ITensorMPS:
     AbstractMPS, sim!, setleftlim!, setrightlim!, check_hascommoninds
 
-using ITensorTDVP
+using ITensorMPS
 
 include("densitymatrix.jl")
 include("fitalgorithm.jl")

src/fitalgorithm.jl

@@ -1,5 +1,5 @@
 # Only temporary, until the performance issune in ITensorNetworks.jl is fixed.
-import ITensors.ITensorMPS: AbstractProjMPO, makeL!, makeR!, set_nsite!, OneITensor
+import ITensorMPS: AbstractProjMPO, makeL!, makeR!, set_nsite!, OneITensor
 import Base: copy
 
 """
@@ -56,11 +56,11 @@ function contract_fit(A::MPO, psi0::MPS; init_mps = psi0, nsweeps = 1, kwargs...
         end
     end
 
-    reduced_operator = ITensorTDVP.ReducedContractProblem(psi0, A)
-    return ITensorTDVP.alternating_update(
+    reduced_operator = ITensorMPS.ReducedContractProblem(psi0, A)
+    return ITensorMPS.alternating_update(
         reduced_operator,
         init_mps;
-        updater = ITensorTDVP.contract_operator_state_updater,
+        updater = ITensorMPS.contract_operator_state_updater,
         nsweeps = nsweeps,
         kwargs...,
     )

src/fitalgorithm_sum.jl

@@ -1,7 +1,7 @@
-using ITensors.ITensorMPS: ITensorMPS, AbstractProjMPO, MPO, MPS
-using ITensors.ITensorMPS: linkinds, replaceinds
+using ITensorMPS: ITensorMPS, AbstractProjMPO, MPO, MPS
+using ITensorMPS: linkinds, replaceinds
 using ITensors: ITensors, OneITensor
-import ITensorTDVP: alternating_update, rproj, lproj
+import ITensorMPS: alternating_update, rproj, lproj
 
 """
 A ReducedFitProblem represents the projection

src/reducedlinearproblem.jl

@@ -0,0 +1,62 @@
+using ITensors: contract
+using ITensors.ITensorMPS: AbstractProjMPO, ProjMPO, makeL!, makeR!, nsite, set_nsite!
+
+mutable struct ReducedLinearProblem <: AbstractProjMPO
+  reduced_operator::ProjMPO
+  reduced_constant_terms::Vector{ReducedConstantTerm}
+end
+
+# Linear problem updater interface.
+operator(reduced_problem::ReducedLinearProblem) = reduced_problem.reduced_operator
+function constant_term(reduced_problem::ReducedLinearProblem)
+  constant_terms = map(reduced_problem.reduced_constant_terms) do reduced_constant_term
+    return contract(reduced_constant_term)
+  end
+  return dag(only(constant_terms))
+end
+
+function ReducedLinearProblem(operator::MPO, constant_term::MPS)
+  return ReducedLinearProblem(ProjMPO(operator), [ReducedConstantTerm(constant_term)])
+end
+
+function ReducedLinearProblem(operator::MPO, constant_terms::Vector{MPS})
+  return ReducedLinearProblem(ProjMPO(operator), ReducedConstantTerm.(constant_terms))
+end
+
+function Base.copy(reduced_problem::ReducedLinearProblem)
+  return ReducedLinearProblem(
+    copy(reduced_problem.reduced_operator), copy(reduced_problem.reduced_constant_terms)
+  )
+end
+
+function ITensorMPS.nsite(reduced_problem::ReducedLinearProblem)
+  return nsite(reduced_problem.reduced_operator)
+end
+
+function ITensorMPS.set_nsite!(reduced_problem::ReducedLinearProblem, nsite)
+  set_nsite!(reduced_problem.reduced_operator, nsite)
+  for m in reduced_problem.reduced_constant_terms
+    set_nsite!(m, nsite)
+  end
+  return reduced_problem
+end
+
+function ITensorMPS.makeL!(reduced_problem::ReducedLinearProblem, state::MPS, position::Int)
+  makeL!(reduced_problem.reduced_operator, state, position)
+  for reduced_constant_term in reduced_problem.reduced_constant_terms
+    makeL!(reduced_constant_term, state, position)
+  end
+  return reduced_problem
+end
+
+function ITensorMPS.makeR!(reduced_problem::ReducedLinearProblem, state::MPS, position::Int)
+  makeR!(reduced_problem.reduced_operator, state, position)
+  for reduced_constant_term in reduced_problem.reduced_constant_terms
+    makeR!(reduced_constant_term, state, position)
+  end
+  return reduced_problem
+end
+
+function ITensors.contract(reduced_problem::ReducedLinearProblem, v::ITensor)
+  return contract(reduced_problem.reduced_operator, v)
+end

test/_util.jl

@@ -1,4 +1,5 @@
 using ITensors
+using ITensorMPS
 using Random
 
 function _random_mpo(sites::Vector{Vector{Index{T}}}; linkdims = 1) where {T}

test/fitalgorithm.jl

@@ -1,7 +1,7 @@
 using Test
 import FastMPOContractions as FMPOC
 using ITensors
-using ITensorTDVP
+using ITensorMPS
 using Random
 
 @testset "fitalgorithm.jl" begin

test/fitalgorithm_sum.jl

@@ -1,7 +1,7 @@
 import FastMPOContractions as FMPOC
 using ITensors
-using ITensorTDVP
-using ITensors: random_itensor, Algorithm, random_mps
+using ITensorMPS
+using ITensors: random_itensor, Algorithm
 using Random
 using StableRNGs