diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2022-04-27 11:49:23 +0200 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2022-04-27 11:49:23 +0200 |
| commit | 35bd2c98b642df78638d7d733bc1a89d873db1de (patch) | |
| tree | 6bc637624004713808d3097b95acdccbb9608e52 /ot/__init__.py | |
| parent | c4753bd3f74139af8380127b66b484bc09b50661 (diff) | |
| parent | eccb1386eea52b94b82456d126bd20cbe3198e05 (diff) | |
Merge tag '0.8.2' into dfsg/latest
Diffstat (limited to 'ot/__init__.py')
| -rw-r--r-- | ot/__init__.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ot/__init__.py b/ot/__init__.py index f55819d..86ed94e 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -1,5 +1,4 @@ """ - .. warning:: The list of automatically imported sub-modules is as follows: :py:mod:`ot.lp`, :py:mod:`ot.bregman`, :py:mod:`ot.optim` @@ -7,13 +6,10 @@ :py:mod:`ot.gromov`, :py:mod:`ot.smooth` :py:mod:`ot.stochastic`, :py:mod:`ot.partial`, :py:mod:`ot.regpath` , :py:mod:`ot.unbalanced`. - The following sub-modules are not imported due to additional dependencies: - - :any:`ot.dr` : depends on :code:`pymanopt` and :code:`autograd`. - :any:`ot.gpu` : depends on :code:`cupy` and a CUDA GPU. - :any:`ot.plot` : depends on :code:`matplotlib` - """ # Author: Remi Flamary <remi.flamary@unice.fr> @@ -36,6 +32,8 @@ from . import unbalanced from . import partial from . import backend from . import regpath +from . import weak +from . import factored # OT functions from .lp import emd, emd2, emd_1d, emd2_1d, wasserstein_1d @@ -46,11 +44,14 @@ from .da import sinkhorn_lpl1_mm from .sliced import sliced_wasserstein_distance, max_sliced_wasserstein_distance 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 + # utils functions from .utils import dist, unif, tic, toc, toq -__version__ = "0.8.1.0" +__version__ = "0.8.2" __all__ = ['emd', 'emd2', 'emd_1d', 'sinkhorn', 'sinkhorn2', 'utils', 'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov', @@ -59,5 +60,6 @@ __all__ = ['emd', 'emd2', 'emd_1d', 'sinkhorn', 'sinkhorn2', 'utils', 'sinkhorn_unbalanced', 'barycenter_unbalanced', 'sinkhorn_unbalanced2', 'sliced_wasserstein_distance', 'gromov_wasserstein', 'gromov_wasserstein2', 'gromov_barycenters', 'fused_gromov_wasserstein', 'fused_gromov_wasserstein2', - 'max_sliced_wasserstein_distance', + 'max_sliced_wasserstein_distance', 'weak_optimal_transport', + 'factored_optimal_transport', 'smooth', 'stochastic', 'unbalanced', 'partial', 'regpath'] |