Skip to content

[MRG] update LP barycenter with new scipy solvers #537

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
rflamary merged 2 commits into from
Oct 26, 2023
+9 −8
Merged

[MRG] update LP barycenter with new scipy solvers #537

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26d7552
update lp barycenter with new scipy solvers
rflamary Oct 25, 2023
6659100
use default solver in exmaple qnd add release info
rflamary Oct 26, 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
Prev Previous commit
use default solver in exmaple qnd add release info
  • Loading branch information
@rflamary
rflamary committed Oct 26, 2023
commit 6659100dd775636991858d142d84b69ace28c895
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 @@ -9,6 +9,7 @@
+ The `linspace` method of the backends now has the `type_as` argument to convert to the same dtype and device. (PR #533)
+ The `convolutional_barycenter2d` and `convolutional_barycenter2d_debiased` functions now work with different devices.. (PR #533)
+ New API for Gromov-Wasserstein solvers with `ot.solve_gromov` function (PR #536)
+ New LP solvers from scipy used by default for LP barycenter (PR #537)

#### Closed issues
- Fix line search evaluating cost outside of the interpolation range (Issue #502, PR #504)
Expand Down
6 changes: 3 additions & 3 deletions examples/barycenters/plot_barycenter_lp_vs_entropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@


ot.tic()
bary_wass2 = ot.lp.barycenter(A, M, weights, solver='highs-ipm', verbose=True)
bary_wass2 = ot.lp.barycenter(A, M, weights)
ot.toc()

pl.figure(2)
Expand Down Expand Up @@ -149,7 +149,7 @@


ot.tic()
bary_wass2 = ot.lp.barycenter(A, M, weights, solver='interior-point', verbose=True)
bary_wass2 = ot.lp.barycenter(A, M, weights)
ot.toc()


Expand Down Expand Up @@ -223,7 +223,7 @@


ot.tic()
bary_wass2 = ot.lp.barycenter(A, M, weights, solver='interior-point', verbose=True)
bary_wass2 = ot.lp.barycenter(A, M, weights)
ot.toc()


Expand Down