diff options
author | Rémi Flamary <remi.flamary@gmail.com> | 2019-06-25 14:36:23 +0200 |
---|---|---|
committer | Rémi Flamary <remi.flamary@gmail.com> | 2019-06-25 14:36:23 +0200 |
commit | c9775bde23527f8b55db53020352969405f8b6b5 (patch) | |
tree | 4195d28c2c144f66d758b20baf862e9f32111cd9 /ot/__init__.py | |
parent | 830d4ebd2e2c85b4f3503f358bb31a07918a27c5 (diff) | |
parent | 2364d56aad650d501753cc93a69ea1b8ddf28b0a (diff) |
Merge branch 'master' into doc_modules
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 16b0dd6..89bdc78 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -30,10 +30,12 @@ from . import da from . import gromov from . import smooth from . import stochastic +from . import unbalanced # OT functions from .lp import emd, emd2 from .bregman import sinkhorn, sinkhorn2, barycenter +from .unbalanced import sinkhorn_unbalanced, barycenter_unbalanced from .da import sinkhorn_lpl1_mm # utils functions @@ -43,4 +45,5 @@ __version__ = "0.5.1" __all__ = ["emd", "emd2", "sinkhorn", "sinkhorn2", "utils", 'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov', - 'dist', 'unif', 'barycenter', 'sinkhorn_lpl1_mm', 'da', 'optim'] + 'dist', 'unif', 'barycenter', 'sinkhorn_lpl1_mm', 'da', 'optim', + 'sinkhorn_unbalanced', "barycenter_unbalanced"] |