Restore stats

Author: avik-pal

docs/src/basics/solve.md

@@ -8,12 +8,13 @@ solve(prob::SciMLBase.NonlinearProblem, args...; kwargs...)
 
   - `alias_u0::Bool`: Whether to alias the initial condition or use a copy.
     Defaults to `false`.
-  - `internal_norm::Function`: The norm used by the solver. Default depends on algorithm
+  - `internalnorm::Function`: The norm used by the solver. Default depends on algorithm
     choice.
 
 ## Iteration Controls
 
   - `maxiters::Int`: The maximum number of iterations to perform. Defaults to `1000`.
+  - `maxtime`: The maximum time for solving the nonlinear system of equations. Defaults to `Inf`.
   - `abstol::Number`: The absolute tolerance. Defaults to `real(oneunit(T)) * (eps(real(one(T))))^(4 // 5)`.
   - `reltol::Number`: The relative tolerance. Defaults to `real(oneunit(T)) * (eps(real(one(T))))^(4 // 5)`.
   - `termination_condition`: Termination Condition from DiffEqBase. Defaults to

src/core/generalized_first_order.jl

@@ -132,7 +132,7 @@ function SciMLBase.__init(prob::AbstractNonlinearProblem{uType, iip},
     end
 end
 
-function SciMLBase.step!(cache::GeneralizedFirstOrderAlgorithmCache{iip, GB};
+function __step!(cache::GeneralizedFirstOrderAlgorithmCache{iip, GB};
         recompute_jacobian::Union{Nothing, Bool} = nothing, kwargs...) where {iip, GB}
     @timeit_debug cache.timer "jacobian" begin
         if (recompute_jacobian === nothing || recompute_jacobian) && cache.make_new_jacobian

src/core/generic.jl

@@ -28,8 +28,11 @@ function SciMLBase.solve!(cache::AbstractNonlinearSolveCache)
     #             nothing, nothing; last = Val(true))
     #     end
 
+    stats = SciMLBase.NLStats(get_nf(cache), get_njacs(cache), get_nfactors(cache),
+        get_nsolve(cache), get_nsteps(cache))
+
     return SciMLBase.build_solution(cache.prob, cache.alg, get_u(cache), get_fu(cache);
-        cache.retcode)
+        cache.retcode, stats)
 
     # return SciMLBase.build_solution(cache.prob, cache.alg, get_u(cache), get_fu(cache);
     #     cache.retcode, cache.stats, trace)

src/core/spectral_methods.jl

@@ -75,7 +75,7 @@ function SciMLBase.__init(prob::AbstractNonlinearProblem, alg::GeneralizedDFSane
     end
 end
 
-function SciMLBase.step!(cache::GeneralizedDFSaneCache{iip};
+function __step!(cache::GeneralizedDFSaneCache{iip};
         recompute_jacobian::Union{Nothing, Bool} = nothing, kwargs...) where {iip}
     if recompute_jacobian !== nothing
         @warn "GeneralizedDFSane is a Jacobian-Free Algorithm. Ignoring \

src/internal/helpers.jl

@@ -203,8 +203,7 @@ function __construct_extension_jac(prob, alg, u0, fu; can_handle_oop::Val = Fals
 end
 
 # Query Statistics
-# TODO: Deal with the total time in a dedicated way
-for stat in (:nsolve, :nfactors, :nsteps, :njacs, :nf) # , :total_time)
+for stat in (:nsolve, :nfactors, :nsteps, :njacs, :nf)
     fname = Symbol("get_$(stat)")
     @eval @inline $(fname)(cache) = __query_stat(cache, $(Val(stat)))
 end
@@ -216,7 +215,7 @@ end
 end
 
 @inline __get_data(x::Number) = x
-@inline __get_data(x::Base.RefValue{<:Int}) = x
+@inline __get_data(x::Base.RefValue{Int}) = x[]
 
 # Auto-generate some of the helper functions
 macro internal_caches(cType, internal_cache_names...)

src/internal/linear_solve.jl

@@ -94,7 +94,7 @@ end
 
 @inline __update_A!(cache::LinearSolverCache, ::Nothing, reuse) = cache
 @inline function __update_A!(cache::LinearSolverCache, A, reuse)
-    return __update_A!(cache, __getproperty(cache.linsolve, Val(:alg)), A, reuse)
+    return __update_A!(cache, __getproperty(cache.lincache, Val(:alg)), A, reuse)
 end
 @inline function __update_A!(cache, alg, A, reuse)
     # Not a Factorization Algorithm so don't update `nfactors`