Skip to content

Commit 073395b

Browse files
committed
Run Formatter
1 parent 9e46f00 commit 073395b

37 files changed

+390
-247
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NonlinearSolve"
22
uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
33
authors = ["SciML"]
4-
version = "3.5.4"
4+
version = "3.6.0"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Documenter, DocumenterCitations
22
using NonlinearSolve,
3-
SimpleNonlinearSolve, Sundials, SteadyStateDiffEq, SciMLBase, DiffEqBase
3+
SimpleNonlinearSolve, Sundials, SteadyStateDiffEq, SciMLBase, DiffEqBase
44

55
cp(joinpath(@__DIR__, "Manifest.toml"), joinpath(@__DIR__, "src/assets/Manifest.toml"),
66
force = true)

docs/pages.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ pages = [
4343
"devdocs/operators.md",
4444
"devdocs/algorithm_helpers.md"],
4545
"Release Notes" => "release_notes.md",
46-
"References" => "references.md",
46+
"References" => "references.md"
4747
]

docs/src/basics/faq.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,19 @@ myfun(x, lv) = x * sin(x) - lv
1515
1616
function f(out, levels, u0)
1717
for i in 1:N
18-
out[i] = solve(IntervalNonlinearProblem{false}(IntervalNonlinearFunction{false}(myfun),
19-
u0, levels[i]), Falsi()).u
18+
out[i] = solve(
19+
IntervalNonlinearProblem{false}(IntervalNonlinearFunction{false}(myfun),
20+
u0, levels[i]),
21+
Falsi()).u
2022
end
2123
end
2224
2325
function f2(out, levels, u0)
2426
for i in 1:N
25-
out[i] = solve(NonlinearProblem{false}(NonlinearFunction{false}(myfun),
26-
u0, levels[i]), SimpleNewtonRaphson()).u
27+
out[i] = solve(
28+
NonlinearProblem{false}(NonlinearFunction{false}(myfun),
29+
u0, levels[i]),
30+
SimpleNewtonRaphson()).u
2731
end
2832
end
2933

docs/src/basics/sparsity_detection.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ NonlinearSolve will automatically perform matrix coloring and use sparse differe
2222
Now you can help the solver further by providing the color vector. This can be done by
2323

2424
```julia
25-
prob = NonlinearProblem(NonlinearFunction(nlfunc; sparsity = jac_prototype,
25+
prob = NonlinearProblem(
26+
NonlinearFunction(nlfunc; sparsity = jac_prototype,
2627
colorvec = colorvec), x0)
2728
# OR
28-
prob = NonlinearProblem(NonlinearFunction(nlfunc; jac_prototype = jac_prototype,
29+
prob = NonlinearProblem(
30+
NonlinearFunction(nlfunc; jac_prototype = jac_prototype,
2931
colorvec = colorvec), x0)
3032
```
3133

@@ -47,7 +49,8 @@ algorithm you want to use, then you can create your problem as follows:
4749
prob = NonlinearProblem(NonlinearFunction(nlfunc; sparsity = SymbolicsSparsityDetection()),
4850
x0) # Remember to have Symbolics.jl loaded
4951
# OR
50-
prob = NonlinearProblem(NonlinearFunction(nlfunc; sparsity = ApproximateJacobianSparsity()),
52+
prob = NonlinearProblem(
53+
NonlinearFunction(nlfunc; sparsity = ApproximateJacobianSparsity()),
5154
x0)
5255
```
5356

docs/src/devdocs/internal_interfaces.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ NonlinearSolve.AbstractNonlinearSolveCache
1313
```@docs
1414
NonlinearSolve.AbstractDescentAlgorithm
1515
NonlinearSolve.AbstractDescentCache
16+
NonlinearSolve.DescentResult
1617
```
1718

1819
## Approximate Jacobian

docs/src/tutorials/large_systems.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,14 @@ for the exact sparsity detection case, we left out the time it takes to perform
308308
sparsity detection. Let's compare the two by setting the sparsity detection algorithms.
309309

310310
```@example ill_conditioned_nlprob
311-
prob_brusselator_2d_exact = NonlinearProblem(NonlinearFunction(brusselator_2d_loop;
312-
sparsity = SymbolicsSparsityDetection()), u0, p; abstol = 1e-10, reltol = 1e-10)
313-
prob_brusselator_2d_approx = NonlinearProblem(NonlinearFunction(brusselator_2d_loop;
314-
sparsity = ApproximateJacobianSparsity()), u0, p; abstol = 1e-10, reltol = 1e-10)
311+
prob_brusselator_2d_exact = NonlinearProblem(
312+
NonlinearFunction(brusselator_2d_loop;
313+
sparsity = SymbolicsSparsityDetection()),
314+
u0, p; abstol = 1e-10, reltol = 1e-10)
315+
prob_brusselator_2d_approx = NonlinearProblem(
316+
NonlinearFunction(brusselator_2d_loop;
317+
sparsity = ApproximateJacobianSparsity()),
318+
u0, p; abstol = 1e-10, reltol = 1e-10)
315319
316320
@btime solve(prob_brusselator_2d_exact, NewtonRaphson());
317321
@btime solve(prob_brusselator_2d_approx, NewtonRaphson());

docs/src/tutorials/modelingtoolkit.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ u0 = [x => 1.0,
2222
z => 0.0]
2323
2424
ps = [σ => 10.0
25-
ρ => 26.0
26-
β => 8 / 3]
25+
ρ => 26.0
26+
β => 8 / 3]
2727
2828
prob = NonlinearProblem(ns, u0, ps)
2929
sol = solve(prob, NewtonRaphson())
@@ -65,7 +65,7 @@ eqs = [
6565
0 ~ u2 - cos(u1),
6666
0 ~ u3 - hypot(u1, u2),
6767
0 ~ u4 - hypot(u2, u3),
68-
0 ~ u5 - hypot(u4, u1),
68+
0 ~ u5 - hypot(u4, u1)
6969
]
7070
@named sys = NonlinearSystem(eqs, [u1, u2, u3, u4, u5], [])
7171
```

ext/NonlinearSolveMINPACKExt.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ using MINPACK, NonlinearSolve, SciMLBase
44
import FastClosures: @closure
55

66
function SciMLBase.__solve(prob::Union{NonlinearLeastSquaresProblem,
7-
NonlinearProblem}, alg::CMINPACK, args...; abstol = nothing, maxiters = 1000,
7+
NonlinearProblem},
8+
alg::CMINPACK, args...; abstol = nothing, maxiters = 1000,
89
alias_u0::Bool = false, show_trace::Val{ShT} = Val(false),
910
store_trace::Val{StT} = Val(false), termination_condition = nothing,
1011
kwargs...) where {ShT, StT}

src/NonlinearSolve.jl

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@ import PrecompileTools: @recompile_invalidations, @compile_workload, @setup_work
99

1010
@recompile_invalidations begin
1111
using ADTypes, ConcreteStructs, DiffEqBase, FastBroadcast, FastClosures, LazyArrays,
12-
LineSearches, LinearAlgebra, LinearSolve, MaybeInplace, Preferences, Printf,
13-
SciMLBase, SimpleNonlinearSolve, SparseArrays, SparseDiffTools
12+
LineSearches, LinearAlgebra, LinearSolve, MaybeInplace, Preferences, Printf,
13+
SciMLBase, SimpleNonlinearSolve, SparseArrays, SparseDiffTools
1414

1515
import ArrayInterface: undefmatrix, can_setindex, restructure, fast_scalar_indexing
1616
import DiffEqBase: AbstractNonlinearTerminationMode,
17-
AbstractSafeNonlinearTerminationMode, AbstractSafeBestNonlinearTerminationMode,
18-
NonlinearSafeTerminationReturnCode, get_termination_mode
17+
AbstractSafeNonlinearTerminationMode,
18+
AbstractSafeBestNonlinearTerminationMode,
19+
NonlinearSafeTerminationReturnCode, get_termination_mode
1920
import FiniteDiff
2021
import ForwardDiff
2122
import ForwardDiff: Dual
2223
import LinearSolve: ComposePreconditioner, InvPreconditioner, needs_concrete_A
2324
import RecursiveArrayTools: recursivecopy!, recursivefill!
2425

2526
import SciMLBase: AbstractNonlinearAlgorithm, JacobianWrapper, AbstractNonlinearProblem,
26-
AbstractSciMLOperator, NLStats, _unwrap_val, has_jac, isinplace
27+
AbstractSciMLOperator, NLStats, _unwrap_val, has_jac, isinplace
2728
import SparseDiffTools: AbstractSparsityDetection, AutoSparseEnzyme
2829
import StaticArraysCore: StaticArray, SVector, SArray, MArray, Size, SMatrix, MMatrix
2930
end
@@ -44,11 +45,13 @@ include("adtypes.jl")
4445
include("timer_outputs.jl")
4546
include("internal/helpers.jl")
4647

48+
include("descent/common.jl")
4749
include("descent/newton.jl")
4850
include("descent/steepest.jl")
4951
include("descent/dogleg.jl")
5052
include("descent/damped_newton.jl")
5153
include("descent/geodesic_acceleration.jl")
54+
include("descent/multistep.jl")
5255

5356
include("internal/operators.jl")
5457
include("internal/jacobian.jl")
@@ -95,20 +98,28 @@ include("default.jl")
9598
probs_nlls = NonlinearLeastSquaresProblem[]
9699
nlfuncs = ((NonlinearFunction{false}((u, p) -> (u .^ 2 .- p)[1:1]), [0.1, 0.0]),
97100
(NonlinearFunction{false}((u, p) -> vcat(u .* u .- p, u .* u .- p)), [0.1, 0.1]),
98-
(NonlinearFunction{true}((du, u, p) -> du[1] = u[1] * u[1] - p,
99-
resid_prototype = zeros(1)), [0.1, 0.0]),
100-
(NonlinearFunction{true}((du, u, p) -> du .= vcat(u .* u .- p, u .* u .- p),
101-
resid_prototype = zeros(4)), [0.1, 0.1]))
101+
(
102+
NonlinearFunction{true}((du, u, p) -> du[1] = u[1] * u[1] - p,
103+
resid_prototype = zeros(1)),
104+
[0.1, 0.0]),
105+
(
106+
NonlinearFunction{true}((du, u, p) -> du .= vcat(u .* u .- p, u .* u .- p),
107+
resid_prototype = zeros(4)),
108+
[0.1, 0.1]))
102109
for (fn, u0) in nlfuncs
103110
push!(probs_nlls, NonlinearLeastSquaresProblem(fn, u0, 2.0))
104111
end
105112
nlfuncs = ((NonlinearFunction{false}((u, p) -> (u .^ 2 .- p)[1:1]), Float32[0.1, 0.0]),
106113
(NonlinearFunction{false}((u, p) -> vcat(u .* u .- p, u .* u .- p)),
107114
Float32[0.1, 0.1]),
108-
(NonlinearFunction{true}((du, u, p) -> du[1] = u[1] * u[1] - p,
109-
resid_prototype = zeros(Float32, 1)), Float32[0.1, 0.0]),
110-
(NonlinearFunction{true}((du, u, p) -> du .= vcat(u .* u .- p, u .* u .- p),
111-
resid_prototype = zeros(Float32, 4)), Float32[0.1, 0.1]))
115+
(
116+
NonlinearFunction{true}((du, u, p) -> du[1] = u[1] * u[1] - p,
117+
resid_prototype = zeros(Float32, 1)),
118+
Float32[0.1, 0.0]),
119+
(
120+
NonlinearFunction{true}((du, u, p) -> du .= vcat(u .* u .- p, u .* u .- p),
121+
resid_prototype = zeros(Float32, 4)),
122+
Float32[0.1, 0.1]))
112123
for (fn, u0) in nlfuncs
113124
push!(probs_nlls, NonlinearLeastSquaresProblem(fn, u0, 2.0f0))
114125
end
@@ -132,18 +143,18 @@ end
132143
export NewtonRaphson, PseudoTransient, Klement, Broyden, LimitedMemoryBroyden, DFSane
133144
export GaussNewton, LevenbergMarquardt, TrustRegion
134145
export NonlinearSolvePolyAlgorithm,
135-
RobustMultiNewton, FastShortcutNonlinearPolyalg, FastShortcutNLLSPolyalg
146+
RobustMultiNewton, FastShortcutNonlinearPolyalg, FastShortcutNLLSPolyalg
136147

137148
# Extension Algorithms
138149
export LeastSquaresOptimJL, FastLevenbergMarquardtJL, CMINPACK, NLsolveJL,
139-
FixedPointAccelerationJL, SpeedMappingJL, SIAMFANLEquationsJL
150+
FixedPointAccelerationJL, SpeedMappingJL, SIAMFANLEquationsJL
140151

141152
# Advanced Algorithms -- Without Bells and Whistles
142153
export GeneralizedFirstOrderAlgorithm, ApproximateJacobianSolveAlgorithm, GeneralizedDFSane
143154

144155
# Descent Algorithms
145156
export NewtonDescent, SteepestDescent, Dogleg, DampedNewtonDescent,
146-
GeodesicAcceleration
157+
GeodesicAcceleration
147158

148159
# Globalization
149160
## Line Search Algorithms
@@ -153,9 +164,9 @@ export RadiusUpdateSchemes
153164

154165
# Export the termination conditions from DiffEqBase
155166
export SteadyStateDiffEqTerminationMode, SimpleNonlinearSolveTerminationMode,
156-
NormTerminationMode, RelTerminationMode, RelNormTerminationMode, AbsTerminationMode,
157-
AbsNormTerminationMode, RelSafeTerminationMode, AbsSafeTerminationMode,
158-
RelSafeBestTerminationMode, AbsSafeBestTerminationMode
167+
NormTerminationMode, RelTerminationMode, RelNormTerminationMode, AbsTerminationMode,
168+
AbsNormTerminationMode, RelSafeTerminationMode, AbsSafeTerminationMode,
169+
RelSafeBestTerminationMode, AbsSafeBestTerminationMode
159170

160171
# Tracing Functionality
161172
export TraceAll, TraceMinimal, TraceWithJacobianConditionNumber

0 commit comments

Comments
 (0)