Skip to content

Commit f27d0da

Browse files
Fix a bunch of tests
1 parent 1fe1716 commit f27d0da

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Project.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
99
ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
1010
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
1111
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
12+
EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
1213
FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
1314
FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
1415
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
@@ -18,6 +19,7 @@ LineSearch = "87fe0de2-c867-4266-b59a-2f0a94fc965b"
1819
LineSearches = "d3d80556-e9d4-5f37-9878-2ab0fcc64255"
1920
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
2021
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
22+
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
2123
MaybeInplace = "bb5d69b7-63fc-4a16-80bd-7e42200c7bdb"
2224
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
2325
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
@@ -68,6 +70,7 @@ CUDA = "5.5"
6870
ConcreteStructs = "0.2.3"
6971
DiffEqBase = "6.155.3"
7072
DifferentiationInterface = "0.6.1"
73+
EnumX = "1.0.4"
7174
Enzyme = "0.13.2"
7275
ExplicitImports = "1.5"
7376
FastBroadcast = "0.3.5"
@@ -84,6 +87,7 @@ LineSearch = "0.1.2"
8487
LineSearches = "7.3"
8588
LinearAlgebra = "1.10"
8689
LinearSolve = "2.35"
90+
Markdown = "1.10.0"
8791
MINPACK = "1.2"
8892
MaybeInplace = "0.1.4"
8993
ModelingToolkit = "9.41.0"
@@ -96,7 +100,7 @@ Pkg = "1.10"
96100
PrecompileTools = "1.2"
97101
Preferences = "1.4"
98102
Printf = "1.10"
99-
Random = "1.91"
103+
Random = "1.10"
100104
ReTestItems = "1.24"
101105
RecursiveArrayTools = "3.27"
102106
Reexport = "1.2"

src/internal/termination.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ function init_termination_cache(
1414
tc_ = if hasfield(typeof(tc), :internalnorm) && tc.internalnorm === nothing
1515
internalnorm = ifelse(
1616
prob isa NonlinearProblem, Base.Fix1(maximum, abs), Base.Fix2(norm, 2))
17-
DiffEqBase.set_termination_mode_internalnorm(tc, internalnorm)
17+
set_termination_mode_internalnorm(tc, internalnorm)
1818
else
1919
tc
2020
end
2121
tc_cache = init(du, u, tc_; abstol, reltol, use_deprecated_retcodes = Val(false))
22-
return DiffEqBase.get_abstol(tc_cache), DiffEqBase.get_reltol(tc_cache), tc_cache
22+
return get_abstol(tc_cache), get_reltol(tc_cache), tc_cache
2323
end
2424

2525
function check_and_update!(cache, fu, u, uprev)
@@ -28,7 +28,7 @@ end
2828

2929
function check_and_update!(tc_cache, cache, fu, u, uprev)
3030
return check_and_update!(
31-
tc_cache, cache, fu, u, uprev, DiffEqBase.get_termination_mode(tc_cache))
31+
tc_cache, cache, fu, u, uprev, get_termination_mode(tc_cache))
3232
end
3333

3434
function check_and_update!(tc_cache, cache, fu, u, uprev, mode)
@@ -41,7 +41,7 @@ end
4141

4242
function update_from_termination_cache!(tc_cache, cache, u = get_u(cache))
4343
return update_from_termination_cache!(
44-
tc_cache, cache, DiffEqBase.get_termination_mode(tc_cache), u)
44+
tc_cache, cache, get_termination_mode(tc_cache), u)
4545
end
4646

4747
function update_from_termination_cache!(

test/misc/qa_tests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ end
2222
using ExplicitImports
2323

2424
@test check_no_implicit_imports(NonlinearSolve;
25-
skip = (NonlinearSolve, Base, Core, SimpleNonlinearSolve, SciMLBase)) === nothing
25+
skip = (NonlinearSolve, NonlinearSolve.NonlinearSafeTerminationReturnCode, Base, Core, SimpleNonlinearSolve, SciMLBase)) === nothing
2626
@test check_no_stale_explicit_imports(NonlinearSolve) === nothing
2727
@test check_all_qualified_accesses_via_owners(NonlinearSolve) === nothing
2828
end

0 commit comments

Comments
 (0)