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.

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

[MRG] ot.lp reorganizing #714

Merged
merged 12 commits into from
Jan 20, 2025
Merged

[MRG] ot.lp reorganizing #714

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
590e4d7
ot.lp reorganise to avoid def in __init__
eloitanguy Jan 20, 2025
109edb7
pr number + enabled pre-commit
eloitanguy Jan 20, 2025
0957904
added barycenter.py imports
eloitanguy Jan 20, 2025
818b3e7
fixed wrong import in ot.gmm
eloitanguy Jan 20, 2025
08c2285
ruff fix attempt
eloitanguy Jan 20, 2025
f268515
removed ot bar contribs -> only o.lp reorganisation in this PR
eloitanguy Jan 20, 2025
8f24cb9
add check_number_threads to ot/lp/__init__.py __all__
eloitanguy Jan 20, 2025
3e3b444
update releases
eloitanguy Jan 20, 2025
566a0fc
made barycenter_solvers and network_simplex hidden + deprecated ot.lp…
eloitanguy Jan 20, 2025
5c35d58
fix ref to lp.cvx in test
eloitanguy Jan 20, 2025
8ffb061
lp.cvx now imports barycenter and gives a warnings.warning
eloitanguy Jan 20, 2025
26748eb
cvx import barycenter
eloitanguy Jan 20, 2025
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
5 changes: 0 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ POT provides the following generic OT solvers (links to examples):
* [Co-Optimal Transport](https://pythonot.github.io/auto_examples/others/plot_COOT.html) [49] and
[unbalanced Co-Optimal Transport](https://pythonot.github.io/auto_examples/others/plot_learning_weights_with_COOT.html) [71].
* Fused unbalanced Gromov-Wasserstein [70].
* OT Barycenters for generic transport costs [].

POT provides the following Machine Learning related solvers:

Expand Down Expand Up @@ -392,7 +391,3 @@ Artificial Intelligence.
[72] Thibault Séjourné, François-Xavier Vialard, and Gabriel Peyré (2021). [The Unbalanced Gromov Wasserstein Distance: Conic Formulation and Relaxation](https://proceedings.neurips.cc/paper/2021/file/4990974d150d0de5e6e15a1454fe6b0f-Paper.pdf). Neural Information Processing Systems (NeurIPS).

[73] Séjourné, T., Vialard, F. X., & Peyré, G. (2022). [Faster Unbalanced Optimal Transport: Translation Invariant Sinkhorn and 1-D Frank-Wolfe](https://proceedings.mlr.press/v151/sejourne22a.html). In International Conference on Artificial Intelligence and Statistics (pp. 4995-5021). PMLR.

[74] Tanguy, Eloi and Delon, Julie and Gozlan, Nathaël (2024). [Computing
Barycentres of Measures for Generic Transport
Costs](https://arxiv.org/abs/2501.04016). arXiv preprint 2501.04016 (2024)
3 changes: 1 addition & 2 deletions RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
- Implement CG solvers for partial FGW (PR #687)
- Added feature `grad=last_step` for `ot.solvers.solve` (PR #693)
- Automatic PR labeling and release file update check (PR #704)
- Implement fixed-point solver for OT barycenters with generic cost functions
(generalizes `ot.lp.free_support_barycenter`). (PR #714)
- Moved functions from `ot/lp/__init__.py` to separate modules. (PR #714)
eloitanguy marked this conversation as resolved.
Show resolved Hide resolved

#### Closed issues
- Fixed `ot.mapping` solvers which depended on deprecated `cvxpy` `ECOS` solver (PR #692, Issue #668)
Expand Down
Loading