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

Raise an exception when using DeepSpeed with an invalid accelerator #12699

Merged
merged 15 commits into from
May 4, 2022
Merged

Raise an exception when using DeepSpeed with an invalid accelerator #12699

merged 15 commits into from
May 4, 2022

Conversation

myxik
Copy link
Contributor

@myxik myxik commented Apr 10, 2022 •
edited by akihironitta
Loading

What does this PR do?

Fixes #12607

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

None

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?
  • [n/a] 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 🙃

@myxik myxik marked this pull request as ready for review April 11, 2022 01:32
awaelchli
awaelchli previously requested changes Apr 11, 2022
View reviewed changes
pytorch_lightning/strategies/deepspeed.py Outdated Show resolved Hide resolved
@carmocca carmocca added feature Is an improvement or enhancement strategy: deepspeed community This PR is from the community labels Apr 22, 2022
@carmocca carmocca added bug Something isn't working and removed feature Is an improvement or enhancement labels Apr 22, 2022
@carmocca carmocca added this to the 1.6.x milestone Apr 22, 2022
akihironitta
akihironitta reviewed May 4, 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.

As suggested by Adrian in #12699 (comment), to fix the import error, we can try importing it within the method instead of importing it at the top of the file.

ImportError: cannot import name 'CPUAccelerator' from 'pytorch_lightning.accelerators.cpu' (/home/runner/work/pytorch-lightning/pytorch-lightning/pytorch_lightning/accelerators/cpu.py)

pytorch_lightning/strategies/deepspeed.py Outdated Show resolved Hide resolved
tests/strategies/test_deepspeed_strategy.py Outdated Show resolved Hide resolved
@akihironitta akihironitta changed the title DeepSpeed better error message Raise an exception when using DeepSpeed with an invalid accelerator May 4, 2022
@carmocca carmocca assigned akihironitta and unassigned awaelchli May 4, 2022
@carmocca
Copy link
Contributor

carmocca commented May 4, 2022

@akihironitta Can you help this land?

rohitgr7
rohitgr7 approved these changes May 4, 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.

LGTM!

pytorch_lightning/strategies/deepspeed.py Outdated Show resolved Hide resolved
tests/strategies/test_deepspeed_strategy.py Outdated Show resolved Hide resolved
@akihironitta @rohitgr7
Apply suggestions from code review
1c626c1 
Co-authored-by: Rohit Gupta <rohitgr1998@gmail.com>
@carmocca carmocca requested a review from awaelchli May 4, 2022 13:32
@akihironitta akihironitta requested a review from krshrimali May 4, 2022 13:37
@akihironitta
Copy link
Contributor

@carmocca Thanks for your quick review! Should this PR be part of 1.6.x? I'm asking because a similar PR (#12772) is added to 1.7.

@carmocca carmocca modified the milestones: 1.6.x, 1.7 May 4, 2022
@carmocca carmocca added feature Is an improvement or enhancement and removed bug Something isn't working labels May 4, 2022
@awaelchli awaelchli dismissed their stale review May 4, 2022 16:57

dismiss

@mergify mergify bot added the ready PRs ready to be merged label May 4, 2022
@carmocca carmocca enabled auto-merge (squash) May 4, 2022 18:01
@carmocca carmocca merged commit 1e96848 into Lightning-AI:master May 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@akihironitta akihironitta akihironitta left review comments

@awaelchli awaelchli awaelchli approved these changes

@carmocca carmocca carmocca approved these changes

@Borda Borda Borda approved these changes

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

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

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

@kaushikb11 kaushikb11 Awaiting requested review from kaushikb11

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@krshrimali krshrimali Awaiting requested review from krshrimali

Assignees

@akihironitta akihironitta

Labels
community This PR is from the community feature Is an improvement or enhancement ready PRs ready to be merged strategy: deepspeed
Projects
None yet
Milestone
pl:1.7
Development

Successfully merging this pull request may close these issues.

DeepSpeed internal error on CPU
8 participants
@myxik @carmocca @akihironitta @awaelchli @Borda @SeanNaren @krshrimali @rohitgr7