make sure verbosity works for HYPRE

Author: jClugstor

ext/LinearSolveHYPREExt.jl

@@ -7,6 +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 UnPack: @unpack
 using Setfield: @set!
 
@@ -64,7 +65,7 @@ function SciMLBase.init(prob::LinearProblem, alg::HYPREAlgorithm,
                              eltype(prob.A)),
         # TODO: Implement length() for HYPREVector in HYPRE.jl?
         maxiters::Int = prob.b isa HYPREVector ? 1000 : length(prob.b),
-        verbose::LinearVerbosity = false,
+        verbose = LinearVerbosity(),
         Pl = LinearAlgebra.I,
         Pr = LinearAlgebra.I,
         assumptions = OperatorAssumptions(),
@@ -159,10 +160,22 @@ function create_solver(alg::HYPREAlgorithm, cache::LinearCache)
     solver = create_solver(alg.solver, comm)
 
     # 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
+
+
     solver_options = (;
         AbsoluteTol = cache.abstol,
         MaxIter = cache.maxiters,
-        PrintLevel = Int(cache.verbose),
+        PrintLevel = verbose,
         Tol = cache.reltol)
 
     # Preconditioner (uses Pl even though it might not be a *left* preconditioner just *a*

src/verbosity.jl

@@ -1,13 +1,14 @@
 # Linear Verbosity
 
-linear_defaults = Dict(
+const linear_defaults = Dict{Symbol, Verbosity.Type}(
     :default_lu_fallback => Verbosity.Warn(),
     :no_right_preconditioning => Verbosity.Warn(),
     :using_iterative_solvers => Verbosity.Warn(),
     :using_IterativeSolvers => Verbosity.Warn(),
     :IterativeSolvers_iterations => Verbosity.Warn(),
     :KrylovKit_verbosity => Verbosity.Warn(),
-    :KrylovJL_verbosity => Verbosity.None()
+    :KrylovJL_verbosity => Verbosity.None(),
+    :HYPRE_verbosity => Verbosity.Level(1)
 )
 mutable struct LinearErrorControlVerbosity
     default_lu_fallback::Verbosity.Type
@@ -76,14 +77,16 @@ mutable struct LinearNumericalVerbosity
     IterativeSolvers_iterations::Verbosity.Type
     KrylovKit_verbosity::Verbosity.Type
     KrylovJL_verbosity::Verbosity.Type
+    HYPRE_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])
+            KrylovJL_verbosity = linear_defaults[:KrylovJL_verbosity],
+            HYPRE_verbosity = linear_defaults[:HYPRE_verbosity])
         new(using_IterativeSolvers, IterativeSolvers_iterations,
-            KrylovKit_verbosity, KrylovJL_verbosity)
+            KrylovKit_verbosity, KrylovJL_verbosity, HYPRE_verbosity)
     end
 
     function LinearNumericalVerbosity(verbose::Verbosity.Type)

test/hypretests.jl

@@ -4,6 +4,7 @@ using HYPRE.LibHYPRE: HYPRE_BigInt,
                       HYPRE_IJVectorGetValues, HYPRE_Int
 using LinearAlgebra
 using LinearSolve
+using LinearSolve: LinearVerbosity
 using MPI
 using Random: MersenneTwister
 using SparseArrays
@@ -78,7 +79,7 @@ function test_interface(alg; kw...)
 
     atol = 1e-6
     rtol = 1e-6
-    cache_kwargs = (; verbose = true, abstol = atol, reltol = rtol, maxiters = 50)
+    cache_kwargs = (; verbose = LinearVerbosity(), abstol = atol, reltol = rtol, maxiters = 50)
     cache_kwargs = merge(cache_kwargs, kw)
 
     # prob1, prob3 with initial guess, prob2, prob4 without