summaryrefslogtreecommitdiff
path: root/ot/__init__.py
diff options
context:
space:
mode:
authorRĂ©mi Flamary <remi.flamary@gmail.com>2019-06-27 14:08:21 +0200
committerGitHub <noreply@github.com>2019-06-27 14:08:21 +0200
commita9b8af146648ee2ae50baf46e69e6281f6b279e4 (patch)
treec97a7359bdf7de19d7a1cc325304852622a8f580 /ot/__init__.py
parent2364d56aad650d501753cc93a69ea1b8ddf28b0a (diff)
parent362a7f8fa20cf7ae6f2e36d7e47c7ca9f81d3c51 (diff)
Merge pull request #89 from rtavenar/master
[MRG] EMD and Wasserstein 1D
Diffstat (limited to 'ot/__init__.py')
-rw-r--r--ot/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/ot/__init__.py b/ot/__init__.py
index 3892d1d..1b3c2fb 100644
--- a/ot/__init__.py
+++ b/ot/__init__.py
@@ -23,7 +23,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
@@ -33,7 +33,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"]