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

Refactor XLA and TPU checks across codebase #14550

Merged
merged 44 commits into from
Oct 4, 2022
Merged

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Sep 6, 2022

What does this PR do?

Move XLA utilities together with the TPUAccelerator
Deprecate one more redundant utility function
Fix mocks in tests via fixtures

Follow-up to #14514
Part of #11826
Part of #12786
Closes #14982, #14979

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 minor internal changes/refactors)

PR review

  • 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

cc @Borda @justusschock @awaelchli @rohitgr7 @tchaton

@carmocca carmocca added this to the pl:1.8 milestone Sep 6, 2022
@carmocca carmocca self-assigned this Sep 6, 2022
@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Sep 6, 2022
@carmocca carmocca mentioned this pull request Sep 8, 2022
11 tasks
@awaelchli
Copy link
Contributor

@carmocca just to be sure, you are not mixing up tpu_available with xla_available? These are two different things. One can have xla available on a machine without tpus.

@carmocca
Copy link
Contributor Author

carmocca commented Sep 19, 2022

@awaelchli In this PR, tpu_available is deleted in favor of TPUAccelerator.is_available().

In most places, we want to check XLA_AVAILABLE as that's what needs to be True to successfully import torch_xla. TPUAccelerator.is_available() includes XLA_AVAILABLE because torch_xla is necessary to check whether we have TPU hardware.

I don't think I mixed things up, but there might be mistakes. Tests are not fixed yet.

@mergify mergify bot added the ready PRs ready to be merged label Oct 4, 2022
@carmocca carmocca changed the title Refactor XLADeviceUtils Refactor XLA and TPU checks across codebase Oct 4, 2022
@codecov
Copy link

codecov bot commented Oct 4, 2022

Codecov Report

Merging #14550 (d296b7b) into master (b936fd4) will increase coverage by 2%.
The diff coverage is 66%.

Additional details and impacted files
@@            Coverage Diff            @@
##           master   #14550     +/-   ##
=========================================
+ Coverage      83%      85%     +2%     
=========================================
  Files         396      275    -121     
  Lines       29007    21166   -7841     
=========================================
- Hits        24032    17919   -6113     
+ Misses       4975     3247   -1728     

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 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pl Generic label for PyTorch Lightning package ready PRs ready to be merged refactor
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants