Skip to content

fix bug of lbfgs test=develop #60219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cxxly merged 4 commits into from
Dec 27, 2023
Merged

fix bug of lbfgs test=develop #60219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb71a51
fix bug of lbfgs test=develop
lijialin03 Dec 21, 2023
682ed41
update 1
lijialin03 Dec 25, 2023
0c90132
update 2
lijialin03 Dec 26, 2023
17ea19c
update 3 test file
lijialin03 Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions python/paddle/optimizer/lbfgs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,7 @@ def _strong_wolfe(
gtd_new = paddle.dot(grad_new, d)

# bracket an interval containing a point satisfying the Wolfe criteria
t_prev, f_prev, g_prev, gtd_prev = (
paddle.to_tensor(0, dtype=grad.dtype),
loss,
grad,
gtd,
)
t_prev, f_prev, g_prev, gtd_prev = (0, loss, grad, gtd)
done = False
ls_iter = 0
while ls_iter < max_ls:
Expand Down Expand Up @@ -227,7 +222,10 @@ def _strong_wolfe(
low_pos, high_pos = (0, 1) if bracket_f[0] <= bracket_f[-1] else (1, 0)
while not done and ls_iter < max_ls:
# line-search bracket is so small
if paddle.abs(bracket[1] - bracket[0]) * d_norm < tolerance_change:
bracket_ls = bracket[1] - bracket[0]
if not isinstance(bracket_ls, paddle.Tensor):
bracket_ls = paddle.to_tensor(bracket_ls, dtype=gtd_new.dtype)
if paddle.abs(bracket_ls) * d_norm < tolerance_change:
break

# compute new trial value
Expand Down
10 changes: 10 additions & 0 deletions test/legacy_test/test_lbfgs_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,16 @@ def func3(x, alpha, d):
paddle.to_tensor([1.0]),
max_ls=1,
)
lbfgs._strong_wolfe(
func2,
paddle.to_tensor([1.0]),
-0.001,
paddle.to_tensor([1.0]),
paddle.to_tensor([1.0]),
paddle.to_tensor([1.0]),
paddle.to_tensor([1.0]),
max_ls=1,
)

lbfgs._strong_wolfe(
func3,
Expand Down