diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2018-05-29 16:16:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 16:16:41 +0200 |
| commit | 90efa5a8b189214d1aeb81920b2bb04ce0c261ca (patch) | |
| tree | 62e2f1a3cca2f4885e8c0e2a0b135a5f574d6a8c /ot/lp/__init__.py | |
| parent | ec79b791f4f4a62f7c04b7bbf14fe2f5dcbb4c75 (diff) | |
| parent | 54f0b47e55c966d5492e4ce19ec4e704ef3278d6 (diff) | |
Merge pull request #47 from rflamary/bary
LP Wasserstein barycenter with scipy linear solver and/or cvxopt
Diffstat (limited to 'ot/lp/__init__.py')
| -rw-r--r-- | ot/lp/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ot/lp/__init__.py b/ot/lp/__init__.py index 6371feb..5dda82a 100644 --- a/ot/lp/__init__.py +++ b/ot/lp/__init__.py @@ -11,9 +11,12 @@ import multiprocessing import numpy as np +from .import cvx + # import compiled emd from .emd_wrap import emd_c, check_result from ..utils import parmap +from .cvx import barycenter def emd(a, b, M, numItermax=100000, log=False): |