Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/debiased entropic map #238

Merged
merged 6 commits into from
Jan 28, 2023
Merged

Conversation

michalk8
Copy link
Collaborator

No description provided.

@michalk8 michalk8 self-assigned this Jan 25, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #238 (b18e2ac) into main (fe882a7) will decrease coverage by 7.48%.
The diff coverage is 70.37%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #238      +/-   ##
==========================================
- Coverage   87.92%   80.44%   -7.48%     
==========================================
  Files          52       52              
  Lines        5309     5314       +5     
  Branches      544      546       +2     
==========================================
- Hits         4668     4275     -393     
- Misses        510      888     +378     
- Partials      131      151      +20     
Impacted Files Coverage Δ
src/ott/tools/sinkhorn_divergence.py 65.45% <0.00%> (-32.80%) ⬇️
src/ott/problems/linear/potentials.py 76.76% <79.16%> (-12.37%) ⬇️
src/ott/solvers/linear/discrete_barycenter.py 20.73% <0.00%> (-65.86%) ⬇️
src/ott/tools/segment_sinkhorn.py 40.00% <0.00%> (-60.00%) ⬇️
src/ott/solvers/quadratic/gw_barycenter.py 30.47% <0.00%> (-53.34%) ⬇️
src/ott/problems/quadratic/gw_barycenter.py 28.18% <0.00%> (-44.55%) ⬇️
src/ott/geometry/segment.py 62.22% <0.00%> (-37.78%) ⬇️
src/ott/utils.py 51.72% <0.00%> (-34.49%) ⬇️
src/ott/tools/soft_sort.py 71.55% <0.00%> (-23.86%) ⬇️
... and 24 more

Copy link
Contributor

@marcocuturi marcocuturi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good!

if not self.is_debiased:
return potential_xy

ep = EntropicPotentials(self._f_xx, self._g_yy, prob=self._prob)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i understand better why you wanted to encode it this way, this is very elegant to reuse the same prob indeed.

@michalk8 michalk8 merged commit 08491f0 into ott-jax:main Jan 28, 2023
@michalk8 michalk8 deleted the fix/debiased-entropic-map branch January 28, 2023 23:16
michalk8 added a commit that referenced this pull request Jun 27, 2024
* [ci skip] Add `environment.yml` for `binder`

* Fix debiasing in `EntropicMap`

* Test for collapse in non-debiased case

* [ci skip] Add assertion
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants