Skip to content

Commit 34602e1

Browse files
committed
fix: remove the checks
1 parent 1e98987 commit 34602e1

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

src/algorithms/klement.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ over this.
2727
function Klement(; max_resets::Int = 100, linsolve = nothing, alpha = nothing,
2828
linesearch = NoLineSearch(), precs = DEFAULT_PRECS,
2929
autodiff = nothing, init_jacobian::Val{IJ} = Val(:identity)) where {IJ}
30-
# if !(linesearch isa AbstractNonlinearSolveLineSearchAlgorithm)
31-
# Base.depwarn(
32-
# "Passing in a `LineSearches.jl` algorithm directly is deprecated. \
33-
# Please use `LineSearchesJL` instead.", :Klement)
34-
# linesearch = LineSearchesJL(; method = linesearch)
35-
# end
30+
if !(linesearch isa AbstractLineSearchAlgorithm)
31+
Base.depwarn(
32+
"Passing in a `LineSearches.jl` algorithm directly is deprecated. \
33+
Please use `LineSearchesJL` instead.", :Klement)
34+
linesearch = LineSearchesJL(; method = linesearch)
35+
end
3636

3737
if IJ === :identity
3838
initialization = IdentityInitialization(alpha, DiagonalStructure())

src/core/approximate_jacobian.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ function ApproximateJacobianSolveAlgorithm{concrete_jac, name}(;
5959
linesearch = missing, trustregion = missing, descent, update_rule,
6060
reinit_rule, initialization, max_resets::Int = typemax(Int),
6161
max_shrink_times::Int = typemax(Int)) where {concrete_jac, name}
62-
# if linesearch !== missing && !(linesearch isa AbstractNonlinearSolveLineSearchAlgorithm)
63-
# Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
64-
# Please use `LineSearchesJL` instead.",
65-
# :GeneralizedFirstOrderAlgorithm)
66-
# linesearch = LineSearchesJL(; method = linesearch)
67-
# end
62+
if linesearch !== missing && !(linesearch isa AbstractLineSearchAlgorithm)
63+
Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
64+
Please use `LineSearchesJL` instead.",
65+
:GeneralizedFirstOrderAlgorithm)
66+
linesearch = LineSearchesJL(; method = linesearch)
67+
end
6868
return ApproximateJacobianSolveAlgorithm{concrete_jac, name}(
6969
linesearch, trustregion, descent, update_rule,
7070
reinit_rule, max_resets, max_shrink_times, initialization)

src/core/generalized_first_order.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ function GeneralizedFirstOrderAlgorithm{concrete_jac, name}(;
6666
jacobian_ad !== nothing && ADTypes.mode(jacobian_ad) isa ADTypes.ReverseMode,
6767
jacobian_ad, nothing))
6868

69-
# if linesearch !== missing && !(linesearch isa AbstractNonlinearSolveLineSearchAlgorithm)
70-
# Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
71-
# Please use `LineSearchesJL` instead.",
72-
# :GeneralizedFirstOrderAlgorithm)
73-
# linesearch = LineSearchesJL(; method = linesearch)
74-
# end
69+
if linesearch !== missing && !(linesearch isa AbstractLineSearchAlgorithm)
70+
Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
71+
Please use `LineSearchesJL` instead.",
72+
:GeneralizedFirstOrderAlgorithm)
73+
linesearch = LineSearchesJL(; method = linesearch)
74+
end
7575

7676
return GeneralizedFirstOrderAlgorithm{concrete_jac, name}(
7777
linesearch, trustregion, descent, max_shrink_times,

0 commit comments

Comments
 (0)