Belief propagation order flexibility

examples/belief_propagation/bpsequences.jl

@@ -53,7 +53,7 @@ function main()
       contract_kwargs=(; alg="exact"),
       target_precision=1e-10,
       niters=100,
-      edges=edge_sequence(mts_init; alg=ITensorNetworks.Parallel()),
+      edges=edge_sequence(mts_init; alg=ITensors.Algorithm("Parallel")),
       verbose=true,
     )
     print("Sequential updates (sequence is default edge list of the message tensors): ")

examples/gauging/gauging_itns.jl

@@ -17,7 +17,8 @@ using ITensorNetworks:
   vidal_to_symmetric_gauge,
   initialize_bond_tensors,
   vidal_itn_isometries,
-  norm_network
+  norm_network,
+  edge_sequence
 
 using NamedGraphs
 using NamedGraphs: add_edges!, rem_vertex!, hexagonal_lattice_graph
@@ -77,7 +78,7 @@ function benchmark_state_gauging(
           ψψ,
           mts;
           contract_kwargs=(; alg="exact"),
-          edges=edge_sequence(mts; alg=ITensorNetworks.Parallel()),
+          edges=edge_sequence(mts; alg=ITensors.Algorithm("Parallel")),
         )
       end
 

src/beliefpropagation/beliefpropagation_schedule.jl

@@ -1,25 +1,24 @@
-abstract type EdgeSequenceAlgorithm end
-
-struct ForestCover <: EdgeSequenceAlgorithm end
-struct Parallel <: EdgeSequenceAlgorithm end
-
-default_edge_sequence_alg() = ForestCover()
+default_edge_sequence_alg() = Algorithm("ForestCover")
 
 default_bp_niters(g::NamedGraph) = is_tree(g) ? 1 : nothing
-function default_bp_niters(g::Union{DataGraph,AbstractITensorNetwork})
+function default_bp_niters(g::AbstractGraph)
   return default_bp_niters(undirected_graph(underlying_graph(g)))
 end
 
 function edge_sequence(g::NamedGraph; alg=default_edge_sequence_alg())
   return edge_sequence(alg, g)
 end
 
-function edge_sequence(mts::DataGraph; alg=default_edge_sequence_alg())
-  return edge_sequence(alg, undirected_graph(underlying_graph(mts)))
+function edge_sequence(g::AbstractGraph; alg=default_edge_sequence_alg())
+  return edge_sequence(alg, undirected_graph(underlying_graph(g)))
+end
+
+function edge_sequence(alg::Algorithm, g::AbstractGraph; kwargs...)
+  return edge_sequence(alg, g, kwargs...)
 end
 
 function edge_sequence(
-  ::ForestCover, g::NamedGraph; root_vertex=NamedGraphs.default_root_vertex
+  ::Algorithm"ForestCover", g::NamedGraph; root_vertex=NamedGraphs.default_root_vertex
 )
   @assert !is_directed(g)
   forests = NamedGraphs.forest_cover(g)
@@ -35,17 +34,7 @@ function edge_sequence(
   return edges
 end
 
-function edge_sequence(
-  ::ForestCover, mts::DataGraph; root_vertex=NamedGraphs.default_root_vertex
-)
-  return edge_sequence(ForestCover, undirected_graph(underlying_graph(mts)); root_vertex)
-end
-
-function edge_sequence(::Parallel, g::NamedGraph)
+function edge_sequence(::Algorithm"Parallel", g::NamedGraph)
   @assert !is_directed(g)
   return [[e] for e in vcat(edges(g), reverse.(edges(g)))]
 end
-
-function edge_sequence(::Parallel, mts::DataGraph)
-  return edge_sequence(Parallel, undirected_graph(underlying_graph(mts)))
-end

src/beliefpropagation/sqrt_beliefpropagation.jl

@@ -51,7 +51,7 @@ end
 function sqrt_belief_propagation(
   tn::ITensorNetwork,
   mts::DataGraph;
-  niters::Union{Int64,Nothing}=default_bp_niters(mts),
+  niters=default_bp_niters(mts),
   edges=edge_sequence(mts),
   # target_precision::Union{Float64,Nothing}=nothing,
 )

test/test_treetensornetworks/test_solvers/test_dmrg.jl

@@ -28,7 +28,7 @@ using Observers
   # Compare to `ITensors.MPO` version of `dmrg`
   H_mpo = MPO([H[v] for v in 1:nv(H)])
   psi_mps = MPS([psi[v] for v in 1:nv(psi)])
-  e2, psi2 = dmrg(H_mpo, psi_mps; nsweeps, maxdim, normalize=false, outputlevel=0)
+  e2, psi2 = dmrg(H_mpo, psi_mps; nsweeps, maxdim, outputlevel=0)
 
   psi = dmrg(H, psi; nsweeps, maxdim, cutoff, nsite, solver_krylovdim=3, solver_maxiter=1)
   @test inner(psi', H, psi) ≈ inner(psi2', H_mpo, psi2)
@@ -134,7 +134,7 @@ end
   sline = only.(collect(vertex_data(s)))[linear_order]
   Hline = MPO(relabel_sites(os, vmap), sline)
   psiline = randomMPS(sline; linkdims=20)
-  e2, psi2 = dmrg(Hline, psiline, sweeps; normalize=false, outputlevel=0)
+  e2, psi2 = dmrg(Hline, psiline, sweeps; outputlevel=0)
 
   @test inner(psi', H, psi) ≈ inner(psi2', Hline, psi2) atol = 1e-5
 end