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

Deprecate DeviceType in favor of _AcceleratorType #10503

Merged
merged 10 commits into from
Nov 25, 2021

Conversation

kaushikb11
Copy link
Contributor

@kaushikb11 kaushikb11 commented Nov 12, 2021

What does this PR do?

Part of #9932

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 🙃

cc @Borda @justusschock @awaelchli @akihironitta

@kaushikb11 kaushikb11 marked this pull request as draft November 12, 2021 13:38
pytorch_lightning/lite/lite.py Outdated Show resolved Hide resolved
pytorch_lightning/utilities/enums.py Show resolved Hide resolved
@kaushikb11 kaushikb11 changed the title Rename DeviceType Enum to AcceleratorType Deprecate DeviceType in favor of _AcceleratorType Nov 22, 2021
@kaushikb11 kaushikb11 marked this pull request as ready for review November 22, 2021 08:16
pytorch_lightning/utilities/enums.py Show resolved Hide resolved
pytorch_lightning/utilities/enums.py Show resolved Hide resolved
@mergify mergify bot added the ready PRs ready to be merged label Nov 22, 2021
pytorch_lightning/utilities/enums.py Outdated Show resolved Hide resolved
pytorch_lightning/utilities/enums.py Show resolved Hide resolved
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
@kaushikb11 kaushikb11 enabled auto-merge (squash) November 22, 2021 13:54
pytorch_lightning/trainer/trainer.py Show resolved Hide resolved
pytorch_lightning/utilities/enums.py Show resolved Hide resolved
if (
trainer is not None
and trainer.amp_backend == AMPType.NATIVE
and trainer._device_type != _AcceleratorType.TPU
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
and trainer._device_type != _AcceleratorType.TPU
and not isinstance(trainer.accelerator, TPUAccelerator)

Outside of the trainer/accelerator connector, this is how we want to check for the accelerator type in the future. Just a reminder, let's update this in follow up PRs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup!

@mergify mergify bot removed the has conflicts label Nov 25, 2021
@codecov
Copy link

codecov bot commented Nov 25, 2021

Codecov Report

Merging #10503 (b5fa982) into master (b57fecc) will increase coverage by 0%.
The diff coverage is 94%.

@@           Coverage Diff           @@
##           master   #10503   +/-   ##
=======================================
  Coverage      92%      92%           
=======================================
  Files         177      177           
  Lines       16404    16411    +7     
=======================================
+ Hits        15059    15066    +7     
  Misses       1345     1345           

@kaushikb11 kaushikb11 merged commit e0b4bb2 into master Nov 25, 2021
@kaushikb11 kaushikb11 deleted the rename/accelerator_type branch November 25, 2021 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready PRs ready to be merged refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants