Skip to content

Commit 89d76b0

Browse files
committed
chore: fix QA testing
1 parent 0b91de7 commit 89d76b0

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

lib/BracketingNonlinearSolve/test/qa_tests.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ end
1010
import ForwardDiff
1111
using ExplicitImports, BracketingNonlinearSolve
1212

13-
@test check_no_implicit_imports(BracketingNonlinearSolve; skip = (Base, Core)) === nothing
13+
@test check_no_implicit_imports(BracketingNonlinearSolve; skip = (Base, Core)) ===
14+
nothing
1415
@test check_no_stale_explicit_imports(BracketingNonlinearSolve) === nothing
1516
@test check_all_qualified_accesses_via_owners(BracketingNonlinearSolve) === nothing
1617
end

src/NonlinearSolve.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ using LinearAlgebra: LinearAlgebra, ColumnNorm, Diagonal, I, LowerTriangular, Sy
1313
UpperTriangular, axpy!, cond, diag, diagind, dot, issuccess, istril,
1414
istriu, lu, mul!, norm, pinv, tril!, triu!
1515
using LineSearch: LineSearch, AbstractLineSearchCache, LineSearchesJL, NoLineSearch,
16-
RobustNonMonotoneLineSearch, BackTracking, LiFukushimaLineSearch
16+
RobustNonMonotoneLineSearch, BackTracking, LiFukushimaLineSearch
1717
using LinearSolve: LinearSolve, QRFactorization, needs_concrete_A, AbstractFactorization,
1818
DefaultAlgorithmChoice, DefaultLinearSolver
1919
using MaybeInplace: @bb
2020
using NonlinearSolveBase: NonlinearSolveBase, nonlinearsolve_forwarddiff_solve,
2121
nonlinearsolve_dual_solution, nonlinearsolve_∂f_∂p,
22-
nonlinearsolve_∂f_∂u, L2_NORM, AbstractNonlinearTerminationMode,
23-
AbstractSafeNonlinearTerminationMode,
22+
nonlinearsolve_∂f_∂u, L2_NORM, AbsNormTerminationMode,
23+
AbstractNonlinearTerminationMode,
2424
AbstractSafeBestNonlinearTerminationMode
2525
using Printf: @printf
2626
using Preferences: Preferences, @load_preference, @set_preferences!

src/abstract_types.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ Abstract Type for all Approximate Jacobian Update Rules used in NonlinearSolve.j
382382
```julia
383383
__internal_init(
384384
prob::AbstractNonlinearProblem, alg::AbstractApproximateJacobianUpdateRule, J, fu, u,
385-
du, args...; internalnorm::F = L2_NORM, kwargs...) where {F} --> AbstractApproximateJacobianUpdateRuleCache{INV}
385+
du, args...; internalnorm::F = L2_NORM, kwargs...) where {F} -->
386+
AbstractApproximateJacobianUpdateRuleCache{INV}
386387
```
387388
"""
388389
abstract type AbstractApproximateJacobianUpdateRule{INV} end

test/core/rootfind_tests.jl

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@testsetup module CoreRootfindTesting
22
using Reexport
33
@reexport using BenchmarkTools, LinearSolve, NonlinearSolve, StaticArrays, Random,
4-
LinearAlgebra, ForwardDiff, Zygote, Enzyme, DiffEqBase,
5-
SparseConnectivityTracer
4+
LinearAlgebra, ForwardDiff, Zygote, Enzyme, SparseConnectivityTracer,
5+
NonlinearSolveBase
66
using LineSearches: LineSearches
77

88
_nameof(x) = applicable(nameof, x) ? nameof(x) : _nameof(typeof(x))
@@ -22,9 +22,16 @@ function newton_fails(u, p)
2222
end
2323

2424
const TERMINATION_CONDITIONS = [
25-
NormTerminationMode(), RelTerminationMode(), RelNormTerminationMode(),
26-
AbsTerminationMode(), AbsNormTerminationMode(), RelSafeTerminationMode(),
27-
AbsSafeTerminationMode(), RelSafeBestTerminationMode(), AbsSafeBestTerminationMode()]
25+
NormTerminationMode(Base.Fix1(maximum, abs)),
26+
RelTerminationMode(),
27+
RelNormTerminationMode(Base.Fix1(maximum, abs)),
28+
RelNormSafeTerminationMode(Base.Fix1(maximum, abs)),
29+
RelNormSafeBestTerminationMode(Base.Fix1(maximum, abs)),
30+
AbsTerminationMode(),
31+
AbsNormTerminationMode(Base.Fix1(maximum, abs)),
32+
AbsNormSafeTerminationMode(Base.Fix1(maximum, abs)),
33+
AbsNormSafeBestTerminationMode(Base.Fix1(maximum, abs))
34+
]
2835

2936
function benchmark_nlsolve_oop(f, u0, p = 2.0; solver, kwargs...)
3037
prob = NonlinearProblem{false}(f, u0, p)

0 commit comments

Comments
 (0)