diff options
| author | Rémi Flamary <remi.flamary@gmail.com> | 2018-09-28 15:43:03 +0200 |
|---|---|---|
| committer | Rémi Flamary <remi.flamary@gmail.com> | 2018-09-28 15:43:03 +0200 |
| commit | 287c4c0747ea5341c989c0c85daf0ed1d5a7cdf0 (patch) | |
| tree | fa365257028057d03891aa3308fc43e96acbde54 /ot | |
| parent | c18f73739fdd8e8ca0ef88dddcf2ba039a85dacf (diff) | |
update realease.md
Diffstat (limited to 'ot')
| -rw-r--r-- | ot/__init__.py | 2 | ||||
| -rw-r--r-- | ot/gpu/da.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ot/__init__.py b/ot/__init__.py index fa6600d..b27541d 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -29,7 +29,7 @@ from .da import sinkhorn_lpl1_mm # utils functions from .utils import dist, unif, tic, toc, toq -__version__ = "0.5.0b" +__version__ = "0.5.0" __all__ = ["emd", "emd2", "sinkhorn", "sinkhorn2", "utils", 'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov', 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) |