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/epsilon regularization #310

Merged
merged 5 commits into from
Feb 21, 2023

Conversation

michalk8
Copy link
Collaborator

  • fix how Epsilon was flattened/unflattened
  • remove kwargs from Geometry.__init__
  • remove scale_epsilon from Geometry.__init__ (must be passed via epsilon_scheduler.Epsilon instance)

closes #308

@michalk8 michalk8 self-assigned this Feb 20, 2023
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 a lot Michal for fixing this, this is very welcome and LGTM.

It might be beneficial for all to summarize in a comments section the overall logic of how epsilon is set, and the 4 scenarios we discussed.

@codecov-commenter
Copy link

codecov-commenter commented Feb 20, 2023

Codecov Report

Merging #310 (baef1d5) into main (ab9d89f) will decrease coverage by 0.12%.
The diff coverage is 77.77%.

📣 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     #310      +/-   ##
==========================================
- Coverage   85.95%   85.84%   -0.12%     
==========================================
  Files          52       52              
  Lines        5590     5594       +4     
  Branches      853      855       +2     
==========================================
- Hits         4805     4802       -3     
- Misses        662      669       +7     
  Partials      123      123              
Impacted Files Coverage Δ
src/ott/geometry/graph.py 31.87% <0.00%> (ø)
src/ott/problems/linear/potentials.py 62.42% <42.85%> (-1.40%) ⬇️
src/ott/tools/plot.py 19.82% <55.55%> (+<0.01%) ⬆️
src/ott/problems/quadratic/quadratic_problem.py 88.76% <66.66%> (-0.57%) ⬇️
src/ott/geometry/geometry.py 91.08% <91.30%> (-0.09%) ⬇️
src/ott/geometry/epsilon_scheduler.py 94.59% <100.00%> (+5.70%) ⬆️
src/ott/geometry/grid.py 91.60% <100.00%> (-0.07%) ⬇️
src/ott/geometry/low_rank.py 96.37% <100.00%> (-0.03%) ⬇️
src/ott/geometry/pointcloud.py 86.04% <100.00%> (-0.09%) ⬇️

@MUCDK
Copy link
Contributor

MUCDK commented Jun 21, 2023

Thanks a lot Michal for fixing this, this is very welcome and LGTM.

It might be beneficial for all to summarize in a comments section the overall logic of how epsilon is set, and the 4 scenarios we discussed.

Is there a comment section where I can check this?

michalk8 added a commit that referenced this pull request Jun 27, 2024
* Refactor epsilon scheduler

* Rename back to `_epsilon`

* Update variable assignment

* Revert back to old name

* Remove `jnp.where`
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.

Fix jax==0.4.4 jitting issues in CI
4 participants