Skip to content

Commit 2ff5aa6

Browse files
committed
Run formatter
1 parent 28352f3 commit 2ff5aa6

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

Diff for: src/core/approximate_jacobian.jl

+4-5
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,17 @@ function SciMLBase.__init(
165165
INV = store_inverse_jacobian(alg.update_rule)
166166

167167
linsolve = get_linear_solver(alg.descent)
168-
initialization_cache = __internal_init(
169-
prob, alg.initialization, alg, f, fu, u, p; stats, linsolve, maxiters, internalnorm)
168+
initialization_cache = __internal_init(prob, alg.initialization, alg, f, fu, u, p;
169+
stats, linsolve, maxiters, internalnorm)
170170

171171
abstol, reltol, termination_cache = init_termination_cache(
172172
prob, abstol, reltol, fu, u, termination_condition)
173173
linsolve_kwargs = merge((; abstol, reltol), linsolve_kwargs)
174174

175175
J = initialization_cache(nothing)
176176
inv_workspace, J = INV ? __safe_inv_workspace(J) : (nothing, J)
177-
descent_cache = __internal_init(
178-
prob, alg.descent, J, fu, u; stats, abstol, reltol, internalnorm,
179-
linsolve_kwargs, pre_inverted = Val(INV), timer)
177+
descent_cache = __internal_init(prob, alg.descent, J, fu, u; stats, abstol, reltol,
178+
internalnorm, linsolve_kwargs, pre_inverted = Val(INV), timer)
180179
du = get_du(descent_cache)
181180

182181
reinit_rule_cache = __internal_init(alg.reinit_rule, J, fu, u, du)

Diff for: src/core/generalized_first_order.jl

+6-5
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,10 @@ end
153153

154154
function SciMLBase.__init(
155155
prob::AbstractNonlinearProblem{uType, iip}, alg::GeneralizedFirstOrderAlgorithm,
156-
args...; stats=empty_nlstats(), alias_u0 = false, maxiters = 1000, abstol = nothing,
157-
reltol = nothing, maxtime = nothing, termination_condition = nothing,
158-
internalnorm = DEFAULT_NORM, linsolve_kwargs = (;), kwargs...) where {uType, iip}
156+
args...; stats = empty_nlstats(), alias_u0 = false, maxiters = 1000,
157+
abstol = nothing, reltol = nothing, maxtime = nothing,
158+
termination_condition = nothing, internalnorm = DEFAULT_NORM,
159+
linsolve_kwargs = (;), kwargs...) where {uType, iip}
159160
timer = get_timer_output()
160161
@static_timeit timer "cache construction" begin
161162
(; f, u0, p) = prob
@@ -173,8 +174,8 @@ function SciMLBase.__init(
173174
prob, alg, f, fu, u, p; stats, autodiff = alg.jacobian_ad, linsolve,
174175
jvp_autodiff = alg.forward_ad, vjp_autodiff = alg.reverse_ad)
175176
J = jac_cache(nothing)
176-
descent_cache = __internal_init(prob, alg.descent, J, fu, u; stats, abstol, reltol,
177-
internalnorm, linsolve_kwargs, timer)
177+
descent_cache = __internal_init(prob, alg.descent, J, fu, u; stats, abstol,
178+
reltol, internalnorm, linsolve_kwargs, timer)
178179
du = get_du(descent_cache)
179180

180181
if alg.trustregion !== missing && alg.linesearch !== missing

Diff for: src/core/generic.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function SciMLBase.__solve(prob::Union{NonlinearProblem, NonlinearLeastSquaresProblem},
2-
alg::AbstractNonlinearSolveAlgorithm, args...; stats=empty_nlstats(), kwargs...)
2+
alg::AbstractNonlinearSolveAlgorithm, args...; stats = empty_nlstats(), kwargs...)
33
cache = SciMLBase.__init(prob, alg, args...; stats, kwargs...)
44
return solve!(cache)
55
end

Diff for: src/descent/steepest.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ end
3030
@internal_caches SteepestDescentCache :lincache
3131

3232
@inline function __internal_init(
33-
prob::AbstractNonlinearProblem, alg::SteepestDescent, J, fu,
34-
u; stats, shared::Val{N} = Val(1), pre_inverted::Val{INV} = False,
33+
prob::AbstractNonlinearProblem, alg::SteepestDescent, J, fu, u;
34+
stats, shared::Val{N} = Val(1), pre_inverted::Val{INV} = False,
3535
linsolve_kwargs = (;), abstol = nothing, reltol = nothing,
3636
timer = get_timer_output(), kwargs...) where {INV, N}
3737
INV && @assert length(fu)==length(u) "Non-Square Jacobian Inverse doesn't make sense."
@@ -40,8 +40,8 @@ end
4040
@bb δu_ = similar(u)
4141
end
4242
if INV
43-
lincache = LinearSolverCache(alg, alg.linsolve, transpose(J), _vec(fu),
44-
_vec(u); stats, abstol, reltol, linsolve_kwargs...)
43+
lincache = LinearSolverCache(alg, alg.linsolve, transpose(J), _vec(fu), _vec(u);
44+
stats, abstol, reltol, linsolve_kwargs...)
4545
else
4646
lincache = nothing
4747
end

Diff for: src/globalization/line_search.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ end
251251
end
252252

253253
function __internal_init(
254-
prob::AbstractNonlinearProblem, alg::RobustNonMonotoneLineSearch, f::F, fu,
255-
u, p, args...; stats, internalnorm::IN = DEFAULT_NORM, kwargs...) where {F, IN}
254+
prob::AbstractNonlinearProblem, alg::RobustNonMonotoneLineSearch, f::F, fu, u,
255+
p, args...; stats, internalnorm::IN = DEFAULT_NORM, kwargs...) where {F, IN}
256256
@bb u_cache = similar(u)
257257
@bb fu_cache = similar(fu)
258258
T = promote_type(eltype(fu), eltype(u))
@@ -343,8 +343,8 @@ end
343343
end
344344

345345
function __internal_init(
346-
prob::AbstractNonlinearProblem, alg::LiFukushimaLineSearch, f::F, fu, u,
347-
p, args...; stats, internalnorm::IN = DEFAULT_NORM, kwargs...) where {F, IN}
346+
prob::AbstractNonlinearProblem, alg::LiFukushimaLineSearch, f::F, fu, u, p,
347+
args...; stats, internalnorm::IN = DEFAULT_NORM, kwargs...) where {F, IN}
348348
@bb u_cache = similar(u)
349349
@bb fu_cache = similar(fu)
350350
T = promote_type(eltype(fu), eltype(u))

Diff for: src/globalization/trust_region.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ end
366366
@inline __expand_factor(::Nothing, ::Type{T}, method) where {T} = T(2)
367367

368368
function __internal_init(
369-
prob::AbstractNonlinearProblem, alg::GenericTrustRegionScheme, f::F, fu,
370-
u, p, args...; stats, internalnorm::IF = DEFAULT_NORM, kwargs...) where {F, IF}
369+
prob::AbstractNonlinearProblem, alg::GenericTrustRegionScheme, f::F, fu, u,
370+
p, args...; stats, internalnorm::IF = DEFAULT_NORM, kwargs...) where {F, IF}
371371
T = promote_type(eltype(u), eltype(fu))
372372
u0_norm = internalnorm(u)
373373
fu_norm = internalnorm(fu)

Diff for: src/internal/jacobian.jl

+4-5
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ function reinit_cache!(cache::JacobianCache{iip}, args...; p = cache.p,
4949
cache.uf = JacobianWrapper{iip}(cache.f, p)
5050
end
5151

52-
function JacobianCache(
53-
prob, alg, f::F, fu_, u, p; stats, autodiff = nothing, vjp_autodiff = nothing,
54-
jvp_autodiff = nothing, linsolve = missing) where {F}
52+
function JacobianCache(prob, alg, f::F, fu_, u, p; stats, autodiff = nothing,
53+
vjp_autodiff = nothing, jvp_autodiff = nothing, linsolve = missing) where {F}
5554
iip = isinplace(prob)
5655
uf = JacobianWrapper{iip}(f, p)
5756

@@ -96,8 +95,8 @@ function JacobianCache(
9695
J, f, uf, fu, u, p, jac_cache, alg, stats, autodiff, vjp_autodiff, jvp_autodiff)
9796
end
9897

99-
function JacobianCache(
100-
prob, alg, f::F, ::Number, u::Number, p; stats, autodiff = nothing, kwargs...) where {F}
98+
function JacobianCache(prob, alg, f::F, ::Number, u::Number, p; stats,
99+
autodiff = nothing, kwargs...) where {F}
101100
uf = JacobianWrapper{false}(f, p)
102101
autodiff = get_concrete_forward_ad(autodiff, prob; check_forward_mode = false)
103102
if !(autodiff isa AutoForwardDiff ||

Diff for: src/utils.jl

+3-2
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@ function __build_solution_less_specialize(prob::AbstractNonlinearProblem, alg, u
146146
T = eltype(eltype(u))
147147
N = ndims(u)
148148

149-
return SciMLBase.NonlinearSolution{T, N, typeof(u), typeof(resid), typeof(prob),
150-
typeof(alg), Any, typeof(left), typeof(stats), typeof(trace)}(
149+
return SciMLBase.NonlinearSolution{
150+
T, N, typeof(u), typeof(resid), typeof(prob), typeof(alg),
151+
Any, typeof(left), typeof(stats), typeof(trace)}(
151152
u, resid, prob, alg, retcode, original, left, right, stats, trace)
152153
end
153154

0 commit comments

Comments
 (0)