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

opt_idx cleanup after optimizer loop changes #16597

Merged
merged 5 commits into from
Feb 2, 2023
Merged

opt_idx cleanup after optimizer loop changes #16597

merged 5 commits into from
Feb 2, 2023

Conversation

awaelchli
Copy link
Contributor

@awaelchli awaelchli commented Feb 1, 2023 •
edited by github-actions bot
Loading

Follow up to #16539 with minor clean up and simplification of opt_idx handling in the LightningOptimizer.

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 update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is free to review the PR once the tests have passed.
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?

I made sure I had fun coding 🙃

cc @justusschock @awaelchli @Borda

@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Feb 1, 2023
@awaelchli awaelchli added refactor optimization code quality and removed pl Generic label for PyTorch Lightning package labels Feb 1, 2023
@awaelchli awaelchli added this to the 2.0 milestone Feb 1, 2023
@awaelchli awaelchli self-assigned this Feb 1, 2023
@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Feb 1, 2023
Base automatically changed from removal/optimizer-loop to master February 1, 2023 16:21
@awaelchli awaelchli force-pushed the removal/to-lightning-optimizer branch from d102330 to c6ea75f Compare February 1, 2023 17:06
@awaelchli awaelchli marked this pull request as ready for review February 1, 2023 17:07
@github-actions
Copy link
Contributor

github-actions bot commented Feb 1, 2023 •
edited
Loading

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow
Check ID Status
pl-cpu (macOS-11, lightning, 3.8, 1.11) success ✅
pl-cpu (macOS-11, lightning, 3.9, 1.12) success ✅
pl-cpu (macOS-11, lightning, 3.10, 1.13) success ✅
pl-cpu (macOS-11, lightning, 3.8, 1.11, oldest) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.9, 1.11) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest) success ✅
pl-cpu (windows-2022, lightning, 3.9, 1.11) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.12) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
pl-cpu (windows-2022, lightning, 3.8, 1.11, oldest) success ✅
pl-cpu (slow, macOS-11, lightning, 3.8, 1.11) success ✅
pl-cpu (slow, ubuntu-20.04, lightning, 3.8, 1.11) success ✅
pl-cpu (slow, windows-2022, lightning, 3.8, 1.11) success ✅
pl-cpu (macOS-11, pytorch, 3.8, 1.13) success ✅
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13) success ✅
pl-cpu (windows-2022, pytorch, 3.8, 1.13) success ✅

These checks are required after the changes to src/lightning/pytorch/core/module.py, src/lightning/pytorch/core/optimizer.py, src/lightning/pytorch/loops/optimization/manual_loop.py, src/lightning/pytorch/strategies/strategy.py, tests/tests_pytorch/core/test_lightning_optimizer.py.

🟢 pytorch_lightning: Azure GPU
Check ID Status
pytorch-lightning (GPUs) success ✅

These checks are required after the changes to src/lightning/pytorch/core/module.py, src/lightning/pytorch/core/optimizer.py, src/lightning/pytorch/loops/optimization/manual_loop.py, src/lightning/pytorch/strategies/strategy.py, tests/tests_pytorch/core/test_lightning_optimizer.py.

🟢 pytorch_lightning: Azure HPU
Check ID Status
pytorch-lightning (HPUs) success ✅

These checks are required after the changes to src/lightning/pytorch/core/module.py, src/lightning/pytorch/core/optimizer.py, src/lightning/pytorch/loops/optimization/manual_loop.py, src/lightning/pytorch/strategies/strategy.py, tests/tests_pytorch/core/test_lightning_optimizer.py.

🟢 pytorch_lightning: Azure IPU
Check ID Status
pytorch-lightning (IPUs) success ✅

These checks are required after the changes to src/lightning/pytorch/core/module.py, src/lightning/pytorch/core/optimizer.py, src/lightning/pytorch/loops/optimization/manual_loop.py, src/lightning/pytorch/strategies/strategy.py, tests/tests_pytorch/core/test_lightning_optimizer.py.

🟢 pytorch_lightning: Docs
Check ID Status
make-doctest (pytorch) success ✅
make-html (pytorch) success ✅

These checks are required after the changes to src/lightning/pytorch/core/module.py, src/lightning/pytorch/core/optimizer.py, src/lightning/pytorch/loops/optimization/manual_loop.py, src/lightning/pytorch/strategies/strategy.py.

🟢 mypy
Check ID Status
mypy success ✅

These checks are required after the changes to src/lightning/pytorch/core/module.py, src/lightning/pytorch/core/optimizer.py, src/lightning/pytorch/loops/optimization/manual_loop.py, src/lightning/pytorch/strategies/strategy.py.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.8) success ✅
install-pkg (ubuntu-22.04, app, 3.10) success ✅
install-pkg (ubuntu-22.04, fabric, 3.8) success ✅
install-pkg (ubuntu-22.04, fabric, 3.10) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.8) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.10) success ✅
install-pkg (ubuntu-22.04, lightning, 3.8) success ✅
install-pkg (ubuntu-22.04, lightning, 3.10) success ✅
install-pkg (ubuntu-22.04, notset, 3.8) success ✅
install-pkg (ubuntu-22.04, notset, 3.10) success ✅
install-pkg (macOS-12, app, 3.8) success ✅
install-pkg (macOS-12, app, 3.10) success ✅
install-pkg (macOS-12, fabric, 3.8) success ✅
install-pkg (macOS-12, fabric, 3.10) success ✅
install-pkg (macOS-12, pytorch, 3.8) success ✅
install-pkg (macOS-12, pytorch, 3.10) success ✅
install-pkg (macOS-12, lightning, 3.8) success ✅
install-pkg (macOS-12, lightning, 3.10) success ✅
install-pkg (macOS-12, notset, 3.8) success ✅
install-pkg (macOS-12, notset, 3.10) success ✅
install-pkg (windows-2022, app, 3.8) success ✅
install-pkg (windows-2022, app, 3.10) success ✅
install-pkg (windows-2022, fabric, 3.8) success ✅
install-pkg (windows-2022, fabric, 3.10) success ✅
install-pkg (windows-2022, pytorch, 3.8) success ✅
install-pkg (windows-2022, pytorch, 3.10) success ✅
install-pkg (windows-2022, lightning, 3.8) success ✅
install-pkg (windows-2022, lightning, 3.10) success ✅
install-pkg (windows-2022, notset, 3.8) success ✅
install-pkg (windows-2022, notset, 3.10) success ✅

These checks are required after the changes to src/lightning/pytorch/core/module.py, src/lightning/pytorch/core/optimizer.py, src/lightning/pytorch/loops/optimization/manual_loop.py, src/lightning/pytorch/strategies/strategy.py.

Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@mergify mergify bot added the has conflicts label Feb 1, 2023
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Feb 1, 2023
@awaelchli awaelchli enabled auto-merge (squash) February 1, 2023 20:03
@awaelchli awaelchli merged commit cb1e8e0 into master Feb 2, 2023
@awaelchli awaelchli deleted the removal/to-lightning-optimizer branch February 2, 2023 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carmocca carmocca carmocca approved these changes

@Borda Borda Borda approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

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

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

Assignees

@awaelchli awaelchli

Labels
code quality optimization pl Generic label for PyTorch Lightning package ready PRs ready to be merged refactor
Projects
None yet
Milestone
2.0
Development

Successfully merging this pull request may close these issues.
3 participants
@awaelchli @Borda @carmocca