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 auto_select_gpus #16147

Merged
merged 26 commits into from Dec 22, 2022
Merged

Conversation

awaelchli
Copy link
Member

@awaelchli awaelchli commented Dec 20, 2022

What does this PR do?

Fixes #13079
Fixes #10535
Alternative to #13356

Before

# Picks the first two available GPUs
Trainer(devices=2, auto_select_gpus=True)

After

# Picks the first two available GPUs
from pytorch_lightning.accelerators import find_usable_cuda_gpus

Trainer(devices=find_usable_cuda_gpus)

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

@github-actions github-actions bot added the pl Generic label for PyTorch Lightning package label Dec 20, 2022
@awaelchli awaelchli added deprecation Includes a deprecation accelerator: cuda Compute Unified Device Architecture GPU trainer: argument labels Dec 20, 2022
@awaelchli awaelchli added this to the v1.9 milestone Dec 20, 2022
@awaelchli awaelchli added the fun Staff contributions outside working hours - to differentiate from the "community" label label Dec 20, 2022
Copy link
Member

@carmocca carmocca left a comment

Choose a reason for hiding this comment

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

Early review

docs/source-pytorch/common/trainer.rst Outdated Show resolved Hide resolved
docs/source-pytorch/accelerators/gpu_basic.rst Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/__init__.py Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Outdated Show resolved Hide resolved
@awaelchli awaelchli marked this pull request as ready for review December 21, 2022 01:25
@github-actions
Copy link
Contributor

github-actions bot commented Dec 21, 2022

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow
Check ID Status
pl-cpu (macOS-11, pytorch, 3.8, 1.11) success
pl-cpu (macOS-11, pytorch, 3.9, 1.12) success
pl-cpu (macOS-11, pytorch, 3.10, 1.13) success
pl-cpu (macOS-11, pytorch, 3.8, 1.10, oldest) success
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10) success
pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11) success
pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12) success
pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13) success
pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest) success
pl-cpu (windows-2022, pytorch, 3.9, 1.11) success
pl-cpu (windows-2022, pytorch, 3.10, 1.12) success
pl-cpu (windows-2022, pytorch, 3.10, 1.13) success
pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest) success
pl-cpu (slow, macOS-11, pytorch, 3.7, 1.11) success
pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.11) success
pl-cpu (slow, windows-2022, pytorch, 3.7, 1.11) success
pl-cpu (macOS-11, lightning, 3.8, 1.13) success
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13) success
pl-cpu (windows-2022, lightning, 3.8, 1.13) success

These checks are required after the changes to src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py, src/pytorch_lightning/accelerators/__init__.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/auto_gpu_select.py, tests/tests_pytorch/deprecated_api/test_remove_1-10.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py.

🟢 pytorch_lightning: Azure GPU
Check ID Status
pytorch-lightning (GPUs) success

These checks are required after the changes to src/pytorch_lightning/accelerators/__init__.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/auto_gpu_select.py, tests/tests_pytorch/deprecated_api/test_remove_1-10.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py, src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py.

🟢 pytorch_lightning: Azure HPU
Check ID Status
pytorch-lightning (HPUs) success

These checks are required after the changes to src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py, src/pytorch_lightning/accelerators/__init__.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/auto_gpu_select.py, tests/tests_pytorch/deprecated_api/test_remove_1-10.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py.

🟢 pytorch_lightning: Azure IPU
Check ID Status
pytorch-lightning (IPUs) success

These checks are required after the changes to src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py, src/pytorch_lightning/accelerators/__init__.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/auto_gpu_select.py, tests/tests_pytorch/deprecated_api/test_remove_1-10.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py.

🟢 pytorch_lightning: Docs
Check ID Status
make-doctest (pytorch) success
make-html (pytorch) success

These checks are required after the changes to src/pytorch_lightning/accelerators/__init__.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/auto_gpu_select.py, docs/source-pytorch/accelerators/gpu_basic.rst, docs/source-pytorch/common/trainer.rst.

🟢 lightning_lite: CPU workflow
Check ID Status
lite-cpu (macOS-11, lite, 3.8, 1.11) success
lite-cpu (macOS-11, lite, 3.9, 1.12) success
lite-cpu (macOS-11, lite, 3.10, 1.13) success
lite-cpu (macOS-11, lite, 3.7, 1.10, oldest) success
lite-cpu (ubuntu-20.04, lite, 3.8, 1.10) success
lite-cpu (ubuntu-20.04, lite, 3.9, 1.11) success
lite-cpu (ubuntu-20.04, lite, 3.10, 1.12) success
lite-cpu (ubuntu-20.04, lite, 3.10, 1.13) success
lite-cpu (ubuntu-20.04, lite, 3.7, 1.10, oldest) success
lite-cpu (windows-2022, lite, 3.9, 1.11) success
lite-cpu (windows-2022, lite, 3.10, 1.12) success
lite-cpu (windows-2022, lite, 3.10, 1.13) success
lite-cpu (windows-2022, lite, 3.7, 1.10, oldest) success
lite-cpu (macOS-11, lightning, 3.8, 1.13) success
lite-cpu (ubuntu-20.04, lightning, 3.8, 1.13) success
lite-cpu (windows-2022, lightning, 3.8, 1.13) success

These checks are required after the changes to src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py, tests/tests_lite/accelerators/test_cuda.py.

🟢 lightning_lite: Azure GPU
Check ID Status
lightning-lite (GPUs) success

These checks are required after the changes to src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py, tests/tests_lite/accelerators/test_cuda.py.

🟢 mypy
Check ID Status
mypy success

These checks are required after the changes to src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py, src/pytorch_lightning/accelerators/__init__.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/auto_gpu_select.py.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.7) success
install-pkg (ubuntu-22.04, app, 3.10) success
install-pkg (ubuntu-22.04, lite, 3.7) success
install-pkg (ubuntu-22.04, lite, 3.10) success
install-pkg (ubuntu-22.04, pytorch, 3.7) success
install-pkg (ubuntu-22.04, pytorch, 3.10) success
install-pkg (ubuntu-22.04, lightning, 3.7) success
install-pkg (ubuntu-22.04, lightning, 3.10) success
install-pkg (ubuntu-22.04, notset, 3.7) success
install-pkg (ubuntu-22.04, notset, 3.10) success
install-pkg (macOS-12, app, 3.7) success
install-pkg (macOS-12, app, 3.10) success
install-pkg (macOS-12, lite, 3.7) success
install-pkg (macOS-12, lite, 3.10) success
install-pkg (macOS-12, pytorch, 3.7) success
install-pkg (macOS-12, pytorch, 3.10) success
install-pkg (macOS-12, lightning, 3.7) success
install-pkg (macOS-12, lightning, 3.10) success
install-pkg (macOS-12, notset, 3.7) success
install-pkg (macOS-12, notset, 3.10) success
install-pkg (windows-2022, app, 3.7) success
install-pkg (windows-2022, app, 3.10) success
install-pkg (windows-2022, lite, 3.7) success
install-pkg (windows-2022, lite, 3.10) success
install-pkg (windows-2022, pytorch, 3.7) success
install-pkg (windows-2022, pytorch, 3.10) success
install-pkg (windows-2022, lightning, 3.7) success
install-pkg (windows-2022, lightning, 3.10) success
install-pkg (windows-2022, notset, 3.7) success
install-pkg (windows-2022, notset, 3.10) success

These checks are required after the changes to src/lightning_lite/accelerators/__init__.py, src/lightning_lite/accelerators/cuda.py, src/lightning_lite/utilities/device_parser.py, src/pytorch_lightning/accelerators/__init__.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/tuner/auto_gpu_select.py.


Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@Borda Borda requested a review from carmocca December 21, 2022 09:51
@mergify mergify bot added the ready PRs ready to be merged label Dec 21, 2022
Copy link
Member

@carmocca carmocca left a comment

Choose a reason for hiding this comment

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

A CUDA device is a GPU but a GPU might not be a CUDA device (e.g. MPS)

src/lightning_lite/accelerators/cuda.py Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Outdated Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Show resolved Hide resolved
src/lightning_lite/accelerators/cuda.py Show resolved Hide resolved
From the context, it should hopefully be clear that we are talking about nvidia cuda gpus
update error message


update
@awaelchli awaelchli force-pushed the refactor/deprecate-auto-select-gpus-2 branch from 0210d20 to 6500156 Compare December 22, 2022 05:23
@carmocca carmocca merged commit ca88f81 into master Dec 22, 2022
@carmocca carmocca deleted the refactor/deprecate-auto-select-gpus-2 branch December 22, 2022 16:44
carmocca added a commit that referenced this pull request Dec 22, 2022
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
carmocca added a commit that referenced this pull request Dec 22, 2022
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
carmocca added a commit that referenced this pull request Dec 22, 2022
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
accelerator: cuda Compute Unified Device Architecture GPU deprecation Includes a deprecation fun Staff contributions outside working hours - to differentiate from the "community" label pl Generic label for PyTorch Lightning package ready PRs ready to be merged trainer: argument
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RFC: Deprecate auto_select_gpus Trainer argument [RFC] Deprecate auto_select_gpus from Trainer constructor
4 participants