diff options
| author | Romain Tavenard <romain.tavenard@univ-rennes2.fr> | 2019-06-27 10:54:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 10:54:13 +0200 |
| commit | bbc56e74bf119b8810c0de7b446bb01b30efc3c2 (patch) | |
| tree | 223e26e51da0edd3057fa16820ce7f1882a94f59 /ot/__init__.py | |
| parent | 0d333e004636f5d25edea6bb195e8e4d9a95ba98 (diff) | |
| parent | 2364d56aad650d501753cc93a69ea1b8ddf28b0a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'ot/__init__.py')
| -rw-r--r-- | ot/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ot/__init__.py b/ot/__init__.py index 5bd9bb3..730aa4f 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -20,10 +20,12 @@ from . import da from . import gromov from . import smooth from . import stochastic +from . import unbalanced # OT functions from .lp import emd, emd2, emd_1d, emd2_1d, wasserstein_1d, wasserstein2_1d from .bregman import sinkhorn, sinkhorn2, barycenter +from .unbalanced import sinkhorn_unbalanced, barycenter_unbalanced from .da import sinkhorn_lpl1_mm # utils functions @@ -34,4 +36,5 @@ __version__ = "0.5.1" __all__ = ["emd", "emd2", 'emd_1d', "sinkhorn", "sinkhorn2", "utils", 'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov', 'emd_1d', 'emd2_1d', 'wasserstein_1d', 'wasserstein2_1d', - 'dist', 'unif', 'barycenter', 'sinkhorn_lpl1_mm', 'da', 'optim'] + 'dist', 'unif', 'barycenter', 'sinkhorn_lpl1_mm', 'da', 'optim', + 'sinkhorn_unbalanced', "barycenter_unbalanced"] |