Smooth and Sparse OT #50
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ncourty
approved these changes
Jun 10, 2018
README.md
Outdated
| @@ -15,7 +15,8 @@ It provides the following solvers: | |||
|
|
|||
| * OT Network Flow solver for the linear program/ Earth Movers Distance [1]. | |||
| * Entropic regularization OT solver with Sinkhorn Knopp Algorithm [2] and stabilized version [9][10] with optional GPU implementation (requires cudamat). | |||
| * Non regularized Wasserstein barycenters [16] with LP solver. | |||
| * Smooth optimal transport solvers (dual and semi-dual) for KL and squared L2 regularization [17]. | |||
examples/plot_OT_1D_smooth.py
Outdated
| import matplotlib.pylab as pl | ||
| import ot | ||
| import ot.plot | ||
| from ot.datasets import get_1D_gauss as gauss |
| """ | ||
| self.gamma = gamma | ||
|
|
||
| def delta_Omega(X): |
There was a problem hiding this comment.
should we keep those functions here ?
There was a problem hiding this comment.
All the ones that raise a 'not implemented' exception
There was a problem hiding this comment.
this is proper base class definition I believe, it provide aclean base implementation with proper Errors in can of use. I will complete the documentation so that it is clear for a user that this class should not be used in practice.
|
Thanks a lot for the integration work in POT! |
|
@mblondel no problem your code was a pleasure to work with. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR add several solvers for regularized OT from the following paper:
Blondel, M., Seguy, V., & Rolet, A. (2018). Smooth and Sparse Optimal Transport. Proceedings of the Twenty-First International Conference on Artificial Intelligence and Statistics (AISTATS).
Some of the code come from https://github.com/mblondel/smooth-ot/
List of new stuff:
smooth_ot_dualandsmooth_ot_semi_dualcompatible with ot.sinkhorn.plot_OT_1D_smooth.pyHere is an example of 1D OT matrix for squared L2 regularization.
