make use of new SciMLVerbosity stuff

Author: jClugstor

ext/LinearSolveHYPREExt.jl

@@ -7,7 +7,7 @@ using LinearSolve: HYPREAlgorithm, LinearCache, LinearProblem, LinearSolve,
                    OperatorAssumptions, default_tol, init_cacheval, __issquare,
                    __conditioning, LinearSolveAdjoint, LinearVerbosity
 using SciMLBase: LinearProblem, LinearAliasSpecifier, SciMLBase
-using SciMLVerbosity: @match, Verbosity
+using SciMLVerbosity: @match, Verbosity, verbosity_to_int
 using UnPack: @unpack
 using Setfield: @set!
 
@@ -162,15 +162,7 @@ function create_solver(alg::HYPREAlgorithm, cache::LinearCache)
     # Construct solver options
 
 
-    # This should be a function in SciMLVerbosity
-    verbose = @match cache.verbose.numerical.HYPRE_verbosity begin
-            Verbosity.None() => 0
-            Verbosity.Info() => 1
-            Verbosity.Warn() => 2
-            Verbosity.Error() => 3
-            Verbosity.Level(i) => i
-    end
-
+    verbose = verbosity_to_int(cache.verbose.numerical.HYPRE_verbosity)
 
     solver_options = (;
         AbsoluteTol = cache.abstol,

ext/LinearSolveKrylovKitExt.jl

@@ -1,7 +1,7 @@
 module LinearSolveKrylovKitExt
 
 using LinearSolve, KrylovKit, LinearAlgebra
-using SciMLVerbosity: @match, Verbosity
+using SciMLVerbosity: @match, Verbosity, verbosity_to_int
 using LinearSolve: LinearCache, DEFAULT_PRECS
 
 function LinearSolve.KrylovKitJL(args...;
@@ -26,7 +26,7 @@ function SciMLBase.solve!(cache::LinearCache, alg::KrylovKitJL; kwargs...)
     atol = float(cache.abstol)
     rtol = float(cache.reltol)
     maxiter = cache.maxiters
-    verbosity = verbosity_to_KrylovKit(cache.verbose.numerical.KrylovKit_verbosity)
+    verbosity = verbosity_to_int(cache.verbose.numerical.KrylovKit_verbosity)
     krylovdim = (alg.gmres_restart == 0) ? min(20, size(cache.A, 1)) : alg.gmres_restart
 
     kwargs = (atol = atol, rtol = rtol, maxiter = maxiter, verbosity = verbosity,
@@ -42,15 +42,4 @@ function SciMLBase.solve!(cache::LinearCache, alg::KrylovKitJL; kwargs...)
         iters = iters)
 end
 
-function verbosity_to_KrylovKit(verb::Verbosity.Type)
-    @match verb begin
-        Verbosity.None() => 0
-        Verbosity.Warn() => 1
-        Verbosity.Error() => 2
-        Verbosity.Info() => 3
-        Verbosity.Level(x) => x
-        _ => error("Not a valid verbosity level for KrylovKit.")
-    end
-end
-
 end

ext/LinearSolvePardisoExt.jl

@@ -73,7 +73,10 @@ function LinearSolve.init_cacheval(alg::PardisoJL,
             error("Number type not supported by Pardiso")
         end
     end
-    verbose && Pardiso.set_msglvl!(solver, Pardiso.MESSAGE_LEVEL_ON)
+
+    @SciMLMessage(verbose, :pardiso_verbosity, :numerical) do 
+        Pardiso.set_msglvl!(solver, Pardiso.MESSAGE_LEVEL_ON)
+    end
 
     #=
     Note: It is recommended to use IPARM(11)=1 (scaling) and IPARM(13)=1 (matchings) for

src/LinearSolve.jl

@@ -18,7 +18,7 @@ using SciMLBase: SciMLBase, LinearAliasSpecifier, AbstractSciMLOperator,
                  init, solve!, reinit!, solve, ReturnCode, LinearProblem
 using SciMLOperators: SciMLOperators, AbstractSciMLOperator, IdentityOperator, MatrixOperator,
                      has_ldiv!, issquare
-using SciMLVerbosity: Verbosity, @SciMLMessage, @match, AbstractVerbositySpecifier
+using SciMLVerbosity: Verbosity, @SciMLMessage, @match, AbstractVerbositySpecifier, verbosity_to_int, verbosity_to_bool
 using Setfield: @set, @set!
 using UnPack: @unpack
 using DocStringExtensions: DocStringExtensions

src/iterative_wrappers.jl

@@ -284,11 +284,7 @@ function SciMLBase.solve!(cache::LinearCache, alg::KrylovJL; kwargs...)
         cache.cacheval
     end
 
-    krylovJL_verbose = SciMLBase.@match verbose.numerical.KrylovJL_verbosity begin
-        Verbosity.None() => 0
-        ::Verbosity.Type => 1
-        _ => error("Invalid verbosity.")
-    end
+    krylovJL_verbose = verbosity_to_int(verbose.numerical.KrylovJL_verbosity)
 
     args = (cacheval, cache.A, cache.b)
     kwargs = (atol = atol, rtol, itmax, verbose = krylovJL_verbose,

src/verbosity.jl

@@ -8,7 +8,8 @@ const linear_defaults = Dict{Symbol, Verbosity.Type}(
     :IterativeSolvers_iterations => Verbosity.Warn(),
     :KrylovKit_verbosity => Verbosity.Warn(),
     :KrylovJL_verbosity => Verbosity.None(),
-    :HYPRE_verbosity => Verbosity.Level(1)
+    :HYPRE_verbosity => Verbosity.Level(1),
+    :pardiso_verbosity => Verbosity.None()
 )
 mutable struct LinearErrorControlVerbosity
     default_lu_fallback::Verbosity.Type
@@ -78,13 +79,15 @@ mutable struct LinearNumericalVerbosity
     KrylovKit_verbosity::Verbosity.Type
     KrylovJL_verbosity::Verbosity.Type
     HYPRE_verbosity::Verbosity.Type
+    pardiso_verbosity::Verbosity.Type
 
     function LinearNumericalVerbosity(;
             using_IterativeSolvers = linear_defaults[:using_IterativeSolvers],
             IterativeSolvers_iterations = linear_defaults[:IterativeSolvers_iterations],
             KrylovKit_verbosity = linear_defaults[:KrylovKit_verbosity],
             KrylovJL_verbosity = linear_defaults[:KrylovJL_verbosity],
-            HYPRE_verbosity = linear_defaults[:HYPRE_verbosity])
+            HYPRE_verbosity = linear_defaults[:HYPRE_verbosity],
+            pardiso_verbosity = linear_defaults[:pardiso_verbosity])
         new(using_IterativeSolvers, IterativeSolvers_iterations,
             KrylovKit_verbosity, KrylovJL_verbosity, HYPRE_verbosity)
     end