Skip to content

Commit f23fb89

Browse files
committed
get rid of ScopedValues experiment
1 parent bb58b6a commit f23fb89

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

lib/NonlinearSolveBase/src/NonlinearSolveBase.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ using SymbolicIndexingInterface: SymbolicIndexingInterface
2929
using LinearAlgebra: LinearAlgebra, Diagonal, norm, ldiv!, diagind, mul!
3030
using Markdown: @doc_str
3131
using Printf: @printf
32-
using Base.ScopedValues
3332

3433
const DI = DifferentiationInterface
3534
const SII = SymbolicIndexingInterface
@@ -38,8 +37,6 @@ include("public.jl")
3837
include("utils.jl")
3938
include("verbosity.jl")
4039

41-
const nonlinear_verbose = ScopedValue{Union{NonlinearVerbosity{true}, NonlinearVerbosity{false}}}()
42-
4340
include("abstract_types.jl")
4441
include("common_defaults.jl")
4542
include("termination_conditions.jl")

lib/NonlinearSolveBase/src/solve.jl

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@ function SciMLBase.__solve(
22
prob::AbstractNonlinearProblem, alg::AbstractNonlinearSolveAlgorithm, args...;
33
verbose = NonlinearVerbosity(), linsolve_kwargs = (;), kwargs...
44
)
5-
if !haskey(linsolve_kwargs, :verbose)
6-
linsolve_kwargs = merge(
7-
linsolve_kwargs, (; verbose = verbose.linear_verbosity))
8-
end
9-
10-
@with nonlinear_verbose => verbose begin
11-
cache = SciMLBase.__init(prob, alg, args...; linsolve_kwargs, kwargs...)
5+
cache = SciMLBase.__init(prob, alg, args...; kwargs...)
126
sol = CommonSolve.solve!(cache)
13-
end
147

158
return sol
169
end
@@ -291,6 +284,8 @@ end
291284
initializealg
292285

293286
retcode::ReturnCode.T
287+
288+
verbose
294289
end
295290

296291
function get_abstol(cache::NonlinearSolveNoInitCache)

0 commit comments

Comments
 (0)