fix: remove the checks

SciML · Sep 25, 2024 · 34602e1 · 34602e1
1 parent 1e98987
commit 34602e1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/algorithms/klement.jl b/src/algorithms/klement.jl
@@ -27,12 +27,12 @@ over this.
 function Klement(; max_resets::Int = 100, linsolve = nothing, alpha = nothing,
         linesearch = NoLineSearch(), precs = DEFAULT_PRECS,
         autodiff = nothing, init_jacobian::Val{IJ} = Val(:identity)) where {IJ}
-    # if !(linesearch isa AbstractNonlinearSolveLineSearchAlgorithm)
-    #     Base.depwarn(
-    #         "Passing in a `LineSearches.jl` algorithm directly is deprecated. \
-    #          Please use `LineSearchesJL` instead.", :Klement)
-    #     linesearch = LineSearchesJL(; method = linesearch)
-    # end
+    if !(linesearch isa AbstractLineSearchAlgorithm)
+        Base.depwarn(
+            "Passing in a `LineSearches.jl` algorithm directly is deprecated. \
+             Please use `LineSearchesJL` instead.", :Klement)
+        linesearch = LineSearchesJL(; method = linesearch)
+    end
 
     if IJ === :identity
         initialization = IdentityInitialization(alpha, DiagonalStructure())

diff --git a/src/core/approximate_jacobian.jl b/src/core/approximate_jacobian.jl
@@ -59,12 +59,12 @@ function ApproximateJacobianSolveAlgorithm{concrete_jac, name}(;
         linesearch = missing, trustregion = missing, descent, update_rule,
         reinit_rule, initialization, max_resets::Int = typemax(Int),
         max_shrink_times::Int = typemax(Int)) where {concrete_jac, name}
-    # if linesearch !== missing && !(linesearch isa AbstractNonlinearSolveLineSearchAlgorithm)
-    #     Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
-    #                   Please use `LineSearchesJL` instead.",
-    #         :GeneralizedFirstOrderAlgorithm)
-    #     linesearch = LineSearchesJL(; method = linesearch)
-    # end
+    if linesearch !== missing && !(linesearch isa AbstractLineSearchAlgorithm)
+        Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
+                      Please use `LineSearchesJL` instead.",
+            :GeneralizedFirstOrderAlgorithm)
+        linesearch = LineSearchesJL(; method = linesearch)
+    end
     return ApproximateJacobianSolveAlgorithm{concrete_jac, name}(
         linesearch, trustregion, descent, update_rule,
         reinit_rule, max_resets, max_shrink_times, initialization)

diff --git a/src/core/generalized_first_order.jl b/src/core/generalized_first_order.jl
@@ -66,12 +66,12 @@ function GeneralizedFirstOrderAlgorithm{concrete_jac, name}(;
             jacobian_ad !== nothing && ADTypes.mode(jacobian_ad) isa ADTypes.ReverseMode,
             jacobian_ad, nothing))
 
-    # if linesearch !== missing && !(linesearch isa AbstractNonlinearSolveLineSearchAlgorithm)
-    #     Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
-    #                   Please use `LineSearchesJL` instead.",
-    #         :GeneralizedFirstOrderAlgorithm)
-    #     linesearch = LineSearchesJL(; method = linesearch)
-    # end
+    if linesearch !== missing && !(linesearch isa AbstractLineSearchAlgorithm)
+        Base.depwarn("Passing in a `LineSearches.jl` algorithm directly is deprecated. \
+                      Please use `LineSearchesJL` instead.",
+            :GeneralizedFirstOrderAlgorithm)
+        linesearch = LineSearchesJL(; method = linesearch)
+    end
 
     return GeneralizedFirstOrderAlgorithm{concrete_jac, name}(
         linesearch, trustregion, descent, max_shrink_times,