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.

Sign up for GitHub

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

Jump to bottom

Refactor GW initialization #133

Merged
merged 7 commits into from
Sep 5, 2022
Merged

Refactor GW initialization #133

merged 7 commits into from
Sep 5, 2022

Conversation

michalk8
Copy link
Collaborator

@michalk8 michalk8 commented Sep 1, 2022

No description provided.

@michalk8 michalk8 self-assigned this Sep 1, 2022
@michalk8 michalk8 added the enhancement New feature or request label Sep 1, 2022
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@codecov-commenter
Copy link

Codecov Report

Merging #133 (336f897) into main (1419513) will increase coverage by 0.13%.
The diff coverage is 89.65%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #133      +/-   ##
==========================================
+ Coverage   83.17%   83.30%   +0.13%     
==========================================
  Files          48       48              
  Lines        4713     4715       +2     
  Branches      512      512              
==========================================
+ Hits         3920     3928       +8     
+ Misses        650      649       -1     
+ Partials      143      138       -5
Impacted Files Coverage Δ
ott/core/gw_barycenter.py 74.50% <0.00%> (+0.72%) ⬆️
ott/core/gromov_wasserstein.py 92.45% <93.75%> (-0.89%) ⬇️
ott/core/quad_problems.py 87.55% <100.00%> (+0.58%) ⬆️
ott/core/was_solver.py 95.12% <100.00%> (ø)
ott/core/sinkhorn.py 98.02% <0.00%> (+0.79%) ⬆️
ott/core/initializers_lr.py 81.89% <0.00%> (+2.58%) ⬆️

marcocuturi
marcocuturi approved these changes Sep 5, 2022
View reviewed changes
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.

Thanks for this Michal!

ott/core/gromov_wasserstein.py Show resolved Hide resolved
ott/core/quad_problems.py Show resolved Hide resolved
@michalk8 michalk8 marked this pull request as ready for review September 5, 2022 12:20
@michalk8
Copy link
Collaborator Author

michalk8 commented Sep 5, 2022

Looks like the broken tests (related to computing Hessians for Sinkhorn) are related to the new jax version (0.3.17), using 0.3.16 they pass.
Just tested this running pytest -k "test_hessian_sinkhorn[True-0.93-0.91-shape6-0]", it's due to jax-ml/jax#12041.

@michalk8 michalk8 merged commit 19c537e into ott-jax:main Sep 5, 2022
@michalk8 michalk8 deleted the feature/gwlr-initialization branch September 5, 2022 14:27
michalk8 added a commit that referenced this pull request Jun 27, 2024
@michalk8
Refactor GW initialization (#133)
eaa81be 
* Refactor GW initialization

* Fix rank being traced

* Fix not re-using init from previous iters in GW

* Fix tests

* Simplify LRGW iniitalization

* Regenerate GWLR notebook

* Fix old code in test scaling
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcocuturi marcocuturi marcocuturi approved these changes

@LaetitiaPapaxanthos LaetitiaPapaxanthos LaetitiaPapaxanthos left review comments

Assignees

@michalk8 michalk8

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@michalk8 @codecov-commenter @LaetitiaPapaxanthos @marcocuturi