Skip to content

Commit a195660

Browse files
authored
[Fix] import linesearch for modern scipy (#642)
* update import for scalar armijo * add release line in file
1 parent 2941ed3 commit a195660

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

RELEASES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
- Fix (F)GW barycenter functions to support computing barycenter on 1 input + deprecate structures as lists (PR #628)
2323
- Fix line-search in partial GW and change default init to the interior of partial transport plans (PR #602)
2424
- Fix `ot.da.sinkhorn_lpl1_mm` compatibility with JAX (PR #592)
25+
- Fiw linesearch import error on Scipy 1.14 (PR #642, Issue #641)
2526

2627
## 0.9.3
2728
*January 2024*

ot/optim.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
try:
2020
from scipy.optimize import scalar_search_armijo
2121
except ImportError:
22-
from scipy.optimize.linesearch import scalar_search_armijo
22+
from scipy.optimize._linesearch import scalar_search_armijo
2323

2424
# The corresponding scipy function does not work for matrices
2525

0 commit comments

Comments
 (0)