Skip to content

Commit

Permalink
[Fix] import linesearch for modern scipy (#642)
Browse files Browse the repository at this point in the history
* update import for scalar armijo

* add release line in file
  • Loading branch information
rflamary authored Jun 25, 2024
1 parent 2941ed3 commit a195660
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions RELEASES.md
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
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

0 comments on commit a195660

Please sign in to comment.