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

Replace unwrapping logic in strategies #13738

Merged
merged 61 commits into from
Aug 12, 2022
Merged

Replace unwrapping logic in strategies #13738

merged 61 commits into from
Aug 12, 2022

Conversation

awaelchli
Copy link
Contributor

@awaelchli awaelchli commented Jul 19, 2022 •
edited by github-actions bot
Loading

What does this PR do?

Fixes #13502 (main RFC)
Fixes #8593
Fixes #13500

The PR looks big, but most complexity turns out to be in the deprecation. The rest of the changes are very thinly spread across multiple files, but are not complex by themselves.

Before, you would do

lightning_module = unwrap_lightning_module(self.model)

Now, directly access it:

lightning_module = self.lightning_module

Terminology:
self.model: refers to a LightningModule that is potentially wrapped
self.lightning_module: is always the pure LightningModule as it gets passed to Trainer.fit by the user. This attribute is read-access only.

TODOs:

  • backward compatibility in wrappers/deprecation

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

No.

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 @Borda @justusschock @awaelchli @rohitgr7 @tchaton @akihironitta

@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Jul 19, 2022
@awaelchli awaelchli mentioned this pull request Jul 19, 2022
Closed
awaelchli and others added 27 commits July 26, 2022 23:50
@awaelchli
Merge branch 'master' into refactor/remove-unwrap
4c65ea6
@awaelchli
model setter
626ac9e
@awaelchli
fix import
b07e11c
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
352397f 
for more information, see https://pre-commit.ci
@awaelchli
refactor wrappers overrides
7184b59
@awaelchli
Merge remote-tracking branch 'origin/refactor/remove-unwrap' into ref…
1f5d06f 
…actor/remove-unwrap
@awaelchli
refactor
f861a01
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
78da9af 
for more information, see https://pre-commit.ci
@awaelchli
update
2a2e1e8
@awaelchli
Merge remote-tracking branch 'origin/refactor/remove-unwrap' into ref…
7e773b4 
…actor/remove-unwrap
@awaelchli
update
e94797f
@awaelchli
update
39d7755
@awaelchli
fixes
cad60f2
@awaelchli
update
9ee0630
@awaelchli
simplify
12a3ad6
@awaelchli
debug
b99bc23
@awaelchli
update
b7c74ef
@awaelchli
validate
d842246
@awaelchli
update
b176534
@awaelchli
fix
67fae07
@awaelchli
debug
1e9fe94
@awaelchli
teardown
5050399
@awaelchli
fix
dfffb49
@awaelchli
discussion
a0d1940
@awaelchli
rename
0bbd41a
@awaelchli
fix
b7211a6
@awaelchli
clear model reference on connect()
3a7e885
rohitgr7
rohitgr7 approved these changes Aug 9, 2022
View reviewed changes
src/pytorch_lightning/CHANGELOG.md Show resolved Hide resolved
tests/tests_pytorch/deprecated_api/test_remove_1-10.py Show resolved Hide resolved
src/pytorch_lightning/strategies/sharded_spawn.py Show resolved Hide resolved
src/pytorch_lightning/strategies/sharded.py Show resolved Hide resolved
src/pytorch_lightning/overrides/base.py Outdated Show resolved Hide resolved
src/pytorch_lightning/overrides/base.py Outdated Show resolved Hide resolved
src/pytorch_lightning/overrides/base.py Outdated Show resolved Hide resolved
src/pytorch_lightning/overrides/data_parallel.py Outdated Show resolved Hide resolved
src/pytorch_lightning/overrides/fairscale.py Outdated Show resolved Hide resolved
akihironitta
akihironitta reviewed Aug 10, 2022
View reviewed changes
Copy link
Contributor

@akihironitta akihironitta left a comment

Choose a reason for hiding this comment

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

Thank you for the description! It helped me review the change :) LGTM!

src/pytorch_lightning/overrides/fairscale.py Outdated Show resolved Hide resolved
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Aug 10, 2022
@awaelchli awaelchli requested a review from rohitgr7 August 10, 2022 16:15
rohitgr7
rohitgr7 approved these changes Aug 11, 2022
View reviewed changes
Copy link
Contributor

@rohitgr7 rohitgr7 left a comment

Choose a reason for hiding this comment

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

If you could add comlpete version, it'd be nice.

else looks good.

@mergify mergify bot added has conflicts and removed ready PRs ready to be merged labels Aug 11, 2022
@mergify mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Aug 11, 2022
tchaton
tchaton approved these changes Aug 12, 2022
View reviewed changes
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 !

@awaelchli awaelchli enabled auto-merge (squash) August 12, 2022 07:57
@awaelchli awaelchli merged commit 807f9d8 into master Aug 12, 2022
@awaelchli awaelchli deleted the refactor/remove-unwrap branch August 12, 2022 08:24
jessecambon pushed a commit to jessecambon/lightning that referenced this pull request Aug 16, 2022
@awaelchli @carmocca
@rohitgr7 @jessecambon
Replace unwrapping logic in strategies (Lightning-AI#13738)
2cfde9c 
Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: Rohit Gupta <[email protected]>
akihironitta pushed a commit to lorcll/pytorch-lightning that referenced this pull request Aug 25, 2022
Use the new unwraping logic following Lightning-AI#13738
f5d86be
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akihironitta akihironitta akihironitta left review comments

@carmocca carmocca carmocca approved these changes

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@tchaton tchaton tchaton approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

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

@kaushikb11 kaushikb11 Awaiting requested review from kaushikb11

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

Assignees

@awaelchli awaelchli

Labels
deprecation Includes a deprecation pl Generic label for PyTorch Lightning package ready PRs ready to be merged refactor strategy
Projects
No open projects
Frameworks Planning
Status: Done
Milestone
v1.8
5 participants
@awaelchli @carmocca @tchaton @akihironitta @rohitgr7