diff options
| -rw-r--r-- | RELEASES.md | 11 | ||||
| -rw-r--r-- | ot/__init__.py | 2 | ||||
| -rw-r--r-- | ot/gpu/da.py | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/RELEASES.md b/RELEASES.md index 68abcb3..57ea61d 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,10 +1,10 @@ # POT Releases -## 0.5.0b +## 0.5.0 Year 2 *Sep 2018* -*This is a beta release and is still a work in progress* +POT is 2 years old! This release bring both numerous new features to the toolbox as listed below but also several #### Features @@ -12,7 +12,7 @@ * Add non regularized Gromov-Wasserstein solver (PR #41) * Linear OT mapping between empirical distributions and 90\% test coverage (PR #42) * Add log parameter in class EMDTransport and SinkhornLpL1Transport (PR #44) -* Add Marddown format for Pipy (PR #45) +* Add Markdown format for Pipy (PR #45) * Test for Python 3.5 and 3.6 on Travis (PR #46) * Non regularized Wasserstein barycenter with scipy linear solver and/or cvxopt (PR #47) * Rename dataset functions to be more sklearn compliant (PR #49) @@ -22,10 +22,13 @@ * Speed-up Sinkhorn function (PR #57 and PR #58) * Add convolutional Wassersein barycenters for 2D images (PR #64) * Add Greedy Sinkhorn variant (Greenkhorn) (PR #66) +* Big ot.gpu update with cupy implementation (instead of un-maintained cudamat) (PR #67) #### Deprecation -Deprecated OTDA Classes were removed for version 0.5 (PR #48), it has been a year and the deprecation message. +Deprecated OTDA Classes were removed for version 0.5 (PR #48 and PR #67). The +deprecation messagehas been for a year here since 0.4 and it is time to pull +the plug. #### Closed issues 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) |