More verbosity (and other) fixes for v9 (#116)

* more verbosity fixes for v9

* prepare patch version update

Author: Jutho

Project.toml

@@ -1,7 +1,7 @@
 name = "KrylovKit"
 uuid = "0b1a1467-8014-51b9-945f-bf0ae24f4b77"
 authors = ["Jutho Haegeman"]
-version = "0.9.2"
+version = "0.9.3"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/eigsolve/arnoldi.jl

@@ -342,7 +342,7 @@ function _schursolve(A, x₀, howmany::Int, which::Selector, alg::Arnoldi)
     numiter = 1
     # initialize arnoldi factorization
     iter = ArnoldiIterator(A, x₀, alg.orth)
-    fact = initialize(iter; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+    fact = initialize(iter; verbosity=alg.verbosity)
     numops = 1
     sizehint!(fact, krylovdim)
     β = normres(fact)
@@ -398,7 +398,7 @@ function _schursolve(A, x₀, howmany::Int, which::Selector, alg::Arnoldi)
         end
 
         if K < krylovdim # expand
-            fact = expand!(iter, fact; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = expand!(iter, fact; verbosity=alg.verbosity)
             numops += 1
         else # shrink
             numiter == maxiter && break
@@ -430,7 +430,7 @@ function _schursolve(A, x₀, howmany::Int, which::Selector, alg::Arnoldi)
             B[keep + 1] = scale!!(r, 1 / normres(fact))
 
             # Shrink Arnoldi factorization
-            fact = shrink!(fact, keep; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = shrink!(fact, keep; verbosity=alg.verbosity)
             numiter += 1
         end
     end

src/eigsolve/golubye.jl

@@ -105,7 +105,7 @@ function geneigsolve(f, x₀, howmany::Int, which::Selector, alg::GolubYe)
             resize!(normresiduals, 0)
             while converged < K
                 z = view(Z, :, p[converged + 1])
-                v = mul!(zerovector(vold), V, z)
+                v = unproject!!(zerovector(vold), V, z)
                 av, bv = genapply(f, v)
                 numops += 1
                 ρ = checkhermitian(inner(v, av)) / checkposdef(inner(v, bv))
@@ -129,7 +129,7 @@ function geneigsolve(f, x₀, howmany::Int, which::Selector, alg::GolubYe)
             elseif numiter == maxiter
                 for k in (converged + 1):howmany
                     z = view(Z, :, p[k])
-                    v = mul!(zerovector(vold), V, z)
+                    v = unproject!!(zerovector(vold), V, z)
                     av, bv = genapply(f, v)
                     numops += 1
                     ρ = checkhermitian(inner(v, av)) / checkposdef(inner(v, bv))

src/eigsolve/lanczos.jl

@@ -13,7 +13,7 @@ function eigsolve(A, x₀, howmany::Int, which::Selector, alg::Lanczos;
 
     # Initialize Lanczos factorization
     iter = LanczosIterator(A, x₀, alg.orth)
-    fact = initialize(iter; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+    fact = initialize(iter; verbosity=alg.verbosity)
     numops = 1
     numiter = 1
     sizehint!(fact, krylovdim)
@@ -72,7 +72,7 @@ function eigsolve(A, x₀, howmany::Int, which::Selector, alg::Lanczos;
         end
 
         if K < krylovdim # expand Krylov factorization
-            fact = expand!(iter, fact; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = expand!(iter, fact; verbosity=alg.verbosity)
             numops += 1
         else ## shrink and restart
             if numiter == maxiter
@@ -108,7 +108,7 @@ function eigsolve(A, x₀, howmany::Int, which::Selector, alg::Lanczos;
             B[keep + 1] = scale!!(r, 1 / β)
 
             # Shrink Lanczos factorization
-            fact = shrink!(fact, keep; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = shrink!(fact, keep; verbosity=alg.verbosity)
             numiter += 1
         end
     end

src/eigsolve/svdsolve.jl

@@ -157,7 +157,7 @@ function svdsolve(A, x₀, howmany::Int, which::Symbol, alg::GKL;
     numiter = 1
     # initialize GKL factorization
     iter = GKLIterator(A, x₀, alg.orth)
-    fact = initialize(iter; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+    fact = initialize(iter; verbosity=alg.verbosity)
     numops = 2
     sizehint!(fact, krylovdim)
     β = normres(fact)
@@ -214,7 +214,7 @@ function svdsolve(A, x₀, howmany::Int, which::Symbol, alg::GKL;
         end
 
         if K < krylovdim # expand
-            fact = expand!(iter, fact; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = expand!(iter, fact; verbosity=alg.verbosity)
             numops += 2
         else ## shrink and restart
             if numiter == maxiter
@@ -267,7 +267,7 @@ function svdsolve(A, x₀, howmany::Int, which::Symbol, alg::GKL;
                 fact.βs[j] = H[j + 1, j]
             end
             # Shrink GKL factorization
-            fact = shrink!(fact, keep; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = shrink!(fact, keep; verbosity=alg.verbosity)
             numiter += 1
         end
     end

src/factorizations/arnoldi.jl

@@ -133,7 +133,7 @@ function Base.iterate(iter::ArnoldiIterator, state)
     end
 end
 
-function initialize(iter::ArnoldiIterator; verbosity::Int=0)
+function initialize(iter::ArnoldiIterator; verbosity::Int=KrylovDefaults.verbosity[])
     # initialize without using eltype
     x₀ = iter.x₀
     β₀ = norm(x₀)
@@ -169,12 +169,13 @@ function initialize(iter::ArnoldiIterator; verbosity::Int=0)
     end
     V = OrthonormalBasis([v])
     H = T[α, β]
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Arnoldi initiation at dimension 1: subspace normres = $(normres2string(β))"
     end
     return state = ArnoldiFactorization(1, V, H, r)
 end
-function initialize!(iter::ArnoldiIterator, state::ArnoldiFactorization; verbosity::Int=0)
+function initialize!(iter::ArnoldiIterator, state::ArnoldiFactorization;
+                     verbosity::Int=KrylovDefaults.verbosity[])
     x₀ = iter.x₀
     V = state.V
     while length(V) > 1
@@ -189,12 +190,13 @@ function initialize!(iter::ArnoldiIterator, state::ArnoldiFactorization; verbosi
     state.k = 1
     push!(H, α, β)
     state.r = r
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Arnoldi initiation at dimension 1: subspace normres = $(normres2string(β))"
     end
     return state
 end
-function expand!(iter::ArnoldiIterator, state::ArnoldiFactorization; verbosity::Int=0)
+function expand!(iter::ArnoldiIterator, state::ArnoldiFactorization;
+                 verbosity::Int=KrylovDefaults.verbosity[])
     state.k += 1
     k = state.k
     V = state.V
@@ -207,12 +209,12 @@ function expand!(iter::ArnoldiIterator, state::ArnoldiFactorization; verbosity::
     r, β = arnoldirecurrence!!(iter.operator, V, view(H, (m + 1):(m + k)), iter.orth)
     H[m + k + 1] = β
     state.r = r
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Arnoldi expansion to dimension $k: subspace normres = $(normres2string(β))"
     end
     return state
 end
-function shrink!(state::ArnoldiFactorization, k; verbosity::Int=0)
+function shrink!(state::ArnoldiFactorization, k; verbosity::Int=KrylovDefaults.verbosity[])
     length(state) <= k && return state
     V = state.V
     H = state.H
@@ -223,7 +225,7 @@ function shrink!(state::ArnoldiFactorization, k; verbosity::Int=0)
     resize!(H, (k * k + 3 * k) >> 1)
     state.k = k
     β = normres(state)
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Arnoldi reduction to dimension $k: subspace normres = $(normres2string(β))"
     end
     state.r = scale!!(r, β)

src/factorizations/gkl.jl

@@ -183,7 +183,7 @@ function Base.iterate(iter::GKLIterator, state::GKLFactorization)
     end
 end
 
-function initialize(iter::GKLIterator; verbosity::Int=0)
+function initialize(iter::GKLIterator; verbosity::Int=KrylovDefaults.verbosity[])
     # initialize without using eltype
     u₀ = iter.u₀
     β₀ = norm(u₀)
@@ -211,12 +211,13 @@ function initialize(iter::GKLIterator; verbosity::Int=0)
     S = real(T)
     αs = S[α]
     βs = S[β]
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "GKL initiation at dimension 1: subspace normres = $(normres2string(β))"
     end
     return GKLFactorization(1, U, V, αs, βs, r)
 end
-function initialize!(iter::GKLIterator, state::GKLFactorization; verbosity::Int=0)
+function initialize!(iter::GKLIterator, state::GKLFactorization;
+                     verbosity::Int=KrylovDefaults.verbosity[])
     U = state.U
     while length(U) > 1
         pop!(U)
@@ -238,12 +239,13 @@ function initialize!(iter::GKLIterator, state::GKLFactorization; verbosity::Int=
     push!(αs, α)
     push!(βs, β)
     state.r = r
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "GKL initiation at dimension 1: subspace normres = $(normres2string(β))"
     end
     return state
 end
-function expand!(iter::GKLIterator, state::GKLFactorization; verbosity::Int=0)
+function expand!(iter::GKLIterator, state::GKLFactorization;
+                 verbosity::Int=KrylovDefaults.verbosity[])
     βold = normres(state)
     U = state.U
     V = state.V
@@ -259,12 +261,12 @@ function expand!(iter::GKLIterator, state::GKLFactorization; verbosity::Int=0)
 
     state.k += 1
     state.r = r
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "GKL expension to dimension $(state.k): subspace normres = $(normres2string(β))"
     end
     return state
 end
-function shrink!(state::GKLFactorization, k; verbosity::Int=0)
+function shrink!(state::GKLFactorization, k; verbosity::Int=KrylovDefaults.verbosity[])
     length(state) == length(state.V) ||
         error("we cannot shrink GKLFactorization without keeping vectors")
     length(state) <= k && return state
@@ -280,7 +282,7 @@ function shrink!(state::GKLFactorization, k; verbosity::Int=0)
     resize!(state.βs, k)
     state.k = k
     β = normres(state)
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "GKL reduction to dimension $k: subspace normres = $(normres2string(β))"
     end
     state.r = scale!!(r, β)

src/factorizations/lanczos.jl

@@ -172,7 +172,7 @@ function warn_nonhermitian(α, β₁, β₂)
     return nothing
 end
 
-function initialize(iter::LanczosIterator; verbosity::Int=0)
+function initialize(iter::LanczosIterator; verbosity::Int=KrylovDefaults.verbosity[])
     # initialize without using eltype
     x₀ = iter.x₀
     β₀ = norm(x₀)
@@ -191,33 +191,32 @@ function initialize(iter::LanczosIterator; verbosity::Int=0)
     βold = norm(r)
     r = add!!(r, v, -α) # should we use real(α) here?
     β = norm(r)
-    warn_nonhermitian(α, zero(β), β)
     # possibly reorthogonalize
     if iter.orth isa Union{ClassicalGramSchmidt2,ModifiedGramSchmidt2}
         dα = inner(v, r)
         α += dα
         r = add!!(r, v, -dα) # should we use real(dα) here?
         β = norm(r)
-        warn_nonhermitian(α, zero(β), β)
     elseif iter.orth isa Union{ClassicalGramSchmidtIR,ModifiedGramSchmidtIR}
         while eps(one(β)) < β < iter.orth.η * βold
             βold = β
             dα = inner(v, r)
             α += dα
             r = add!!(r, v, -dα) # should we use real(dα) here?
             β = norm(r)
-            warn_nonhermitian(α, zero(β), β)
         end
     end
+    verbosity >= WARN_LEVEL && warn_nonhermitian(α, zero(β), β)
     V = OrthonormalBasis([v])
     αs = [real(α)]
     βs = [β]
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Lanczos initiation at dimension 1: subspace normres = $(normres2string(β))"
     end
     return LanczosFactorization(1, V, αs, βs, r)
 end
-function initialize!(iter::LanczosIterator, state::LanczosFactorization; verbosity::Int=0)
+function initialize!(iter::LanczosIterator, state::LanczosFactorization;
+                     verbosity::Int=KrylovDefaults.verbosity[])
     x₀ = iter.x₀
     V = state.V
     while length(V) > 1
@@ -230,24 +229,25 @@ function initialize!(iter::LanczosIterator, state::LanczosFactorization; verbosi
     w = apply(iter.operator, V[1])
     r, α = orthogonalize!!(w, V[1], iter.orth)
     β = norm(r)
-    warn_nonhermitian(α, zero(β), β)
+    verbosity >= WARN_LEVEL && warn_nonhermitian(α, zero(β), β)
 
     state.k = 1
     push!(αs, real(α))
     push!(βs, β)
     state.r = r
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Lanczos initiation at dimension 1: subspace normres = $(normres2string(β))"
     end
     return state
 end
-function expand!(iter::LanczosIterator, state::LanczosFactorization; verbosity::Int=0)
+function expand!(iter::LanczosIterator, state::LanczosFactorization;
+                 verbosity::Int=KrylovDefaults.verbosity[])
     βold = normres(state)
     V = state.V
     r = state.r
     V = push!(V, scale!!(r, 1 / βold))
     r, α, β = lanczosrecurrence(iter.operator, V, βold, iter.orth)
-    warn_nonhermitian(α, βold, β)
+    verbosity >= WARN_LEVEL && warn_nonhermitian(α, βold, β)
 
     αs = push!(state.αs, real(α))
     βs = push!(state.βs, β)
@@ -256,12 +256,12 @@ function expand!(iter::LanczosIterator, state::LanczosFactorization; verbosity::
 
     state.k += 1
     state.r = r
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Lanczos expansion to dimension $(state.k): subspace normres = $(normres2string(β))"
     end
     return state
 end
-function shrink!(state::LanczosFactorization, k; verbosity::Int=0)
+function shrink!(state::LanczosFactorization, k; verbosity::Int=KrylovDefaults.verbosity[])
     length(state) == length(state.V) ||
         error("we cannot shrink LanczosFactorization without keeping Lanczos vectors")
     length(state) <= k && return state
@@ -274,7 +274,7 @@ function shrink!(state::LanczosFactorization, k; verbosity::Int=0)
     resize!(state.βs, k)
     state.k = k
     β = normres(state)
-    if verbosity > 0
+    if verbosity > EACHITERATION_LEVEL
         @info "Lanczos reduction to dimension $k: subspace normres = $(normres2string(β))"
     end
     state.r = scale!!(r, β)

src/linsolve/gmres.jl

@@ -37,7 +37,7 @@ function linsolve(operator, b, x₀, alg::GMRES, a₀::Number=0, a₁::Number=1;
     numops = 1 # operator has been applied once to determine T and r
 
     iter = ArnoldiIterator(operator, r, alg.orth)
-    fact = initialize(iter)
+    fact = initialize(iter; verbosity=0)
     sizehint!(fact, alg.krylovdim)
     numops += 1 # start applies operator once
 
@@ -56,7 +56,7 @@ function linsolve(operator, b, x₀, alg::GMRES, a₀::Number=0, a₁::Number=1;
             if alg.verbosity >= EACHITERATION_LEVEL
                 @info "GMRES linsolve in iteration $numiter; step $k: normres = $(normres2string(β))"
             end
-            fact = expand!(iter, fact)
+            fact = expand!(iter, fact; verbosity=0)
             numops += 1 # expand! applies the operator once
             k = length(fact)
             H = rayleighquotient(fact)
@@ -132,6 +132,6 @@ function linsolve(operator, b, x₀, alg::GMRES, a₀::Number=0, a₁::Number=1;
 
         # Restart Arnoldi factorization with new r
         iter = ArnoldiIterator(operator, r, alg.orth)
-        fact = initialize!(iter, fact)
+        fact = initialize!(iter, fact; verbosity=0)
     end
 end

src/matrixfun/expintegrator.jl

@@ -172,7 +172,7 @@ function expintegrator(A, t::Number, u::Tuple, alg::Union{Lanczos,Arnoldi})
     else
         iter = ArnoldiIterator(A, w[p + 1], alg.orth)
     end
-    fact = initialize(iter; verbosity=alg.verbosity - 2)
+    fact = initialize(iter; verbosity=alg.verbosity)
     numops += 1
     sizehint!(fact, krylovdim)
 
@@ -283,7 +283,7 @@ function expintegrator(A, t::Number, u::Tuple, alg::Union{Lanczos,Arnoldi})
             end
         end
         if K < krylovdim
-            fact = expand!(iter, fact; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = expand!(iter, fact; verbosity=alg.verbosity)
             numops += 1
         else
             for j in 1:p
@@ -314,7 +314,7 @@ function expintegrator(A, t::Number, u::Tuple, alg::Union{Lanczos,Arnoldi})
             else
                 iter = ArnoldiIterator(A, w[p + 1], alg.orth)
             end
-            fact = initialize!(iter, fact; verbosity=alg.verbosity - EACHITERATION_LEVEL)
+            fact = initialize!(iter, fact; verbosity=alg.verbosity)
             numops += 1
             numiter += 1
         end