Skip to content
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.

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

[WIP] Partial Entropic FGW solvers #702

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
44d4614
merge
cedricvincentcuaz Sep 10, 2024
63477c2
Merge branch 'master' of https://github.com/cedricvincentcuaz/POT
cedricvincentcuaz Sep 10, 2024
a94c6ac
Merge branch 'master' of https://github.com/cedricvincentcuaz/POT
cedricvincentcuaz Nov 6, 2024
27944a5
Merge branch 'master' of https://github.com/cedricvincentcuaz/POT
cedricvincentcuaz Nov 6, 2024
20ea01c
new dev version
cedricvincentcuaz Nov 7, 2024
02009d7
first commit partial fgw
cedricvincentcuaz Nov 11, 2024
fff7a9f
Merge branch 'master' into partialfgw
cedricvincentcuaz Nov 12, 2024
ab35784
Merge branch 'master' of https://github.com/cedricvincentcuaz/POT int…
cedricvincentcuaz Nov 14, 2024
a3b33bc
complete tests + solve_gromov
cedricvincentcuaz Nov 14, 2024
d4ea559
Merge branch 'partialfgw' of https://github.com/cedricvincentcuaz/POT…
cedricvincentcuaz Nov 14, 2024
1de4196
complete tests + solve_gromov
cedricvincentcuaz Nov 14, 2024
d8828f7
release
cedricvincentcuaz Nov 14, 2024
4bbc37c
merge
cedricvincentcuaz Nov 18, 2024
8e60257
Merge branch 'master' of https://github.com/cedricvincentcuaz/POT int…
cedricvincentcuaz Nov 18, 2024
94a5e37
partial entropic fgw solvers
cedricvincentcuaz Nov 27, 2024
4c97177
add tests
cedricvincentcuaz Nov 27, 2024
c76b9a2
Merge branch 'master' of https://github.com/cedricvincentcuaz/POT int…
cedricvincentcuaz Nov 27, 2024
a61aa32
complete solve_gromov
cedricvincentcuaz Nov 27, 2024
0c16596
update
cedricvincentcuaz Nov 27, 2024
52298f1
Merge branch 'master' into partialfgw
cedricvincentcuaz Dec 1, 2024
9a735d1
Merge branch 'master' into partialfgw
rflamary Dec 12, 2024
8da7215
Merge branch 'master' into partialfgw
rflamary Dec 17, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ POT provides the following generic OT solvers (links to examples):
* [Sampled solver of Gromov Wasserstein](https://pythonot.github.io/auto_examples/gromov/plot_gromov.html) for large-scale problem with any loss functions [33]
* Non regularized [free support Wasserstein barycenters](https://pythonot.github.io/auto_examples/barycenters/plot_free_support_barycenter.html) [20].
* [One dimensional Unbalanced OT](https://pythonot.github.io/auto_examples/unbalanced-partial/plot_UOT_1D.html) with KL relaxation and [barycenter](https://pythonot.github.io/auto_examples/unbalanced-partial/plot_UOT_barycenter_1D.html) [10, 25]. Also [exact unbalanced OT](https://pythonot.github.io/auto_examples/unbalanced-partial/plot_unbalanced_ot.html) with KL and quadratic regularization and the [regularization path of UOT](https://pythonot.github.io/auto_examples/unbalanced-partial/plot_regpath.html) [41]
* [Partial Wasserstein and Gromov-Wasserstein](https://pythonot.github.io/auto_examples/unbalanced-partial/plot_partial_wass_and_gromov.html) (exact [29] and entropic [3]
* [Partial Wasserstein and Gromov-Wasserstein](https://pythonot.github.io/auto_examples/unbalanced-partial/plot_partial_wass_and_gromov.html) and Partial Fused Gromov-Wasserstein (exact [29] and entropic [3]
formulations).
* [Sliced Wasserstein](https://pythonot.github.io/auto_examples/sliced-wasserstein/plot_variance.html) [31, 32] and Max-sliced Wasserstein [35] that can be used for gradient flows [36].
* [Wasserstein distance on the circle](https://pythonot.github.io/auto_examples/plot_compute_wasserstein_circle.html) [44, 45]
Expand Down
1 change: 1 addition & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#### New features
- Implement CG solvers for partial FGW (PR #687)
- Added feature `grad=last_step` for `ot.solvers.solve` (PR #693)
- Implement projected gradient descent solvers for entropic partial FGW (PR #702)
- Automatic PR labeling and release file update check (PR #704)

#### Closed issues
Expand Down
4 changes: 4 additions & 0 deletions ot/gromov/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@
solve_partial_gromov_linesearch,
entropic_partial_gromov_wasserstein,
entropic_partial_gromov_wasserstein2,
entropic_partial_fused_gromov_wasserstein,
entropic_partial_fused_gromov_wasserstein2,
)


Expand Down Expand Up @@ -180,4 +182,6 @@
"solve_partial_gromov_linesearch",
"entropic_partial_gromov_wasserstein",
"entropic_partial_gromov_wasserstein2",
"entropic_partial_fused_gromov_wasserstein",
"entropic_partial_fused_gromov_wasserstein2",
]
Loading
Loading