Skip to content

Commit 1fe1716

Browse files
Backport fixes for DiffEqBase deprecation removals
1 parent e7e218b commit 1fe1716

File tree

4 files changed

+891
-8
lines changed

4 files changed

+891
-8
lines changed

src/NonlinearSolve.jl

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ using PrecompileTools: @compile_workload, @setup_workload
1010
using ArrayInterface: ArrayInterface, can_setindex, restructure, fast_scalar_indexing,
1111
ismutable
1212
using ConcreteStructs: @concrete
13-
using DiffEqBase: DiffEqBase, AbstractNonlinearTerminationMode,
14-
AbstractSafeBestNonlinearTerminationMode, AbsNormTerminationMode,
15-
AbsSafeBestTerminationMode, AbsSafeTerminationMode, AbsTerminationMode,
16-
NormTerminationMode, RelNormTerminationMode, RelSafeBestTerminationMode,
17-
RelSafeTerminationMode, RelTerminationMode,
18-
SimpleNonlinearSolveTerminationMode, SteadyStateDiffEqTerminationMode
13+
using DiffEqBase: DiffEqBase
14+
using EnumX
15+
using Markdown
1916
using FastBroadcast: @..
2017
using FastClosures: @closure
2118
using LazyArrays: LazyArrays, ApplyArray, cache
@@ -66,6 +63,8 @@ const DI = DifferentiationInterface
6663
const True = Val(true)
6764
const False = Val(false)
6865

66+
include("termination_conditions_deprecated.jl")
67+
include("termination_conditions.jl")
6968
include("abstract_types.jl")
7069
include("timer_outputs.jl")
7170
include("internal/helpers.jl")
@@ -156,6 +155,15 @@ include("default.jl")
156155
end
157156
end
158157

158+
export SteadyStateDiffEqTerminationMode, SimpleNonlinearSolveTerminationMode,
159+
NormTerminationMode, RelTerminationMode, RelNormTerminationMode, AbsTerminationMode,
160+
AbsNormTerminationMode, RelSafeTerminationMode, AbsSafeTerminationMode,
161+
RelSafeBestTerminationMode, AbsSafeBestTerminationMode
162+
# Deprecated API
163+
export NLSolveTerminationMode,
164+
NLSolveSafeTerminationOptions, NLSolveTerminationCondition,
165+
NLSolveSafeTerminationResult
166+
159167
# Core Algorithms
160168
export NewtonRaphson, PseudoTransient, Klement, Broyden, LimitedMemoryBroyden, DFSane
161169
export GaussNewton, LevenbergMarquardt, TrustRegion

0 commit comments

Comments
 (0)