Improvements to checkpoint migration #16233

awaelchli · 2023-01-03T23:45:54Z

What does this PR do?

Adds a target_version argument to the migration function to simplify testing
Fixes an issue with a constant (dict) being modified inplace during migration, leading to test interactions.

Splits out changes from #16172

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 · 2023-01-03T23:51:53Z

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow

Check ID	Status
pl-cpu (macOS-11, pytorch, 3.8, 1.11)	success	✅
pl-cpu (macOS-11, pytorch, 3.9, 1.12)	success	✅
pl-cpu (macOS-11, pytorch, 3.10, 1.13)	success	✅
pl-cpu (macOS-11, pytorch, 3.8, 1.10, oldest)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13)	success	✅
pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest)	success	✅
pl-cpu (windows-2022, pytorch, 3.9, 1.11)	success	✅
pl-cpu (windows-2022, pytorch, 3.10, 1.12)	success	✅
pl-cpu (windows-2022, pytorch, 3.10, 1.13)	success	✅
pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest)	success	✅
pl-cpu (slow, macOS-11, pytorch, 3.7, 1.11)	success	✅
pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.11)	success	✅
pl-cpu (slow, windows-2022, pytorch, 3.7, 1.11)	success	✅
pl-cpu (macOS-11, lightning, 3.8, 1.13)	success	✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13)	success	✅
pl-cpu (windows-2022, lightning, 3.8, 1.13)	success	✅

These checks are required after the changes to src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/utilities/migration/test_migration.py.

🟢 pytorch_lightning: Azure GPU

Check ID	Status
pytorch-lightning (GPUs)	success	✅

These checks are required after the changes to src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/utilities/migration/test_migration.py.

🟢 pytorch_lightning: Azure HPU

Check ID	Status
pytorch-lightning (HPUs)	success	✅

These checks are required after the changes to src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/utilities/migration/test_migration.py.

🟢 pytorch_lightning: Azure IPU

Check ID	Status
pytorch-lightning (IPUs)	success	✅

These checks are required after the changes to src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py, tests/tests_pytorch/utilities/migration/test_migration.py.

🟢 pytorch_lightning: Docs

Check ID	Status
make-doctest (pytorch)	success	✅
make-html (pytorch)	success	✅

These checks are required after the changes to src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py.

🟢 mypy

Check ID	Status
mypy	success	✅

These checks are required after the changes to src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.py.

🟢 install

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

These checks are required after the changes to src/pytorch_lightning/utilities/migration/migration.py, src/pytorch_lightning/utilities/migration/utils.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.

Co-authored-by: Justus Schock <[email protected]>

* [App] Introduce basic auth to Lightning CLI (#16105) * Introduce basic auth to Lightning CLI for app creation * Parsing creds added * Adding auth field to app instance body * Adding tests * Adding changelog entry * Adding more tests * Update runtime.py * Setting auth on update * Fix test * Update lightning-cloud dep * Apply suggestions from code review Co-authored-by: Adrian Wälchli <[email protected]> * Update runtime.py * Fix for release * Update base.txt Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Adrian Wälchli <[email protected]> * docs: fix order of on_fit_start() hook (#16180) Fixes #16170 * docs: updated broken links (#16191) Co-authored-by: Shashwat <shashwat> Fixes #16186 * Always use the local rank zero imports (#16178) * update BYOC documentation with AWS details (#16044) Co-authored-by: Adrian Wälchli <[email protected]> * Using internal ip + port in a load balancer instead of URL exposed (#16119) Co-authored-by: thomas chaton <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Remove CUDA_LAUNCH_BLOCKING from Lite tests (#16177) * simplify torch.Tensor (#16190) * Fix inclusion of `model_parallel` document (#16197) fix link to gpu/advanced section * Update numpy requirement from <1.23.1,>=1.17.2 to >=1.17.2,<1.24.1 in /requirements (#16199) Update numpy requirement in /requirements Updates the requirements on [numpy](https://github.com/numpy/numpy) to permit the latest version. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](numpy/numpy@v1.17.2...v1.24.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update s3fs requirement from <2022.8.3,>=2022.5.0 to >=2022.5.0,<2022.11.1 in /requirements (#16198) Update s3fs requirement in /requirements Updates the requirements on [s3fs](https://github.com/fsspec/s3fs) to permit the latest version. - [Release notes](https://github.com/fsspec/s3fs/releases) - [Changelog](https://github.com/fsspec/s3fs/blob/main/release-procedure.md) - [Commits](fsspec/s3fs@2022.5.0...2022.11.0) --- updated-dependencies: - dependency-name: s3fs dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ci: upload only with release (#16194) * Update endpoint access examples: added info about accessing auth-protected apps (#16145) * Skip a failing Bagua test for manual optimization (#16225) * Fix type error when dividing chunk size in colossalai strategy (#16212) Co-authored-by: awaelchli <[email protected]> * Fix DDP on XLA (#16020) Co-authored-by: awaelchli <[email protected]> * Added support and test for custom artifact names in WandbLogger (#16173) * Update ipython[all] requirement from <8.6.1 to <8.7.1 in /requirements (#16220) Updates the requirements on [ipython[all]](https://github.com/ipython/ipython) to permit the latest version. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](ipython/ipython@rel-0.8.4...8.7.0) --- updated-dependencies: - dependency-name: ipython[all] dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Improvements to checkpoint migration (#16233) Co-authored-by: Justus Schock <[email protected]> * Support arbitrary `Optimizable`s as optimizers (#16189) * Differences with master Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Dmitry Frolov <[email protected]> Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Adrian Wälchli <[email protected]> Co-authored-by: David Gilbertson <[email protected]> Co-authored-by: Shashwat Agrawal <[email protected]> Co-authored-by: Raphael Randschau <[email protected]> Co-authored-by: thomas chaton <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: HELSON <[email protected]> Co-authored-by: Liyang90 <[email protected]> Co-authored-by: Manan Goel <[email protected]> Co-authored-by: Justus Schock <[email protected]>

improvements to checkpoint migration

418cba8

awaelchli added tests refactor checkpointing Related to checkpointing labels Jan 3, 2023

awaelchli added this to the v1.8.x milestone Jan 3, 2023

github-actions bot added the pl Generic label for PyTorch Lightning package label Jan 3, 2023

awaelchli modified the milestones: v1.8.x, v1.9 Jan 3, 2023

unused import

8c7578c

awaelchli marked this pull request as ready for review January 3, 2023 23:51

awaelchli requested review from carmocca, justusschock and williamFalcon as code owners January 3, 2023 23:51

carmocca approved these changes Jan 3, 2023

View reviewed changes

justusschock approved these changes Jan 4, 2023

View reviewed changes

mergify bot added the ready PRs ready to be merged label Jan 4, 2023

Merge branch 'master' into tests/migration-improvements

4417801

justusschock enabled auto-merge (squash) January 4, 2023 10:06

justusschock merged commit 15536bf into master Jan 4, 2023

justusschock deleted the tests/migration-improvements branch January 4, 2023 10:43

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Improvements to checkpoint migration (#16233)

83a2c9f

Co-authored-by: Justus Schock <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvements to checkpoint migration #16233

Improvements to checkpoint migration #16233

awaelchli commented Jan 3, 2023 •

edited by github-actions bot

Loading

github-actions bot commented Jan 3, 2023 •

edited

Loading

Improvements to checkpoint migration #16233

Improvements to checkpoint migration #16233

Conversation

awaelchli commented Jan 3, 2023 • edited by github-actions bot Loading

What does this PR do?

Before submitting

PR review

Did you have fun?

github-actions bot commented Jan 3, 2023 • edited Loading

⚡ Required checks status: All passing 🟢

Groups summary

awaelchli commented Jan 3, 2023 •

edited by github-actions bot

Loading

github-actions bot commented Jan 3, 2023 •

edited

Loading