Skip to content

Commit 2d4a35d

Browse files
committed
chore: run formatter
1 parent d0389b7 commit 2d4a35d

File tree

6 files changed

+41
-25
lines changed

6 files changed

+41
-25
lines changed

lib/NonlinearSolveBase/src/NonlinearSolveBase.jl

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
module NonlinearSolveBase
22

3+
using Compat: @compat
4+
using ConcreteStructs: @concrete
5+
using FastClosures: @closure
6+
using Preferences: @load_preference
7+
38
using ADTypes: ADTypes, AbstractADType, AutoSparse, NoSparsityDetector,
49
KnownJacobianSparsityDetector
510
using Adapt: WrappedArray
611
using ArrayInterface: ArrayInterface
7-
using CommonSolve: CommonSolve, init
8-
using Compat: @compat
9-
using ConcreteStructs: @concrete
1012
using DifferentiationInterface: DifferentiationInterface, Constant
13+
using StaticArraysCore: StaticArray, SMatrix, SArray, MArray
14+
15+
using CommonSolve: CommonSolve, init
1116
using EnzymeCore: EnzymeCore
12-
using FastClosures: @closure
1317
using FunctionProperties: hasbranching
14-
using LinearAlgebra: LinearAlgebra, Diagonal, norm, ldiv!, diagind
15-
using Markdown: @doc_str
1618
using MaybeInplace: @bb
17-
using Preferences: @load_preference
18-
using Printf: @printf
1919
using RecursiveArrayTools: AbstractVectorOfArray, ArrayPartition
2020
using SciMLBase: SciMLBase, ReturnCode, AbstractODEIntegrator, AbstractNonlinearProblem,
2121
AbstractNonlinearAlgorithm, AbstractNonlinearFunction,
2222
NonlinearProblem, NonlinearLeastSquaresProblem, StandardNonlinearProblem,
2323
NonlinearFunction, NullParameters, NLStats, LinearProblem
2424
using SciMLJacobianOperators: JacobianOperator, StatefulJacobianOperator
2525
using SciMLOperators: AbstractSciMLOperator, IdentityOperator
26-
using StaticArraysCore: StaticArray, SMatrix, SArray, MArray
2726
using SymbolicIndexingInterface: SymbolicIndexingInterface
2827

28+
using LinearAlgebra: LinearAlgebra, Diagonal, norm, ldiv!, diagind
29+
using Markdown: @doc_str
30+
using Printf: @printf
31+
2932
const DI = DifferentiationInterface
3033
const SII = SymbolicIndexingInterface
3134

lib/NonlinearSolveBase/src/utils.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ restructure(::Number, x::Number) = x
9494
function restructure(
9595
y::T1, x::T2
9696
) where {T1 <: AbstractSciMLOperator, T2 <: AbstractSciMLOperator}
97-
@assert size(y) == size(x) "cannot restructure operators. ensure their sizes match."
97+
@assert size(y)==size(x) "cannot restructure operators. ensure their sizes match."
9898
return x
9999
end
100100
restructure(y, x) = ArrayInterface.restructure(y, x)

lib/NonlinearSolveFirstOrder/src/NonlinearSolveFirstOrder.jl

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
module NonlinearSolveFirstOrder
22

3-
using Reexport: @reexport
3+
using ConcreteStructs: @concrete
44
using PrecompileTools: @compile_workload, @setup_workload
5+
using Reexport: @reexport
6+
using Setfield: @set!
57

68
using ADTypes: ADTypes
79
using ArrayInterface: ArrayInterface
10+
using LinearAlgebra: LinearAlgebra, Diagonal, dot
11+
using StaticArraysCore: SArray
12+
813
using CommonSolve: CommonSolve
9-
using ConcreteStructs: @concrete
1014
using DiffEqBase: DiffEqBase # Needed for `init` / `solve` dispatches
11-
using FiniteDiff: FiniteDiff # Default Finite Difference Method
12-
using ForwardDiff: ForwardDiff # Default Forward Mode AD
13-
using LinearAlgebra: LinearAlgebra, Diagonal, dot
1415
using LinearSolve: LinearSolve # Trigger Linear Solve extension in NonlinearSolveBase
1516
using MaybeInplace: @bb
1617
using NonlinearSolveBase: NonlinearSolveBase, AbstractNonlinearSolveAlgorithm,
@@ -23,8 +24,9 @@ using NonlinearSolveBase: NonlinearSolveBase, AbstractNonlinearSolveAlgorithm,
2324
Dogleg
2425
using SciMLBase: SciMLBase, AbstractNonlinearProblem, NLStats, ReturnCode, NonlinearFunction
2526
using SciMLJacobianOperators: VecJacOperator, JacVecOperator, StatefulJacobianOperator
26-
using Setfield: @set!
27-
using StaticArraysCore: SArray
27+
28+
using FiniteDiff: FiniteDiff # Default Finite Difference Method
29+
using ForwardDiff: ForwardDiff # Default Forward Mode AD
2830

2931
include("raphson.jl")
3032
include("gauss_newton.jl")

lib/NonlinearSolveQuasiNewton/src/NonlinearSolveQuasiNewton.jl

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
module NonlinearSolveQuasiNewton
22

3-
using Reexport: @reexport
3+
using ConcreteStructs: @concrete
44
using PrecompileTools: @compile_workload, @setup_workload
5+
using Reexport: @reexport
56

67
using ArrayInterface: ArrayInterface
8+
using StaticArraysCore: StaticArray, Size, MArray
9+
710
using CommonSolve: CommonSolve
8-
using ConcreteStructs: @concrete
911
using DiffEqBase: DiffEqBase # Needed for `init` / `solve` dispatches
1012
using LinearAlgebra: LinearAlgebra, Diagonal, dot, diag
1113
using LinearSolve: LinearSolve # Trigger Linear Solve extension in NonlinearSolveBase
@@ -20,7 +22,6 @@ using NonlinearSolveBase: NonlinearSolveBase, AbstractNonlinearSolveAlgorithm,
2022
update_trace!, L2_NORM, NewtonDescent
2123
using SciMLBase: SciMLBase, AbstractNonlinearProblem, NLStats, ReturnCode
2224
using SciMLOperators: AbstractSciMLOperator
23-
using StaticArraysCore: StaticArray, Size, MArray
2425

2526
include("reset_conditions.jl")
2627
include("structure.jl")

lib/SciMLJacobianOperators/src/SciMLJacobianOperators.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ArrayInterface.can_setindex(::AbstractJacobianOperator) = false
2020
function ArrayInterface.restructure(
2121
y::AbstractJacobianOperator, x::AbstractJacobianOperator
2222
)
23-
@assert size(y) == size(x) "cannot restructure operators. ensure their sizes match."
23+
@assert size(y)==size(x) "cannot restructure operators. ensure their sizes match."
2424
return x
2525
end
2626

src/NonlinearSolve.jl

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
module NonlinearSolve
22

3+
using ConcreteStructs: @concrete
34
using Reexport: @reexport
45
using PrecompileTools: @compile_workload, @setup_workload
6+
using FastClosures: @closure
57

8+
using ADTypes: ADTypes
69
using ArrayInterface: ArrayInterface
710
using CommonSolve: CommonSolve, solve, solve!
8-
using ConcreteStructs: @concrete
911
using DiffEqBase: DiffEqBase # Needed for `init` / `solve` dispatches
10-
using FastClosures: @closure
1112
using LinearAlgebra: LinearAlgebra, norm
1213
using LineSearch: BackTracking
1314
using NonlinearSolveBase: NonlinearSolveBase, InternalAPI, AbstractNonlinearSolveAlgorithm,
@@ -33,6 +34,15 @@ using ForwardDiff: ForwardDiff # Default Forward Mode AD
3334
using SparseArrays: SparseArrays
3435
using SparseMatrixColorings: SparseMatrixColorings
3536

37+
# Sub-Packages that are re-exported by NonlinearSolve
38+
using BracketingNonlinearSolve: BracketingNonlinearSolve
39+
using LineSearch: LineSearch
40+
using LinearSolve: LinearSolve
41+
using NonlinearSolveFirstOrder: NonlinearSolveFirstOrder
42+
using NonlinearSolveQuasiNewton: NonlinearSolveQuasiNewton
43+
using NonlinearSolveSpectralMethods: NonlinearSolveSpectralMethods
44+
using SimpleNonlinearSolve: SimpleNonlinearSolve
45+
3646
const SII = SymbolicIndexingInterface
3747

3848
include("helpers.jl")
@@ -54,8 +64,8 @@ include("default.jl")
5464
# include("internal/forward_diff.jl") # we need to define after the algorithms
5565

5666
@setup_workload begin
57-
include(joinpath(@__DIR__, "..", "common", "nonlinear_problem_workloads.jl"))
58-
include(joinpath(@__DIR__, "..", "common", "nlls_problem_workloads.jl"))
67+
include("../common/nonlinear_problem_workloads.jl")
68+
include("../common/nlls_problem_workloads.jl")
5969

6070
@compile_workload begin
6171
@sync begin

0 commit comments

Comments
 (0)