diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2022-12-15 09:28:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 09:28:01 +0100 |
| commit | 0411ea22a96f9c22af30156b45c16ef39ffb520d (patch) | |
| tree | 7c131ad804d5b16a8c362c2fe296350a770400df /ot/__init__.py | |
| parent | 8490196dcc982c492b7565e1ec4de5f75f006acf (diff) | |
[MRG] New API for OT solver (with pre-computed ground cost matrix) (#388)
* new API for OT solver
* use itertools for product of parameters
* add tests for result class
* add tests for result class
* add tests for result class last time?
* add sinkhorn
* make partial OT bckend compatible
* add TV as unbalanced flavor
* better tests
* make smoth backend compatible and add l2 tregularizatio to solve
* add reularizedd unbalanced
* add test for more complex attibutes
* add test for more complex attibutes
* add generic unbalaned solver and implement it for ot.solve
* add entropy to possible regularization
* star of documentation for ot.solv
* weird new pep8
* documenttaion for function ot.solve done
* pep8
* Update ot/solvers.py
Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
* update release file
* Apply suggestions from code review
Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
* add test NotImplemented
* pep8
* pep8gcmp pep8!
* compute kl in backend
* debug tensorflow kl backend
Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
Diffstat (limited to 'ot/__init__.py')
| -rw-r--r-- | ot/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ot/__init__.py b/ot/__init__.py index 15d8351..51eb726 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -34,6 +34,7 @@ from . import backend from . import regpath from . import weak from . import factored +from . import solvers # OT functions from .lp import emd, emd2, emd_1d, emd2_1d, wasserstein_1d @@ -46,7 +47,7 @@ from .gromov import (gromov_wasserstein, gromov_wasserstein2, gromov_barycenters, fused_gromov_wasserstein, fused_gromov_wasserstein2) from .weak import weak_optimal_transport from .factored import factored_optimal_transport - +from .solvers import solve # utils functions from .utils import dist, unif, tic, toc, toq @@ -61,5 +62,5 @@ __all__ = ['emd', 'emd2', 'emd_1d', 'sinkhorn', 'sinkhorn2', 'utils', 'sinkhorn_unbalanced2', 'sliced_wasserstein_distance', 'gromov_wasserstein', 'gromov_wasserstein2', 'gromov_barycenters', 'fused_gromov_wasserstein', 'fused_gromov_wasserstein2', 'max_sliced_wasserstein_distance', 'weak_optimal_transport', - 'factored_optimal_transport', - 'smooth', 'stochastic', 'unbalanced', 'partial', 'regpath'] + 'factored_optimal_transport', 'solve', + 'smooth', 'stochastic', 'unbalanced', 'partial', 'regpath', 'solvers'] |