summaryrefslogtreecommitdiff
path: root/ot/gpu/da.py
diff options
context:
space:
mode:
Diffstat (limited to 'ot/gpu/da.py')
-rw-r--r--ot/gpu/da.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ot/gpu/da.py b/ot/gpu/da.py
index f5e7daa..7f7b2b0 100644
--- a/ot/gpu/da.py
+++ b/ot/gpu/da.py
@@ -133,7 +133,9 @@ def sinkhorn_lpl1_mm(a, labels_a, b, M, reg, eta=0.1, numItermax=10,
# separated
W = np.ones(M.shape)
for (i, c) in enumerate(classes):
-<<<<<<< HEAD
+
+
+<< << << < HEAD
(_, nbRow) = indices_labels[i].shape
tmpC_GPU = cudamat.empty((Nfin, nbRow)).assign(0)
transp_GPU.transpose().select_columns(indices_labels[i], tmpC_GPU)