diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2019-06-27 14:34:53 +0200 |
|---|---|---|
| committer | Rémi Flamary <remi.flamary@gmail.com> | 2019-06-27 14:34:53 +0200 |
| commit | b8ac4609e9313fcda0a1ad9291431b2b1b3b9704 (patch) | |
| tree | 3d6cbc6256fe8c4e220257146c663138e53d31b1 /ot/__init__.py | |
| parent | d20d471a1806bde43c23e67c1f805aa3c8908ec3 (diff) | |
| parent | a9b8af146648ee2ae50baf46e69e6281f6b279e4 (diff) | |
Merge branch 'master' into doc_modules
Diffstat (limited to 'ot/__init__.py')
| -rw-r--r-- | ot/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ot/__init__.py b/ot/__init__.py index 89bdc78..ad7b982 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -33,7 +33,7 @@ from . import stochastic from . import unbalanced # OT functions -from .lp import emd, emd2 +from .lp import emd, emd2, emd_1d, emd2_1d, wasserstein_1d from .bregman import sinkhorn, sinkhorn2, barycenter from .unbalanced import sinkhorn_unbalanced, barycenter_unbalanced from .da import sinkhorn_lpl1_mm @@ -43,7 +43,8 @@ from .utils import dist, unif, tic, toc, toq __version__ = "0.5.1" -__all__ = ["emd", "emd2", "sinkhorn", "sinkhorn2", "utils", 'datasets', +__all__ = ["emd", "emd2", 'emd_1d', "sinkhorn", "sinkhorn2", "utils", 'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov', + 'emd_1d', 'emd2_1d', 'wasserstein_1d', 'dist', 'unif', 'barycenter', 'sinkhorn_lpl1_mm', 'da', 'optim', 'sinkhorn_unbalanced', "barycenter_unbalanced"] |