diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2018-09-28 15:46:31 +0200 |
|---|---|---|
| committer | Rémi Flamary <remi.flamary@gmail.com> | 2018-09-28 15:46:31 +0200 |
| commit | 49af12288b4a6e45d1ff85f3e39d8d76839b2d5f (patch) | |
| tree | 431bcc20b8f11993cce72969ece4d34bcca3844f /ot/gpu | |
| parent | 287c4c0747ea5341c989c0c85daf0ed1d5a7cdf0 (diff) | |
correction bug merge ot.gpu.da
Diffstat (limited to 'ot/gpu')
| -rw-r--r-- | ot/gpu/da.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/ot/gpu/da.py b/ot/gpu/da.py index 7f7b2b0..4a98038 100644 --- a/ot/gpu/da.py +++ b/ot/gpu/da.py @@ -134,23 +134,6 @@ def sinkhorn_lpl1_mm(a, labels_a, b, M, reg, eta=0.1, numItermax=10, W = np.ones(M.shape) for (i, c) in enumerate(classes): - -<< << << < HEAD - (_, nbRow) = indices_labels[i].shape - tmpC_GPU = cudamat.empty((Nfin, nbRow)).assign(0) - transp_GPU.transpose().select_columns(indices_labels[i], tmpC_GPU) - majs_GPU = tmpC_GPU.sum(axis=1).add(epsilon) - cudamat.pow(majs_GPU, (p - 1)) - majs_GPU.mult(p) - - tmpC_GPU.assign(0) - tmpC_GPU.add_col_vec(majs_GPU) - W_GPU.set_selected_columns(indices_labels[i], tmpC_GPU) - - W_GPU = W_GPU.transpose() - - return transp_GPU.asarray() -======= majs = np.sum(transp[indices_labels[i]], axis=0) majs = p * ((majs + epsilon)**(p - 1)) W[indices_labels[i]] = majs @@ -159,4 +142,3 @@ def sinkhorn_lpl1_mm(a, labels_a, b, M, reg, eta=0.1, numItermax=10, return utils.to_np(transp) else: return transp ->>>>>>> master |