Restore outputlevel feature and test (#268)

Author: emstoudenmire

Project.toml

@@ -1,7 +1,7 @@
 name = "ITensorNetworks"
 uuid = "2919e153-833c-4bdc-8836-1ea460a35fc7"
 authors = ["Matthew Fishman <mfishman@flatironinstitute.org>, Joseph Tindall <jtindall@flatironinstitute.org> and contributors"]
-version = "0.15.4"
+version = "0.15.5"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/solvers/applyexp.jl

@@ -62,9 +62,9 @@ end
 function default_sweep_callback(
         sweep_iterator::SweepIterator{<:ApplyExpProblem};
         exponent_description = "exponent",
-        outputlevel = 0,
         process_time = identity,
     )
+    outputlevel = get(region_kwargs(region_iterator(sweep_iterator)), :outputlevel, 0)
     return if outputlevel >= 1
         the_problem = problem(sweep_iterator)
         @printf(

src/solvers/eigsolve.jl

@@ -23,7 +23,6 @@ end
 function update!(
         region_iter::RegionIterator{<:EigsolveProblem},
         local_state;
-        outputlevel = 0,
         solver = eigsolve_solver,
     )
     prob = problem(region_iter)
@@ -34,33 +33,31 @@ function update!(
 
     prob.eigenvalue = eigval
 
+    outputlevel = get(region_kwargs(region_iter), :outputlevel, 0)
     if outputlevel >= 2
         @printf("  Region %s: energy = %.12f\n", current_region(region_iter), eigenvalue(prob))
     end
     return region_iter, local_state
 end
 
 function default_sweep_callback(
-        sweep_iterator::SweepIterator{<:EigsolveProblem}; outputlevel = 0
+        sweep_iterator::SweepIterator{<:EigsolveProblem}
     )
+    outputlevel = get(region_kwargs(region_iterator(sweep_iterator)), :outputlevel, 0)
     return if outputlevel >= 1
-        nsweeps = length(sweep_iterator)
         current_sweep = sweep_iterator.which_sweep
-        if length(sweep_iterator) >= 10
-            @printf("After sweep %02d/%d ", current_sweep, nsweeps)
-        else
-            @printf("After sweep %d/%d ", current_sweep, nsweeps)
-        end
-        @printf("eigenvalue=%.12f", eigenvalue(problem))
-        @printf(" maxlinkdim=%d", maxlinkdim(state(problem)))
-        @printf(" max truncerror=%d", max_truncerror(problem))
+        the_problem = problem(sweep_iterator)
+        @printf("After sweep %d ", current_sweep)
+        @printf("eigenvalue=%.12f", eigenvalue(the_problem))
+        @printf(" maxlinkdim=%d", maxlinkdim(state(the_problem)))
+        @printf(" max truncerror=%d", max_truncerror(the_problem))
         println()
         flush(stdout)
     end
 end
 
 function eigsolve(
-        operator, init_state; nsweeps, nsites = 1, outputlevel = 0, factorize_kwargs, sweep_kwargs...
+        operator, init_state; nsweeps, nsites = 1, factorize_kwargs, sweep_kwargs...
     )
     init_prob = EigsolveProblem(;
         state = align_indices(init_state), operator = ProjTTN(align_indices(operator))
@@ -69,7 +66,6 @@ function eigsolve(
         init_prob,
         nsweeps;
         nsites,
-        outputlevel,
         factorize_kwargs,
         subspace_expand!_kwargs = (; eigen_kwargs = factorize_kwargs),
         sweep_kwargs...,

test/solvers/test_eigsolve.jl

@@ -4,6 +4,7 @@ using ITensorNetworks: siteinds, ttn, dmrg
 using Graphs: dst, edges, src, vertices
 using ITensorMPS: OpSum
 using TensorOperations: TensorOperations #For contraction order finding
+using Suppressor: @capture_out
 
 include("utilities/simple_ed_methods.jl")
 include("utilities/tree_graphs.jl")
@@ -68,7 +69,24 @@ include("utilities/tree_graphs.jl")
     #
     nsites = 2
     factorize_kwargs = (; cutoff = [1.0e-5, 1.0e-6], maxdim = [8, 16, 32])
-    E, psi = dmrg(H, psi0; factorize_kwargs, nsites, nsweeps, outputlevel)
+    E, psi = dmrg(H, psi0; factorize_kwargs, nsites, nsweeps, outputlevel = 0)
     (outputlevel >= 1) && println("2-site DMRG energy = ", E)
     @test E ≈ Ex atol = 1.0e-5
+
+    #
+    # Test that outputlevel > 0 generates output
+    # and outputlevel == 0 generates no output
+    #
+    nsweeps = 2
+    outputlevel = 1
+    output = @capture_out begin
+        dmrg(H, psi0; factorize_kwargs, nsweeps, outputlevel)
+    end
+    @test length(output) > 0
+
+    outputlevel = 0
+    output = @capture_out begin
+        dmrg(H, psi0; factorize_kwargs, nsweeps, outputlevel)
+    end
+    @test length(output) == 0
 end