Skip to content

Commit 69c03e2

Browse files
avik-palavik-pal
committed
fix: remove uses of LineSearches.jl backtracking
1 parent e7e218b commit 69c03e2

File tree

5 files changed

+42
-37
lines changed

5 files changed

+42
-37
lines changed

‎.github/workflows/Downgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
version: ["1"]
18+
version: ["1.10"]
1919
steps:
2020
- uses: actions/checkout@v4
2121
- uses: julia-actions/setup-julia@v2

‎Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NonlinearSolve"
22
uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
33
authors = ["SciML"]
4-
version = "3.15.1"
4+
version = "3.15.2"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -80,7 +80,7 @@ Hwloc = "3"
8080
InteractiveUtils = "<0.0.1, 1"
8181
LazyArrays = "1.8.2, 2"
8282
LeastSquaresOptim = "0.8.5"
83-
LineSearch = "0.1.2"
83+
LineSearch = "0.1.4"
8484
LineSearches = "7.3"
8585
LinearAlgebra = "1.10"
8686
LinearSolve = "2.35"
@@ -96,7 +96,7 @@ Pkg = "1.10"
9696
PrecompileTools = "1.2"
9797
Preferences = "1.4"
9898
Printf = "1.10"
99-
Random = "1.91"
99+
Random = "1.10"
100100
ReTestItems = "1.24"
101101
RecursiveArrayTools = "3.27"
102102
Reexport = "1.2"

‎src/NonlinearSolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export NewtonDescent, SteepestDescent, Dogleg, DampedNewtonDescent, GeodesicAcce
176176
## Line Search Algorithms
177177
export LineSearchesJL, LiFukushimaLineSearch # FIXME: deprecated. use LineSearch.jl directly
178178
export Static, HagerZhang, MoreThuente, StrongWolfe, BackTracking # FIXME: deprecated
179-
export NoLineSearch, RobustNonMonotoneLineSearch
179+
export LineSearch, NoLineSearch, RobustNonMonotoneLineSearch
180180
## Trust Region Algorithms
181181
export RadiusUpdateSchemes
182182

‎src/default.jl

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,7 @@ function RobustMultiNewton(::Type{T} = Float64; concrete_jac = nothing, linsolve
364364
radius_update_scheme = RadiusUpdateSchemes.Bastin),
365365
NewtonRaphson(; concrete_jac, linsolve, precs, autodiff),
366366
NewtonRaphson(; concrete_jac, linsolve, precs,
367-
linesearch = LineSearch.LineSearchesJL(;
368-
method = LineSearches.BackTracking()),
369-
autodiff),
367+
linesearch = LineSearch.BackTracking(), autodiff),
370368
TrustRegion(; concrete_jac, linsolve, precs,
371369
radius_update_scheme = RadiusUpdateSchemes.NLsolve, autodiff),
372370
TrustRegion(; concrete_jac, linsolve, precs,
@@ -407,9 +405,7 @@ function FastShortcutNonlinearPolyalg(
407405
else
408406
algs = (NewtonRaphson(; concrete_jac, linsolve, precs, autodiff),
409407
NewtonRaphson(; concrete_jac, linsolve, precs,
410-
linesearch = LineSearch.LineSearchesJL(;
411-
method = LineSearches.BackTracking()),
412-
autodiff),
408+
linesearch = LineSearch.BackTracking(), autodiff),
413409
TrustRegion(; concrete_jac, linsolve, precs, autodiff),
414410
TrustRegion(; concrete_jac, linsolve, precs,
415411
radius_update_scheme = RadiusUpdateSchemes.Bastin, autodiff))
@@ -430,9 +426,7 @@ function FastShortcutNonlinearPolyalg(
430426
SimpleKlement(),
431427
NewtonRaphson(; concrete_jac, linsolve, precs, autodiff),
432428
NewtonRaphson(; concrete_jac, linsolve, precs,
433-
linesearch = LineSearch.LineSearchesJL(;
434-
method = LineSearches.BackTracking()),
435-
autodiff),
429+
linesearch = LineSearch.BackTracking(), autodiff),
436430
TrustRegion(; concrete_jac, linsolve, precs,
437431
radius_update_scheme = RadiusUpdateSchemes.Bastin, autodiff))
438432
end
@@ -451,9 +445,7 @@ function FastShortcutNonlinearPolyalg(
451445
Klement(; linsolve, precs, autodiff),
452446
NewtonRaphson(; concrete_jac, linsolve, precs, autodiff),
453447
NewtonRaphson(; concrete_jac, linsolve, precs,
454-
linesearch = LineSearch.LineSearchesJL(;
455-
method = LineSearches.BackTracking()),
456-
autodiff),
448+
linesearch = LineSearch.BackTracking(), autodiff),
457449
TrustRegion(; concrete_jac, linsolve, precs, autodiff),
458450
TrustRegion(; concrete_jac, linsolve, precs,
459451
radius_update_scheme = RadiusUpdateSchemes.Bastin, autodiff))
@@ -489,9 +481,7 @@ function FastShortcutNLLSPolyalg(
489481
linsolve, precs, disable_geodesic = Val(true), autodiff, kwargs...),
490482
TrustRegion(; concrete_jac, linsolve, precs, autodiff, kwargs...),
491483
GaussNewton(; concrete_jac, linsolve, precs,
492-
linesearch = LineSearch.LineSearchesJL(;
493-
method = LineSearches.BackTracking()),
494-
autodiff, kwargs...),
484+
linesearch = LineSearch.BackTracking(), autodiff, kwargs...),
495485
TrustRegion(; concrete_jac, linsolve, precs,
496486
radius_update_scheme = RadiusUpdateSchemes.Bastin, autodiff, kwargs...),
497487
LevenbergMarquardt(; linsolve, precs, autodiff, kwargs...))

‎test/core/rootfind_tests.jl

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,14 @@ end
5353
# --- NewtonRaphson tests ---
5454

5555
@testitem "NewtonRaphson" setup=[CoreRootfindTesting] tags=[:core] begin
56-
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad))" for lsmethod in (
57-
Static(), StrongWolfe(), BackTracking(), HagerZhang(), MoreThuente()),
58-
ad in (AutoForwardDiff(), AutoZygote(), AutoFiniteDiff())
56+
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad))" for ad in (
57+
AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()
58+
),
59+
lsmethod in (
60+
Static(), StrongWolfe(; autodiff = ad), BackTracking(; autodiff = ad),
61+
LineSearch.BackTracking(; autodiff = ad), HagerZhang(; autodiff = ad),
62+
MoreThuente(; autodiff = ad)
63+
)
5964

6065
linesearch = LineSearchesJL(; method = lsmethod, autodiff = ad)
6166
u0s = ([1.0, 1.0], @SVector[1.0, 1.0], 1.0)
@@ -463,14 +468,17 @@ end
463468
# --- Broyden tests ---
464469

465470
@testitem "Broyden" setup=[CoreRootfindTesting] tags=[:core] begin
466-
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad)) Init Jacobian: $(init_jacobian) Update Rule: $(update_rule)" for lsmethod in (
467-
Static(), StrongWolfe(), BackTracking(),
468-
HagerZhang(), MoreThuente(), LiFukushimaLineSearch()),
469-
ad in (AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()),
471+
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad)) Init Jacobian: $(init_jacobian) Update Rule: $(update_rule)" for ad in (
472+
AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()
473+
),
474+
lsmethod in (
475+
Static(), StrongWolfe(; autodiff = ad), BackTracking(; autodiff = ad),
476+
LineSearch.BackTracking(; autodiff = ad), HagerZhang(; autodiff = ad),
477+
MoreThuente(; autodiff = ad)
478+
),
470479
init_jacobian in (Val(:identity), Val(:true_jacobian)),
471480
update_rule in (Val(:good_broyden), Val(:bad_broyden), Val(:diagonal))
472481

473-
linesearch = LineSearchesJL(; method = lsmethod, autodiff = ad)
474482
u0s = ([1.0, 1.0], @SVector[1.0, 1.0], 1.0)
475483

476484
@testset "[OOP] u0: $(typeof(u0))" for u0 in u0s
@@ -513,12 +521,16 @@ end
513521
# --- Klement tests ---
514522

515523
@testitem "Klement" setup=[CoreRootfindTesting] tags=[:core] begin
516-
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad)) Init Jacobian: $(init_jacobian)" for lsmethod in (
517-
Static(), StrongWolfe(), BackTracking(), HagerZhang(), MoreThuente()),
518-
ad in (AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()),
524+
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad)) Init Jacobian: $(init_jacobian)" for ad in (
525+
AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()
526+
),
527+
lsmethod in (
528+
Static(), StrongWolfe(; autodiff = ad), BackTracking(; autodiff = ad),
529+
LineSearch.BackTracking(; autodiff = ad), HagerZhang(; autodiff = ad),
530+
MoreThuente(; autodiff = ad)
531+
),
519532
init_jacobian in (Val(:identity), Val(:true_jacobian), Val(:true_jacobian_diagonal))
520533

521-
linesearch = LineSearchesJL(; method = lsmethod, autodiff = ad)
522534
u0s = ([1.0, 1.0], @SVector[1.0, 1.0], 1.0)
523535

524536
@testset "[OOP] u0: $(typeof(u0))" for u0 in u0s
@@ -562,12 +574,15 @@ end
562574
# --- LimitedMemoryBroyden tests ---
563575

564576
@testitem "LimitedMemoryBroyden" setup=[CoreRootfindTesting] tags=[:core] begin
565-
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad))" for lsmethod in (
566-
Static(), StrongWolfe(), BackTracking(),
567-
HagerZhang(), MoreThuente(), LiFukushimaLineSearch()),
568-
ad in (AutoForwardDiff(), AutoZygote(), AutoFiniteDiff())
577+
@testset "LineSearch: $(_nameof(lsmethod)) LineSearch AD: $(_nameof(ad))" for ad in (
578+
AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()
579+
),
580+
lsmethod in (
581+
Static(), StrongWolfe(; autodiff = ad), BackTracking(; autodiff = ad),
582+
LineSearch.BackTracking(; autodiff = ad), HagerZhang(; autodiff = ad),
583+
MoreThuente(; autodiff = ad), LiFukushimaLineSearch()
584+
)
569585

570-
linesearch = LineSearchesJL(; method = lsmethod, autodiff = ad)
571586
u0s = ([1.0, 1.0], @SVector[1.0, 1.0], 1.0)
572587

573588
@testset "[OOP] u0: $(typeof(u0))" for u0 in u0s

0 commit comments

Comments
 (0)