Deprecate power in PointCloud, introduce TICost and use it to compute Entropic (Brenier) maps.
#167
Conversation
This file contains 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
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #167 +/- ##
==========================================
+ Coverage 89.83% 89.91% +0.07%
==========================================
Files 51 51
Lines 5068 5118 +50
Branches 519 521 +2
==========================================
+ Hits 4553 4602 +49
- Misses 391 397 +6
+ Partials 124 119 -5
|
bosr
reviewed
Nov 10, 2022
|
|
||
| import jax | ||
| import jax.numpy as jnp | ||
| import jax.scipy as jsp | ||
| import jax.tree_util as jtu | ||
| from typing_extensions import Literal | ||
|
|
||
| from ott.geometry import pointcloud | ||
| from ott.geometry import costs, pointcloud | ||
|
|
||
| __all__ = ["DualPotentials", "EntropicPotentials"] | ||
| Potential_t = Callable[[jnp.ndarray], float] |
There was a problem hiding this comment.
In the same vein as cost_fn, I'm wondering if Potential_t could be renamed to PotentialFn_t or just PotentialFn.
There was a problem hiding this comment.
I had the same reflex when Michal used it for the first time, but I think it makes sense :) Here it turns out this is just a type (_t) and can be either a vector of a function.
bosr
reviewed
Nov 10, 2022
ott/geometry/costs.py
Outdated
|
|
||
| c(x,y) = h(z), where z := x-y. | ||
|
|
||
| where h is a function strictly convex (or concave) function mapping vectors |
There was a problem hiding this comment.
Just a small repetition here: I think you meant "where h is a strictly convex (or concave) function ...". It's minor, I know ;)
There was a problem hiding this comment.
great catch! thanks.
bosr
reviewed
Nov 10, 2022
bosr
reviewed
Nov 10, 2022
michalk8
requested changes
Nov 10, 2022
marcocuturi
changed the title
power in point cloud API, introduce RBF costs.
marcocuturi
changed the title
power in point cloud API, introduce RBF costs.power in PointCloud, introduce RBFCost and use it to compute Entropic (Brenier) maps.
michalk8
requested changes
Nov 11, 2022
marcocuturi
changed the title
power in PointCloud, introduce RBFCost and use it to compute Entropic (Brenier) maps.power in PointCloud, introduce TIFCost and use it to compute Entropic (Brenier) maps.
marcocuturi
changed the title
power in PointCloud, introduce TIFCost and use it to compute Entropic (Brenier) maps.power in PointCloud, introduce TICost and use it to compute Entropic (Brenier) maps.
michalk8
requested changes
Nov 14, 2022
It seems I need your explicit approval? maybe related to changes I did in "branch protection" |
michalk8
approved these changes
Nov 15, 2022
michalk8
pushed a commit
that referenced
this pull request
Jun 27, 2024
…ompute Entropic (Brenier) maps. (#167) * deperecate `power`, introduce h maps in potentials * Deprecate power and introduce h function in costs. * linter * linter * revert abstractmethod. * linter * linter * PNorm -> SqPNorm * PNorm -> SqPNorm in tests. * another fix for abstract method. * fix abc.abstractmethod * linter * nb fix * linter * nb bug fix * modify ipynb * abc.abstractmethod for RBF * fixes and additions. * fix `cor` in neuraldual * fix in neuraldual * p-norm ** p implemented, fixes. * various fixes. Change to `TICost` * various fixes * fix nb * last fixes.
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.
cost(x,y) := h(x-y)wherehis from vectors to reals. Specify (when known) the legendre transform ofh. This plays a role in the application of the Brenier theorem.SqPNorms, i.e. squared p-norms, cost functions. Squared p-norms have closed forms for their legendre transform (corresponding squared q-norm, where1/p + 1/q = 1)poweroption inPointCloudgeometries. This was confusing and redundant with the ability to write down directly a customCostFnfor that purpose. Raise an error ifpoweris passed to help debugging.