Skip to content

Commit 1aaab02

Browse files
committed
ensure backwards compatibility
1 parent f970cb6 commit 1aaab02

File tree

9 files changed

+94
-0
lines changed

9 files changed

+94
-0
lines changed

lib/BracketingNonlinearSolve/src/brent.jl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ function SciMLBase.__solve(
1111
)
1212
@assert !SciMLBase.isinplace(prob) "`Brent` only supports out-of-place problems."
1313

14+
if verbose isa Bool
15+
if verbose
16+
verbose = NonlinearVerbosity()
17+
else
18+
verbose = NonlinearVerbosity(Verbosity.None())
19+
end
20+
elseif verbose isa Verbosity.Type
21+
verbose = NonlinearVerbosity(verbose)
22+
end
23+
1424
f = Base.Fix2(prob.f, prob.p)
1525
left, right = prob.tspan
1626
fl, fr = f(left), f(right)

lib/BracketingNonlinearSolve/src/falsi.jl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ function SciMLBase.__solve(
1111
)
1212
@assert !SciMLBase.isinplace(prob) "`False` only supports out-of-place problems."
1313

14+
if verbose isa Bool
15+
if verbose
16+
verbose = NonlinearVerbosity()
17+
else
18+
verbose = NonlinearVerbosity(Verbosity.None())
19+
end
20+
elseif verbose isa Verbosity.Type
21+
verbose = NonlinearVerbosity(verbose)
22+
end
23+
1424
f = Base.Fix2(prob.f, prob.p)
1525
l, r = prob.tspan # don't reuse these variables
1626
left, right = prob.tspan

lib/NonlinearSolveBase/src/polyalg.jl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,16 @@ function SciMLBase.__init(
128128
alias_u0 = false # If immutable don't care about aliasing
129129
end
130130

131+
if verbose isa Bool
132+
if verbose
133+
verbose = NonlinearVerbosity()
134+
else
135+
verbose = NonlinearVerbosity(Verbosity.None())
136+
end
137+
elseif verbose isa Verbosity.Type
138+
verbose = NonlinearVerbosity(verbose)
139+
end
140+
131141
u0 = prob.u0
132142
u0_aliased = alias_u0 ? copy(u0) : u0
133143
alias_u0 && (prob = SciMLBase.remake(prob; u0 = u0_aliased))

lib/NonlinearSolveBase/src/solve.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,17 @@ end
132132
stats = NLStats(0, 0, 0, 0, 0), alias_u0 = false, verbose = NonlinearVerbosity(),
133133
initializealg = NonlinearSolveDefaultInit(), kwargs...
134134
) where {N}
135+
136+
if verbose isa Bool
137+
if verbose
138+
verbose = NonlinearVerbosity()
139+
else
140+
verbose = NonlinearVerbosity(Verbosity.None())
141+
end
142+
elseif verbose isa Verbosity.Type
143+
verbose = NonlinearVerbosity(verbose)
144+
end
145+
135146
sol_syms = [gensym("sol") for _ in 1:N]
136147
prob_syms = [gensym("prob") for _ in 1:N]
137148
u_result_syms = [gensym("u_result") for _ in 1:N]

lib/NonlinearSolveFirstOrder/src/solve.jl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,16 @@ function SciMLBase.__init(
147147
NonlinearSolveBase.select_reverse_mode_autodiff(prob, alg.vjp_autodiff)
148148
end
149149

150+
if verbose isa Bool
151+
if verbose
152+
verbose = NonlinearVerbosity()
153+
else
154+
verbose = NonlinearVerbosity(Verbosity.None())
155+
end
156+
elseif verbose isa Verbosity.Type
157+
verbose = NonlinearVerbosity(verbose)
158+
end
159+
150160
timer = get_timer_output()
151161
@static_timeit timer "cache construction" begin
152162
u = Utils.maybe_unaliased(prob.u0, alias_u0)

lib/NonlinearSolveQuasiNewton/src/initialization.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,17 @@ function InternalAPI.init(
161161
solver, f, fu, u, p; internalnorm, maxiters, kwargs...
162162
)
163163
end
164+
165+
if verbose isa Bool
166+
if verbose
167+
verbose = NonlinearVerbosity()
168+
else
169+
verbose = NonlinearVerbosity(Verbosity.None())
170+
end
171+
elseif verbose isa Verbosity.Type
172+
verbose = NonlinearVerbosity(verbose)
173+
end
174+
164175
# Pay to cost of slightly more allocations to prevent type-instability for StaticArrays
165176
α = inv(Utils.initial_jacobian_scaling_alpha(alg.alpha, u, fu, internalnorm))
166177
if u isa StaticArray

lib/NonlinearSolveQuasiNewton/src/solve.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,17 @@ function SciMLBase.__init(
148148
) where {F}
149149
timer = get_timer_output()
150150
@static_timeit timer "cache construction" begin
151+
152+
if verbose isa Bool
153+
if verbose
154+
verbose = NonlinearVerbosity()
155+
else
156+
verbose = NonlinearVerbosity(Verbosity.None())
157+
end
158+
elseif verbose isa Verbosity.Type
159+
verbose = NonlinearVerbosity(verbose)
160+
end
161+
151162
u = Utils.maybe_unaliased(prob.u0, alias_u0)
152163
fu = Utils.evaluate_f(prob, u)
153164
@bb u_cache = copy(u)

lib/NonlinearSolveSpectralMethods/src/solve.jl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,16 @@ function SciMLBase.__init(
151151
σ_n = T(alg.σ_1)
152152
end
153153

154+
if verbose isa Bool
155+
if verbose
156+
verbose = NonlinearVerbosity()
157+
else
158+
verbose = NonlinearVerbosity(Verbosity.None())
159+
end
160+
elseif verbose isa Verbosity.Type
161+
verbose = NonlinearVerbosity(verbose)
162+
end
163+
154164
cache = GeneralizedDFSaneCache(
155165
fu, fu_cache, u, u_cache, prob.p, du, alg, prob,
156166
σ_n, T(alg.σ_min), T(alg.σ_max),

lib/SimpleNonlinearSolve/src/lbroyden.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,17 @@ function SciMLBase.__solve(
4444
prob, alg, args...; termination_condition, kwargs...
4545
)
4646
end
47+
48+
if verbose isa Bool
49+
if verbose
50+
verbose = NonlinearVerbosity()
51+
else
52+
verbose = NonlinearVerbosity(Verbosity.None())
53+
end
54+
elseif verbose isa Verbosity.Type
55+
verbose = NonlinearVerbosity(verbose)
56+
end
57+
4758
@SciMLMessage("Specifying `termination_condition = $(termination_condition)` for \
4859
`SimpleLimitedMemoryBroyden` with `SArray` is not non-allocating. Use \
4960
either `termination_condition = AbsNormTerminationMode(Base.Fix2(norm, Inf))` \

0 commit comments

Comments
 (0)