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

Move the lightning_optimizers ownership to the Strategy #11444

Merged
merged 16 commits into from
Jan 18, 2022

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Jan 12, 2022

What does this PR do?

Context

Currently, the Strategy is the object holding the optimizers. We have an internal wrapper called the LightningOptimizer which maps 1:1 to each Optimizer.

The list of lightning optimizers is currently owned by the Trainer. There's no requirement for that anymore so this PR moves the ownership to the Strategy, together with the optimizer references.

Benefits

  • Each time the Strategy.optimizers list gets set, the strategy._lightning_optimzers dictionary des too, this avoids stale references.
  • Removes clutter from the Trainer
  • Allows merging the LightningOptimizer and the _LiteOptimizer in a follow-up: Unify the LightningOptimizer and LiteOptimzier #11452
  • Deprecates trainer.lightning_optimizers, as there's no reason why users would need to access or know about this internal wrapper.

Does your PR introduce any breaking changes? If yes, please list them.

None

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • [n/a] Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing make sure you have read Review guidelines. In short, see the following bullet-list:

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

Did you have fun?

Make sure you had fun coding 🙃

cc @Borda @justusschock @awaelchli @akihironitta @rohitgr7 @tchaton

@carmocca carmocca added this to the 1.6 milestone Jan 12, 2022
@carmocca carmocca self-assigned this Jan 12, 2022
@carmocca carmocca added the deprecation Includes a deprecation label Jan 12, 2022
@carmocca carmocca changed the title [WIP] Move the lightning_optimizers ownership to the Strategy Move the lightning_optimizers ownership to the Strategy Jan 12, 2022
@carmocca carmocca marked this pull request as ready for review January 12, 2022 20:44
@awaelchli
Copy link
Contributor

awaelchli commented Jan 13, 2022

apart from the comments here, there is no issue or description. for others it will be hard to get the picture of what you briefly explained offline. would you mind adding that outline somewhere?

@carmocca
Copy link
Contributor Author

carmocca commented Jan 13, 2022

Updated the top post @awaelchli. If you think this PR needs further discussion, I can also open an issue.

Copy link
Contributor

@tchaton tchaton left a comment

Choose a reason for hiding this comment

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

LGTM !

pytorch_lightning/core/lightning.py Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Jan 16, 2022
@codecov
Copy link

codecov bot commented Jan 17, 2022

Codecov Report

Merging #11444 (4d2303c) into master (9771e7d) will decrease coverage by 0%.
The diff coverage is 72%.

@@           Coverage Diff           @@
##           master   #11444   +/-   ##
=======================================
- Coverage      88%      88%   -0%     
=======================================
  Files         194      194           
  Lines       17005    17000    -5     
=======================================
- Hits        15002    14994    -8     
- Misses       2003     2006    +3     

@carmocca carmocca enabled auto-merge (squash) January 17, 2022 14:51
@carmocca carmocca merged commit 344ab1e into master Jan 18, 2022
@carmocca carmocca deleted the refactor/lit-opt-strategy branch January 18, 2022 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deprecation Includes a deprecation optimizer ready PRs ready to be merged refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants