Skip to content

[Fix] import linesearch for modern scipy #642

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
merged 2 commits into from
Jun 25, 2024
Merged

[Fix] import linesearch for modern scipy #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca66f2
update import for scalar armijo
rflamary Jun 25, 2024
adab804
add release line in file
rflamary Jun 25, 2024
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
1 change: 1 addition & 0 deletions RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- Fix (F)GW barycenter functions to support computing barycenter on 1 input + deprecate structures as lists (PR #628)
- Fix line-search in partial GW and change default init to the interior of partial transport plans (PR #602)
- Fix `ot.da.sinkhorn_lpl1_mm` compatibility with JAX (PR #592)
- Fiw linesearch import error on Scipy 1.14 (PR #642, Issue #641)

## 0.9.3
*January 2024*
Expand Down
2 changes: 1 addition & 1 deletion ot/optim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
try:
from scipy.optimize import scalar_search_armijo
except ImportError:
from scipy.optimize.linesearch import scalar_search_armijo
from scipy.optimize._linesearch import scalar_search_armijo

# The corresponding scipy function does not work for matrices

Expand Down
Loading