Remove legacy device arguments in Trainer #16171

awaelchli · 2022-12-22T04:46:53Z

What does this PR do?

Removes

Trainer(gpus=...)
Trainer(tpu_cores=...)
Trainer(ipus=...)

The new way since 1.5 is

Trainer(devices=...)

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

Yes

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

for more information, see https://pre-commit.ci

…' into lite/debug-remove-legacy-devices

github-actions · 2022-12-22T04:56:50Z

⚡ 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_fabric/accelerators/tpu.py, src/pytorch_lightning/accelerators/tpu.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/utilities/argparse.py, src/pytorch_lightning/utilities/device_parser.py, tests/tests_pytorch/accelerators/test_ipu.py, tests/tests_pytorch/accelerators/test_tpu.py, tests/tests_pytorch/deprecated_api/test_remove_2-0.py, tests/tests_pytorch/models/test_gpu.py, tests/tests_pytorch/models/test_tpu.py, tests/tests_pytorch/trainer/connectors/test_accelerator_connector.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/trainer/test_trainer_cli.py, tests/tests_pytorch/utilities/test_argparse.py.

🟢 pytorch_lightning: Azure GPU

Check ID	Status
pytorch-lightning (GPUs)	success	✅

These checks are required after the changes to src/pytorch_lightning/accelerators/tpu.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/utilities/argparse.py, src/pytorch_lightning/utilities/device_parser.py, tests/tests_pytorch/accelerators/test_ipu.py, tests/tests_pytorch/accelerators/test_tpu.py, tests/tests_pytorch/deprecated_api/test_remove_2-0.py, tests/tests_pytorch/models/test_gpu.py, tests/tests_pytorch/models/test_tpu.py, tests/tests_pytorch/trainer/connectors/test_accelerator_connector.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/trainer/test_trainer_cli.py, tests/tests_pytorch/utilities/test_argparse.py, src/lightning_fabric/accelerators/tpu.py.

🟢 pytorch_lightning: Azure HPU

Check ID	Status
pytorch-lightning (HPUs)	success	✅

These checks are required after the changes to src/lightning_fabric/accelerators/tpu.py, src/pytorch_lightning/accelerators/tpu.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/utilities/argparse.py, src/pytorch_lightning/utilities/device_parser.py, tests/tests_pytorch/accelerators/test_ipu.py, tests/tests_pytorch/accelerators/test_tpu.py, tests/tests_pytorch/deprecated_api/test_remove_2-0.py, tests/tests_pytorch/models/test_gpu.py, tests/tests_pytorch/models/test_tpu.py, tests/tests_pytorch/trainer/connectors/test_accelerator_connector.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/trainer/test_trainer_cli.py, tests/tests_pytorch/utilities/test_argparse.py.

🟢 pytorch_lightning: Azure IPU

Check ID	Status
pytorch-lightning (IPUs)	success	✅

These checks are required after the changes to src/lightning_fabric/accelerators/tpu.py, src/pytorch_lightning/accelerators/tpu.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/utilities/argparse.py, src/pytorch_lightning/utilities/device_parser.py, tests/tests_pytorch/accelerators/test_ipu.py, tests/tests_pytorch/accelerators/test_tpu.py, tests/tests_pytorch/deprecated_api/test_remove_2-0.py, tests/tests_pytorch/models/test_gpu.py, tests/tests_pytorch/models/test_tpu.py, tests/tests_pytorch/trainer/connectors/test_accelerator_connector.py, tests/tests_pytorch/trainer/properties/test_auto_gpu_select.py, tests/tests_pytorch/trainer/test_trainer.py, tests/tests_pytorch/trainer/test_trainer_cli.py, tests/tests_pytorch/utilities/test_argparse.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/tpu.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/utilities/argparse.py, src/pytorch_lightning/utilities/device_parser.py, docs/source-pytorch/common/trainer.rst.

🟢 lightning_fabric: CPU workflow

Check ID	Status
fabric-cpu (macOS-11, fabric, 3.8, 1.11)	success	✅
fabric-cpu (macOS-11, fabric, 3.9, 1.12)	success	✅
fabric-cpu (macOS-11, fabric, 3.10, 1.13)	success	✅
fabric-cpu (macOS-11, fabric, 3.7, 1.10, oldest)	success	✅
fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.10)	success	✅
fabric-cpu (ubuntu-20.04, fabric, 3.9, 1.11)	success	✅
fabric-cpu (ubuntu-20.04, fabric, 3.10, 1.12)	success	✅
fabric-cpu (ubuntu-20.04, fabric, 3.10, 1.13)	success	✅
fabric-cpu (ubuntu-20.04, fabric, 3.7, 1.10, oldest)	success	✅
fabric-cpu (windows-2022, fabric, 3.9, 1.11)	success	✅
fabric-cpu (windows-2022, fabric, 3.10, 1.12)	success	✅
fabric-cpu (windows-2022, fabric, 3.10, 1.13)	success	✅
fabric-cpu (windows-2022, fabric, 3.7, 1.10, oldest)	success	✅
fabric-cpu (macOS-11, lightning, 3.8, 1.13)	success	✅
fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13)	success	✅
fabric-cpu (windows-2022, lightning, 3.8, 1.13)	success	✅

These checks are required after the changes to src/lightning_fabric/accelerators/tpu.py.

🟢 lightning_fabric: Azure GPU

Check ID	Status
lightning-fabric (GPUs)	success	✅

These checks are required after the changes to src/lightning_fabric/accelerators/tpu.py.

🟢 mypy

Check ID	Status
mypy	success	✅

These checks are required after the changes to src/lightning_fabric/accelerators/tpu.py, src/pytorch_lightning/accelerators/tpu.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/utilities/argparse.py, src/pytorch_lightning/utilities/device_parser.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, fabric, 3.7)	success	✅
install-pkg (ubuntu-22.04, fabric, 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, fabric, 3.7)	success	✅
install-pkg (macOS-12, fabric, 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, fabric, 3.7)	success	✅
install-pkg (windows-2022, fabric, 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_fabric/accelerators/tpu.py, src/pytorch_lightning/accelerators/tpu.py, src/pytorch_lightning/trainer/connectors/accelerator_connector.py, src/pytorch_lightning/trainer/trainer.py, src/pytorch_lightning/utilities/argparse.py, src/pytorch_lightning/utilities/device_parser.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.

src/pytorch_lightning/trainer/trainer.py

tests/tests_pytorch/models/test_tpu.py

Co-authored-by: Carlos Mocholí <[email protected]>

awaelchli added 4 commits December 21, 2022 23:32

Remove legacy device Trainer arguments

70b0d93

tests

ba3e24c

revert

021a2c9

update tests

ef1caa1

awaelchli changed the base branch from master to lite/debug December 22, 2022 04:47

revert

6fe5bfe

github-actions bot added the pl Generic label for PyTorch Lightning package label Dec 22, 2022

awaelchli and others added 4 commits December 22, 2022 05:49

rename

5f9d3e6

[pre-commit.ci] auto fixes from pre-commit.com hooks

06c9afb

for more information, see https://pre-commit.ci

changelog

985cefb

Merge remote-tracking branch 'origin/lite/debug-remove-legacy-devices…

5aadee1

…' into lite/debug-remove-legacy-devices

awaelchli added the fun Staff contributions outside working hours - to differentiate from the "community" label label Dec 22, 2022

awaelchli marked this pull request as ready for review December 22, 2022 04:56

awaelchli requested review from williamFalcon, tchaton, carmocca, justusschock, edenlightning and Borda as code owners December 22, 2022 04:56

awaelchli added 5 commits December 22, 2022 07:48

tpu_cores -> devices

efe55a2

test fixes

b6d3a35

fix test

555530a

test fixes

63d4389

mypy

163a586

Borda approved these changes Dec 22, 2022

View reviewed changes

carmocca approved these changes Dec 22, 2022

View reviewed changes

src/pytorch_lightning/trainer/trainer.py Show resolved Hide resolved

mergify bot added the ready PRs ready to be merged label Dec 22, 2022

carmocca reviewed Dec 22, 2022

View reviewed changes

tests/tests_pytorch/models/test_tpu.py Outdated Show resolved Hide resolved

justusschock approved these changes Dec 22, 2022

View reviewed changes

fix

7531e7c

awaelchli enabled auto-merge (squash) December 22, 2022 20:09

awaelchli merged commit 732fdf9 into lite/debug Dec 22, 2022

awaelchli deleted the lite/debug-remove-legacy-devices branch December 22, 2022 20:14

awaelchli mentioned this pull request Dec 22, 2022

Explicitly mark the devices default in Trainer #16182

Closed

12 tasks

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

406312d

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

25c987d

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

3232354

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

99247c9

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

3137842

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

47b6852

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

6c6b950

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

def04b9

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

1787777

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

c168b42

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

8630872

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

79dbefc

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

2014690

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

2f58649

carmocca pushed a commit that referenced this pull request Jan 4, 2023

Remove legacy device arguments in Trainer (#16171)

fe92aab

carmocca added a commit that referenced this pull request Jan 11, 2023

Remove the deprecated Trainer device arguments (#16171)

7b4f159

carmocca added a commit that referenced this pull request Jan 17, 2023

Remove the deprecated Trainer device arguments (#16171)

d1bca0c

carmocca added a commit that referenced this pull request Jan 17, 2023

Remove the deprecated Trainer device arguments (#16171)

1c50c74

carmocca added a commit that referenced this pull request Jan 17, 2023

Remove the deprecated Trainer device arguments (#16171)

b21ae20

Borda pushed a commit that referenced this pull request Jan 18, 2023

Remove the deprecated Trainer device arguments (#16171)

bf55ea6

carmocca added this to the 2.0 milestone Jan 19, 2023

carmocca added a commit that referenced this pull request Jan 19, 2023

Remove the deprecated Trainer device arguments (#16171)

4936c76

carmocca added a commit that referenced this pull request Jan 19, 2023

Remove the deprecated Trainer device arguments (#16171)

5ed787c

Co-authored-by: Carlos Mocholí <[email protected]>

carmocca added a commit that referenced this pull request Jan 19, 2023

Remove the deprecated Trainer device arguments (#16171)

a8e9d62

Co-authored-by: Carlos Mocholí <[email protected]>

lantiga pushed a commit that referenced this pull request Jan 19, 2023

Remove the deprecated Trainer device arguments (#16171)

44e8f6a

Co-authored-by: Carlos Mocholí <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove legacy device arguments in Trainer #16171

Remove legacy device arguments in Trainer #16171

awaelchli commented Dec 22, 2022 •

edited by github-actions bot

Loading

github-actions bot commented Dec 22, 2022 •

edited

Loading

Remove legacy device arguments in Trainer #16171

Remove legacy device arguments in Trainer #16171

Conversation

awaelchli commented Dec 22, 2022 • edited by github-actions bot Loading

What does this PR do?

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

Before submitting

PR review

Did you have fun?

github-actions bot commented Dec 22, 2022 • edited Loading

⚡ Required checks status: All passing 🟢

Groups summary

awaelchli commented Dec 22, 2022 •

edited by github-actions bot

Loading

github-actions bot commented Dec 22, 2022 •

edited

Loading