summaryrefslogtreecommitdiff
path: root/ot
diff options
context:
space:
mode:
authorievred <ievgen.redko@univ-st-etienne.fr>2020-04-15 16:43:40 +0200
committerievred <ievgen.redko@univ-st-etienne.fr>2020-04-15 16:43:40 +0200
commit77cae32e956d87cfc1f69a0ea7a28c906347070d (patch)
tree6bf9c3a46101d909413527a2cb483bd3a9a724c9 /ot
parent4130a91bcb63070c52c9149a3df756d08e83b0cf (diff)
check conflict da
Diffstat (limited to 'ot')
-rw-r--r--ot/da.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ot/da.py b/ot/da.py
index 108609f..272af91 100644
--- a/ot/da.py
+++ b/ot/da.py
@@ -16,7 +16,7 @@ import scipy.linalg as linalg
from .bregman import sinkhorn
from .lp import emd
-from .utils import unif, dist, kernel, cost_normalization, laplacian
+from .utils import unif, dist, kernel, cost_normalization, label_normalization
from .utils import check_params, BaseEstimator
from .unbalanced import sinkhorn_unbalanced
from .optim import cg