fix init_cacheval issues

Author: jClugstor

ext/LinearSolveHYPREExt.jl

@@ -115,13 +115,18 @@ function SciMLBase.init(prob::LinearProblem, alg::HYPREAlgorithm,
     if verbose isa Bool
         #@warn "Using `true` or `false` for `verbose` is being deprecated. Please use a `LinearVerbosity` type to specify verbosity settings.
         # For details see the verbosity section of the common solver options documentation page."
+        init_cache_verb = verbose
         if verbose
-            verbose = LinearVerbosity()
+            verb_spec = LinearVerbosity()
         else
-            verbose = LinearVerbosity(SciMLLogging.None())
+            verb_spec = LinearVerbosity(SciMLLogging.None())
         end
-    elseif verbose isa SciMLLogging.AbstractMessageLevel
-        verbose = LinearVerbosity(verbose)
+    elseif verbose isa SciMLLogging.AbstractVerbosityPreset
+        verb_spec = LinearVerbosity(verbose)
+        init_cache_verb = verb_spec
+    else
+        verb_spec = verbose
+        init_cache_verb = verb_spec
     end
 
     A = A isa HYPREMatrix ? A : HYPREMatrix(A)
@@ -134,7 +139,7 @@ function SciMLBase.init(prob::LinearProblem, alg::HYPREAlgorithm,
     end
 
     # Initialize internal alg cache
-    cacheval = init_cacheval(alg, A, b, u0, Pl, Pr, maxiters, abstol, reltol, verbose,
+    cacheval = init_cacheval(alg, A, b, u0, Pl, Pr, maxiters, abstol, reltol, init_cache_verb,
         assumptions)
     Tc = typeof(cacheval)
     isfresh = true

ext/LinearSolveIterativeSolversExt.jl

@@ -49,6 +49,15 @@ function LinearSolve.init_cacheval(alg::IterativeSolversJL, A, b, u, Pl, Pr, max
         abstol,
         reltol,
         verbose::Union{LinearVerbosity, Bool}, assumptions::OperatorAssumptions)
+    if verbose isa Bool
+        if verbose
+            verbosity = LinearVerbosity(no_right_preconditioning = SciMLLogging.WarnLevel())
+        else
+            verbosity = LinearVerbosity(SciMLLogging.None())
+        end
+    else
+        verbosity = verbose
+    end
     restart = (alg.gmres_restart == 0) ? min(20, size(A, 1)) : alg.gmres_restart
     s = :idrs_s in keys(alg.kwargs) ? alg.kwargs.idrs_s : 4 # shadow space
 
@@ -58,7 +67,7 @@ function LinearSolve.init_cacheval(alg::IterativeSolversJL, A, b, u, Pl, Pr, max
     iterable = if alg.generate_iterator === IterativeSolvers.cg_iterator!
         !LinearSolve._isidentity_struct(Pr) &&
             @SciMLMessage("$(alg.generate_iterator) doesn't support right preconditioning",
-                verbose, :no_right_preconditioning)
+                verbosity, :no_right_preconditioning)
         alg.generate_iterator(u, A, b, Pl;
             kwargs...)
     elseif alg.generate_iterator === IterativeSolvers.gmres_iterable!
@@ -67,7 +76,7 @@ function LinearSolve.init_cacheval(alg::IterativeSolversJL, A, b, u, Pl, Pr, max
     elseif alg.generate_iterator === IterativeSolvers.idrs_iterable!
         !!LinearSolve._isidentity_struct(Pr) &&
             @SciMLMessage("$(alg.generate_iterator) doesn't support right preconditioning",
-                verbose, :no_right_preconditioning)
+                verbosity, :no_right_preconditioning)
         history = IterativeSolvers.ConvergenceHistory(partial = true)
         history[:abstol] = abstol
         history[:reltol] = reltol
@@ -76,7 +85,7 @@ function LinearSolve.init_cacheval(alg::IterativeSolversJL, A, b, u, Pl, Pr, max
     elseif alg.generate_iterator === IterativeSolvers.bicgstabl_iterator!
         !!LinearSolve._isidentity_struct(Pr) &&
             @SciMLMessage("$(alg.generate_iterator) doesn't support right preconditioning",
-                verbose, :no_right_preconditioning)
+                verbosity, :no_right_preconditioning)
         alg.generate_iterator(u, A, b, alg.args...; Pl = Pl,
             abstol = abstol, reltol = reltol,
             max_mv_products = maxiters * 2,

src/common.jl

@@ -267,7 +267,7 @@ function __init(prob::LinearProblem, alg::SciMLLinearSolveAlgorithm,
         abstol = default_tol(real(eltype(prob.b))),
         reltol = default_tol(real(eltype(prob.b))),
         maxiters::Int = length(prob.b),
-        verbose = LinearVerbosity(),
+        verbose = true,
         Pl = nothing,
         Pr = nothing,
         assumptions = OperatorAssumptions(issquare(prob.A)),
@@ -325,17 +325,20 @@ function __init(prob::LinearProblem, alg::SciMLLinearSolveAlgorithm,
     end
 
     if verbose isa Bool
-        @warn "Using `true` or `false` for `verbose` is being deprecated. Please use a `LinearVerbosity` type to specify verbosity settings.
-        For details see the verbosity section of the common solver options documentation page."
+        # @warn "Using `true` or `false` for `verbose` is being deprecated. Please use a `LinearVerbosity` type to specify verbosity settings.
+        # For details see the verbosity section of the common solver options documentation page."
+        init_cache_verb = verbose
         if verbose 
             verbose_spec = LinearVerbosity()
         else
             verbose_spec = LinearVerbosity(SciMLLogging.None())
         end
     elseif verbose isa SciMLLogging.AbstractVerbosityPreset
         verbose_spec = LinearVerbosity(verbose)
+        init_cache_verb = verbose_spec
     else
         verbose_spec = verbose
+        init_cache_verb = verbose_spec
     end
 
     b = if issparsematrix(b) && !(A isa Diagonal)
@@ -375,7 +378,7 @@ function __init(prob::LinearProblem, alg::SciMLLinearSolveAlgorithm,
         # TODO: deprecate once all docs are updated to the new form
         #@warn "passing Preconditioners at `init`/`solve` time is deprecated. Instead add a `precs` function to your algorithm."
     end
-    cacheval = init_cacheval(alg, A, b, u0_, Pl, Pr, maxiters, abstol, reltol, verbose_spec,
+    cacheval = init_cacheval(alg, A, b, u0_, Pl, Pr, maxiters, abstol, reltol, init_cache_verb,
         assumptions)
     isfresh = true
     precsisfresh = false

test/verbosity.jl

@@ -106,8 +106,6 @@ end
         prob,
         verbose = LinearVerbosity(default_lu_fallback = WarnLevel()))
 
-    @test_logs (:warn, r"Using `true` or `false` for `verbose` is being deprecated") match_mode=:any min_level=SciMLLogging.Logging.Warn solve(prob, verbose = false)
-
     @test_logs (:info,
         "LU factorization failed, falling back to QR factorization. `A` is potentially rank-deficient.") solve(
         prob,