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

Deprecate TrainerOptimizersMixin and move functionality to core/optimizer.py #11155

Merged
merged 38 commits into from
Dec 23, 2021
Merged

Deprecate TrainerOptimizersMixin and move functionality to core/optimizer.py #11155

merged 38 commits into from
Dec 23, 2021

Conversation

daniellepintz
Copy link
Contributor

@daniellepintz daniellepintz commented Dec 18, 2021 •
edited
Loading

What does this PR do?

Fixes #10681

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

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?
  • 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 🙃

@daniellepintz daniellepintz changed the title Refactor init_optimizers and remove TrainerOptimizersMixin Refactor init_optimizers Dec 19, 2021
@daniellepintz daniellepintz changed the title Refactor init_optimizers Replicate all the functionality from TrainerOptimizersMixin in core/optimizer.py Dec 19, 2021
@daniellepintz daniellepintz changed the title Replicate all the functionality from TrainerOptimizersMixin in core/optimizer.py Deprecate TrainerOptimizersMixin and move functionality to core/optimizer.py Dec 19, 2021
@ananthsub ananthsub mentioned this pull request Dec 20, 2021
Closed
awaelchli
awaelchli approved these changes Dec 20, 2021
View reviewed changes
Copy link
Member

@awaelchli awaelchli left a comment

Choose a reason for hiding this comment

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

FYI, we started thinking about typing the config return types in #10802

pytorch_lightning/trainer/trainer.py Outdated Show resolved Hide resolved
pytorch_lightning/plugins/training_type/deepspeed.py Outdated Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Outdated Show resolved Hide resolved
@mergify mergify bot removed the has conflicts label Dec 22, 2021
ananthsub
ananthsub reviewed Dec 22, 2021
View reviewed changes
pytorch_lightning/trainer/optimizers.py Outdated Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Outdated Show resolved Hide resolved
@awaelchli awaelchli added the deprecation Includes a deprecation label Dec 22, 2021
@awaelchli awaelchli added this to the 1.6 milestone Dec 22, 2021
@mergify mergify bot removed the has conflicts label Dec 22, 2021
@daniellepintz
Copy link
Contributor Author

daniellepintz commented Dec 22, 2021 •
edited
Loading

Would appreciate a final review here from code owners @Borda @carmocca @justusschock @kaushikb11 @SeanNaren @tchaton
(And feel free to merge if it's ready)

Borda
Borda approved these changes Dec 22, 2021
View reviewed changes
pytorch_lightning/core/optimizer.py Outdated Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Outdated Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Outdated Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Outdated Show resolved Hide resolved
pytorch_lightning/core/optimizer.py Outdated Show resolved Hide resolved
@daniellepintz
Copy link
Contributor Author

Thanks @Borda! Updated the PR with the changes

@ananthsub ananthsub merged commit a6a28e0 into Lightning-AI:master Dec 23, 2021
@daniellepintz daniellepintz deleted the optimizers_mixin branch December 23, 2021 02:17
@daniellepintz daniellepintz mentioned this pull request Dec 23, 2021
Merged
12 tasks
@Borda Borda mentioned this pull request Mar 9, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ananthsub ananthsub ananthsub approved these changes

@ethanwharris ethanwharris ethanwharris left review comments

@carmocca carmocca carmocca left review comments

@tchaton tchaton tchaton left review comments

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@four4fish four4fish four4fish left review comments

@awaelchli awaelchli awaelchli approved these changes

@Borda Borda Borda approved these changes

@justusschock justusschock Awaiting requested review from justusschock justusschock is a code owner

@kaushikb11 kaushikb11 Awaiting requested review from kaushikb11

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@SkafteNicki SkafteNicki Awaiting requested review from SkafteNicki

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

Assignees
No one assigned
Labels
deprecation Includes a deprecation ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.6
Development

Successfully merging this pull request may close these issues.

Move code from TrainerOptimizersMixin into TrainingTypePlugin
9 participants
@daniellepintz @ananthsub @awaelchli @Borda @ethanwharris @carmocca @tchaton @rohitgr7 @four4fish