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

4/n Move Accelerator into strategy - remove X_step() from accelerator #10890

Merged
merged 11 commits into from
Dec 6, 2021

Conversation

four4fish
Copy link
Contributor

@four4fish four4fish commented Dec 2, 2021

What does this PR do?

Remove training_step() from Accelerator, and call strategy.training_step directly

In the following graph: Each color is one logic.

strategies-training-step.png

[RFC] Should we have training_step() in Parallel Plugin, then DDPSpawning, DP and DDP doesn't need to duplicate the logic. Instead we need training_step in Horovod.
cc: @awaelchli @ananthsub @carmocca @justusschock

Removed TPUSpawning.training_step() as the logic is same as the super class DDPSpawn

Part of #10648

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 🙃

@four4fish four4fish marked this pull request as draft December 2, 2021 01:48
@four4fish four4fish added this to the 1.6 milestone Dec 2, 2021
@four4fish four4fish marked this pull request as ready for review December 2, 2021 07:12
@codecov
Copy link

codecov bot commented Dec 2, 2021

Codecov Report

Merging #10890 (3d6fa8b) into master (6043179) will decrease coverage by 4%.
The diff coverage is 51%.

❗ Current head 3d6fa8b differs from pull request most recent head 23b5e94. Consider uploading reports for the commit 23b5e94 to get more accurate results

@@           Coverage Diff            @@
##           master   #10890    +/-   ##
========================================
- Coverage      92%      88%    -4%     
========================================
  Files         177      177            
  Lines       16484    16570    +86     
========================================
- Hits        15132    14589   -543     
- Misses       1352     1981   +629     

pytorch_lightning/plugins/training_type/ddp.py Outdated Show resolved Hide resolved
pytorch_lightning/plugins/training_type/ddp.py Outdated Show resolved Hide resolved
@awaelchli
Copy link
Contributor

[RFC] Should we have training_step() in Parallel Plugin, then DDPSpawning, DP and DDP doesn't need to duplicate the logic. Instead we need training_step in Horovod.

I would keep the overrides for all plugins that wrap the model with a class like DistributedDataParallel for example. This way, the definition of how the model gets wrapped lies in the plugin together with how the training_step gets called through that wrapper.

@mergify mergify bot added the has conflicts label Dec 2, 2021
@four4fish
Copy link
Contributor Author

four4fish commented Dec 2, 2021

[RFC] Should we have training_step() in Parallel Plugin, then DDPSpawning, DP and DDP doesn't need to duplicate the logic. Instead we need training_step in Horovod.

I would keep the overrides for all plugins that wrap the model with a class like DistributedDataParallel for example. This way, the definition of how the model gets wrapped lies in the plugin together with how the training_step gets called through that wrapper.

@awaelchli I agree, even have duplicate logic is better than fail silently or inherent silencely. In the last step of the refactor, we can regrouping logics and flatten the inheritance

@four4fish four4fish marked this pull request as ready for review December 4, 2021 01:40
@mergify mergify bot removed the has conflicts label Dec 4, 2021
@four4fish four4fish marked this pull request as draft December 4, 2021 02:26
@four4fish four4fish changed the title 4/n Move Accelerator into strategy - remove training_step() from accelerator 4/n Move Accelerator into strategy - remove X_step() from accelerator Dec 4, 2021
@four4fish four4fish marked this pull request as ready for review December 4, 2021 03:29
Copy link
Contributor

@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.

nice!

pytorch_lightning/loops/optimization/optimizer_loop.py Outdated Show resolved Hide resolved
@awaelchli awaelchli self-assigned this Dec 5, 2021
@awaelchli awaelchli enabled auto-merge (squash) December 5, 2021 02:26
@mergify mergify bot added ready PRs ready to be merged has conflicts labels Dec 6, 2021
@awaelchli awaelchli mentioned this pull request Dec 6, 2021
12 tasks
@awaelchli awaelchli merged commit 63bb4ec into Lightning-AI:master Dec 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
accelerator breaking change Includes a breaking change plugin ready PRs ready to be merged refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants