adding verbosity stuff

Author: jClugstor

lib/BracketingNonlinearSolve/src/BracketingNonlinearSolve.jl

@@ -5,7 +5,7 @@ using PrecompileTools: @compile_workload, @setup_workload
 using Reexport: @reexport
 
 using CommonSolve: CommonSolve, solve
-using NonlinearSolveBase: NonlinearSolveBase, AbstractNonlinearSolveAlgorithm
+using NonlinearSolveBase: NonlinearSolveBase, AbstractNonlinearSolveAlgorithm, NonlinearVerbosity
 using SciMLBase: SciMLBase, IntervalNonlinearProblem, ReturnCode
 
 abstract type AbstractBracketingAlgorithm <: AbstractNonlinearSolveAlgorithm end

lib/BracketingNonlinearSolve/src/bisection.jl

@@ -21,7 +21,7 @@ end
 
 function SciMLBase.__solve(
         prob::IntervalNonlinearProblem, alg::Bisection, args...;
-        maxiters = 1000, abstol = nothing, verbose::Bool = true, kwargs...
+        maxiters = 1000, abstol = nothing, verbose::NonlinearVerbosity = NonlinearVerbosity(), kwargs...
 )
     @assert !SciMLBase.isinplace(prob) "`Bisection` only supports out-of-place problems."
 

lib/BracketingNonlinearSolve/src/brent.jl

@@ -7,7 +7,7 @@ struct Brent <: AbstractBracketingAlgorithm end
 
 function SciMLBase.__solve(
         prob::IntervalNonlinearProblem, alg::Brent, args...;
-        maxiters = 1000, abstol = nothing, verbose::Bool = true, kwargs...
+        maxiters = 1000, abstol = nothing, verbose = NonlinearVerbosity(), kwargs...
 )
     @assert !SciMLBase.isinplace(prob) "`Brent` only supports out-of-place problems."
 

lib/BracketingNonlinearSolve/src/falsi.jl

@@ -7,7 +7,7 @@ struct Falsi <: AbstractBracketingAlgorithm end
 
 function SciMLBase.__solve(
         prob::IntervalNonlinearProblem, alg::Falsi, args...;
-        maxiters = 1000, abstol = nothing, verbose::Bool = true, kwargs...
+        maxiters = 1000, abstol = nothing, verbose = NonlinearVerbosity(), kwargs...
 )
     @assert !SciMLBase.isinplace(prob) "`False` only supports out-of-place problems."
 

lib/BracketingNonlinearSolve/src/itp.jl

@@ -58,7 +58,7 @@ end
 
 function SciMLBase.__solve(
         prob::IntervalNonlinearProblem, alg::ITP, args...;
-        maxiters = 1000, abstol = nothing, verbose::Bool = true, kwargs...
+        maxiters = 1000, abstol = nothing, verbose::NonlinearVerbosity = NonlinearVerbosity(), kwargs...
 )
     @assert !SciMLBase.isinplace(prob) "`ITP` only supports out-of-place problems."
 

lib/BracketingNonlinearSolve/src/ridder.jl

@@ -7,7 +7,7 @@ struct Ridder <: AbstractBracketingAlgorithm end
 
 function SciMLBase.__solve(
         prob::IntervalNonlinearProblem, alg::Ridder, args...;
-        maxiters = 1000, abstol = nothing, verbose::Bool = true, kwargs...
+        maxiters = 1000, abstol = nothing, verbose::NonlinearVerbosity = NonlinearVerbosity(), kwargs...
 )
     @assert !SciMLBase.isinplace(prob) "`Ridder` only supports out-of-place problems."
 

lib/NonlinearSolveBase/Project.toml

@@ -22,6 +22,7 @@ RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SciMLJacobianOperators = "19f34311-ddf3-4b8b-af20-060888a46c0e"
 SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
+SciMLVerbosity = "a05b3ec9-34a1-438a-b0a1-c0adb433119f"
 StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"

lib/NonlinearSolveBase/ext/NonlinearSolveBaseLinearSolveExt.jl

@@ -8,25 +8,26 @@ using SciMLBase: ReturnCode, LinearProblem, LinearAliasSpecifier
 
 using LinearAlgebra: ColumnNorm
 
-using NonlinearSolveBase: NonlinearSolveBase, LinearSolveJLCache, LinearSolveResult, Utils
+using NonlinearSolveBase: NonlinearSolveBase, LinearSolveJLCache, LinearSolveResult, Utils, NonlinearVerbosity
 
 function (cache::LinearSolveJLCache)(;
         A = nothing, b = nothing, linu = nothing,
-        reuse_A_if_factorization = false, verbose = true, kwargs...
+        reuse_A_if_factorization = false, verbose = NonlinearVerbosity(), kwargs...
 )
     cache.stats.nsolve += 1
 
     update_A!(cache, A, reuse_A_if_factorization)
     b !== nothing && setproperty!(cache.lincache, :b, b)
     linu !== nothing && NonlinearSolveBase.set_lincache_u!(cache, linu)
-
+    
     linres = solve!(cache.lincache)
     cache.lincache = linres.cache
+    #Main.@infiltrate
     # Unfortunately LinearSolve.jl doesn't have the most uniform ReturnCode handling
-    if linres.retcode === ReturnCode.Failure
+    if linres.retcode === ReturnCode.Failure || linres.retcode === ReturnCode.Stalled
         structured_mat = ArrayInterface.isstructured(cache.lincache.A)
         is_gpuarray = ArrayInterface.device(cache.lincache.A) isa ArrayInterface.GPU
-
+        #Main.@infiltrate
         if !(cache.linsolve isa QRFactorization{ColumnNorm}) && !is_gpuarray &&
            !structured_mat
             if verbose

lib/NonlinearSolveBase/src/NonlinearSolveBase.jl

@@ -23,6 +23,7 @@ using SciMLBase: SciMLBase, ReturnCode, AbstractODEIntegrator, AbstractNonlinear
                  LinearAliasSpecifier, ImmutableNonlinearProblem
 using SciMLJacobianOperators: JacobianOperator, StatefulJacobianOperator
 using SciMLOperators: AbstractSciMLOperator, IdentityOperator
+using SciMLVerbosity: @match, @SciMLMessage, Verbosity, AbstractVerbositySpecifier
 using SymbolicIndexingInterface: SymbolicIndexingInterface
 
 using LinearAlgebra: LinearAlgebra, Diagonal, norm, ldiv!, diagind, mul!
@@ -46,6 +47,7 @@ include("timer_outputs.jl")
 include("tracing.jl")
 include("wrappers.jl")
 include("polyalg.jl")
+include("verbosity.jl")
 
 include("descent/common.jl")
 include("descent/newton.jl")
@@ -85,6 +87,8 @@ export DescentResult, SteepestDescent, NewtonDescent, DampedNewtonDescent, Dogle
 
 export NonlinearSolvePolyAlgorithm
 
+export NonlinearVerbosity, NonlinearPerformanceVerbosity, NonlinearErrorControlVerbosity, NonlinearNumericalVerbosity
+
 export pickchunksize
 
 end

lib/NonlinearSolveBase/src/descent/damped_newton.jl

@@ -135,6 +135,16 @@ function InternalAPI.init(
         A, b = Utils.maybe_symmetric(J_damped), Utils.safe_vec(Jᵀfu)
         rhs_cache = nothing
     end
+    
+    if !haskey(linsolve_kwargs, :verbose)
+        if kwargs[:verbose].linear_verbosity isa Verbosity.Type
+            linsolve_kwargs = merge(
+                linsolve_kwargs, (; verbose = LinearVerbosity(kwargs[:verbose])))
+        else
+            linsolve_kwargs = merge(
+                linsolve_kwargs, (; verbose = kwargs[:verbose].linear_verbosity))
+        end
+    end
 
     lincache = construct_linear_solver(
         alg, alg.linsolve, A, b, Utils.safe_vec(u);