Continue adapting code and improve DMRG test

Author: emstoudenmire

src/ITensorNetworks.jl

@@ -35,12 +35,23 @@ include("gauging.jl")
 include("utils.jl")
 include("update_observer.jl")
 
+include("treetensornetworks/abstracttreetensornetwork.jl")
+include("treetensornetworks/treetensornetwork.jl")
+include("treetensornetworks/opsum_to_ttn/matelem.jl")
+include("treetensornetworks/opsum_to_ttn/qnarrelem.jl")
+include("treetensornetworks/opsum_to_ttn/opsum_to_ttn.jl")
+include("treetensornetworks/projttns/abstractprojttn.jl")
+include("treetensornetworks/projttns/projttn.jl")
+include("treetensornetworks/projttns/projttnsum.jl")
+include("treetensornetworks/projttns/projouterprodttn.jl")
+
 include("solvers/local_solvers/eigsolve.jl")
 include("solvers/local_solvers/exponentiate.jl")
 include("solvers/local_solvers/runge_kutta.jl")
 include("solvers/truncation_parameters.jl")
-include("solvers/sweep_solve.jl")
 include("solvers/iterators.jl")
+include("solvers/adapters.jl")
+include("solvers/sweep_solve.jl")
 include("solvers/region_plans/dfs_plans.jl")
 include("solvers/region_plans/euler_tour.jl")
 include("solvers/region_plans/euler_plans.jl")
@@ -49,19 +60,11 @@ include("solvers/extracter.jl")
 include("solvers/inserter.jl")
 include("solvers/subspace/subspace.jl")
 include("solvers/subspace/densitymatrix.jl")
+include("solvers/permute_indices.jl")
+include("solvers/operator_map.jl")
 include("solvers/eigsolve.jl")
 include("solvers/applyexp.jl")
 
-include("treetensornetworks/abstracttreetensornetwork.jl")
-include("treetensornetworks/treetensornetwork.jl")
-include("treetensornetworks/opsum_to_ttn/matelem.jl")
-include("treetensornetworks/opsum_to_ttn/qnarrelem.jl")
-include("treetensornetworks/opsum_to_ttn/opsum_to_ttn.jl")
-include("treetensornetworks/projttns/abstractprojttn.jl")
-include("treetensornetworks/projttns/projttn.jl")
-include("treetensornetworks/projttns/projttnsum.jl")
-include("treetensornetworks/projttns/projouterprodttn.jl")
-
 include("apply.jl")
 include("inner.jl")
 include("normalize.jl")

src/solvers/inserter.jl

@@ -1,4 +1,5 @@
 import ConstructionBase: setproperties
+import NamedGraphs: edgetype
 
 function inserter(
   problem,
@@ -17,10 +18,10 @@ function inserter(
   if length(region) == 1
     C = local_tensor
   elseif length(region) == 2
-    e = ng.edgetype(psi)(first(region), last(region))
-    indsTe = it.inds(psi[first(region)])
-    tags = it.tags(psi, e)
-    U, C, _ = it.factorize(local_tensor, indsTe; tags, trunc...)
+    e = edgetype(psi)(first(region), last(region))
+    indsTe = inds(psi[first(region)])
+    tags = ITensors.tags(psi, e)
+    U, C, _ = factorize(local_tensor, indsTe; tags, trunc...)
     @preserve_graph psi[first(region)] = U
   else
     error("Region of length $(length(region)) not currently supported")

test/solvers/test_tree_dmrg.jl

@@ -1,11 +1,9 @@
-import NetworkSolvers as ns
 using Test: @test, @testset
-
 using ITensors
-import ITensorNetworks as itn
-import Graphs as gr
-import NamedGraphs as ng
-import ITensorMPS as itm
+using TensorOperations # Needed to use contraction order finding
+using ITensorNetworks: siteinds, ttn, dmrg
+import Graphs: dst, edges, src
+import ITensorMPS: OpSum
 
 include("utilities/simple_ed_methods.jl")
 include("utilities/tree_graphs.jl")
@@ -15,24 +13,24 @@ include("utilities/tree_graphs.jl")
 
   g = build_tree(; nbranch=3, nbranch_sites=3)
 
-  sites = itn.siteinds("S=1/2", g)
+  sites = siteinds("S=1/2", g)
 
   # Make Heisenberg model Hamiltonian
-  h = itm.OpSum()
-  for edge in gr.edges(sites)
-    i, j = gr.src(edge), gr.dst(edge)
+  h = OpSum()
+  for edge in edges(sites)
+    i, j = src(edge), dst(edge)
     h += "Sz", i, "Sz", j
     h += 1/2, "S+", i, "S-", j
     h += 1/2, "S-", i, "S+", j
   end
-  H = itn.ttn(h, sites)
+  H = ttn(h, sites)
 
   # Make initial product state
   state = Dict{Tuple{Int,Int},String}()
   for (j, v) in enumerate(gr.vertices(sites))
     state[v] = iseven(j) ? "Up" : "Dn"
   end
-  psi0 = itn.ttn(state, sites)
+  psi0 = ttn(state, sites)
 
   (outputlevel >= 1) && println("Computing exact ground state")
   Ex, psix = ed_ground_state(H, psi0)
@@ -48,7 +46,7 @@ include("utilities/tree_graphs.jl")
   nsites = 2
   trunc = (; cutoff, maxdim)
   inserter_kwargs = (; trunc)
-  E, psi = ns.dmrg(H, psi0; inserter_kwargs, nsites, nsweeps, outputlevel)
+  E, psi = dmrg(H, psi0; inserter_kwargs, nsites, nsweeps, outputlevel)
   (outputlevel >= 1) && println("2-site DMRG energy = ", E)
   @test abs(E-Ex) < 1E-5
 
@@ -60,9 +58,7 @@ include("utilities/tree_graphs.jl")
   trunc = (; cutoff, maxdim)
   extracter_kwargs = (; trunc, subspace_algorithm="densitymatrix")
   inserter_kwargs = (; trunc)
-  cutoff = 1E-10
-  maxdim = 200
-  E, psi = ns.dmrg(H, psi0; extracter_kwargs, inserter_kwargs, nsites, nsweeps, outputlevel)
+  E, psi = dmrg(H, psi0; extracter_kwargs, inserter_kwargs, nsites, nsweeps, outputlevel)
   (outputlevel >= 1) && println("1-site+subspace DMRG energy = ", E)
   @test abs(E-Ex) < 1E-5
 end

test/solvers/utilities/simple_ed_methods.jl

@@ -1,11 +1,9 @@
-import ITensorNetworks as itn
-import NetworkSolvers as ns
+import ITensorNetworks: AbstractITensorNetwork
 
 function ed_ground_state(H, psi0)
   ITensors.disable_warn_order()
   H = prod(H)
   psi = prod(psi0)
-  # TODO: call KrylovKit instead
   expH = exp(H*(-20.0))
   for napply in 1:10
     psi = noprime(expH*psi)
@@ -16,10 +14,7 @@ function ed_ground_state(H, psi0)
 end
 
 function ed_time_evolution(
-  H::itn.AbstractITensorNetwork,
-  psi::itn.AbstractITensorNetwork,
-  time_points;
-  normalize=false,
+  H::AbstractITensorNetwork, psi::AbstractITensorNetwork, time_points; normalize=false
 )
   ITensors.disable_warn_order()
   H = prod(H)
@@ -30,10 +25,6 @@ function ed_time_evolution(
   for step in steps
     expH = exp(H * step)
     psi = noprime(expH * psi)
-    #psir, _ = ns.runge_kutta_solver(H_map,step,psi; order=4)
-    #psix, _ = ns.exponentiate_solver(H_map,step,psi)
-    #@show abs(scalar(dag(psi)*psix))
-    #@show abs(scalar(dag(psir)*psix))
     if normalize
       psi /= norm(psi)
     end