Avoid raising the sampler warning if num_replicas=1 #14097

rohitgr7 · 2022-08-08T18:23:37Z

What does this PR do?

Dont' raise a warning if devices=1 already and ddp is still used.

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

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing, make sure you have read the 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 @ninginthecloud @rohitgr7 @otaj @akihironitta

codecov · 2022-08-08T19:05:00Z

Codecov Report

Merging #14097 (91c5ced) into master (45a10a1) will decrease coverage by 3%.
The diff coverage is 100%.

❗ Current head 91c5ced differs from pull request most recent head 752c6d4. Consider uploading reports for the commit 752c6d4 to get more accurate results

@@            Coverage Diff             @@
##           master   #14097      +/-   ##
==========================================
- Coverage      79%      76%      -3%     
==========================================
  Files         106      326     +220     
  Lines        7066    26600   +19534     
==========================================
+ Hits         5592    20235   +14643     
- Misses       1474     6365    +4891

awaelchli · 2022-08-09T07:37:12Z

@rohitgr7 We used to fall back to single device when strategy="ddp" and devices=1. We wouldn't even cross this code path since no distributed sampler is required in this case. This must have been lost in the accelerator connector "refactor".

src/pytorch_lightning/trainer/connectors/data_connector.py

tests/tests_pytorch/trainer/connectors/test_data_connector.py

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

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

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

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

* update version and changelog for 1.7.2 release * Reset all results on epoch end (#14061) Co-authored-by: Carlos Mocholí <[email protected]> * Skip ddp fork tests on windows (#14121) * Fix device placement when `.cuda()` called without specifying index (#14128) * Convert subprocess test to standalone test (#14101) * Fix entry point test for Python 3.10 (#14154) * Fix flaky test caused by weak reference (#14157) * Fix saving hyperparameters in a composition where parent is not a LM or LDM (#14151) Co-authored-by: Rohit Gupta <[email protected]> * Remove DeepSpeed version restriction from Lite (#13967) * Configure the check-group app (#14165) Co-authored-by: Jirka <[email protected]> * Update onnxruntime requirement from <=1.12.0 to <1.13.0 in /requirements (#14083) Updates the requirements on [onnxruntime](https://github.com/microsoft/onnxruntime) to permit the latest version. - [Release notes](https://github.com/microsoft/onnxruntime/releases) - [Changelog](https://github.com/microsoft/onnxruntime/blob/master/docs/ReleaseManagement.md) - [Commits](microsoft/onnxruntime@v0.1.4...v1.12.1) --- updated-dependencies: - dependency-name: onnxruntime dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update gcsfs requirement from <2022.6.0,>=2021.5.0 to >=2021.5.0,<2022.8.0 in /requirements (#14079) Update gcsfs requirement in /requirements Updates the requirements on [gcsfs](https://github.com/fsspec/gcsfs) to permit the latest version. - [Release notes](https://github.com/fsspec/gcsfs/releases) - [Commits](fsspec/gcsfs@2021.05.0...2022.7.1) --- updated-dependencies: - dependency-name: gcsfs dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix a bug that caused spurious `AttributeError` when multiple `DataLoader` classes are imported (#14117) fix * CI: Replace `_` of in GHA workflow filenames with `-` (#13917) * Rename workflow files * Update docs * Fix azure badges * Update the main readme * bad rebase * Update doc * CI: Update Windows version from 2019 to 2022 (#14129) Update windows * CI/CD: Add CUDA version to docker image tags (#13831) * append cuda version to tags * revertme: push to hub * Update docker readme * Build base-conda-py3.9-torch1.12-cuda11.3.1 * Use new images in conda tests * revertme: push to hub * Revert "revertme: push to hub" This reverts commit 0f7d534. * Revert "revertme: push to hub" This reverts commit 46a05fc. * Run conda if workflow edited * Run gpu testing if workflow edited * Use new tags in release/Dockerfile * Build base-cuda and PL release images with all combinations * Update release docker * Update conda from py3.9-torch1.12 to py3.10-torch.1.12 * Fix ubuntu version * Revert conda * revertme: push to hub * Don't build Python 3.10 for now... * Fix pl release builder * updating version contribute to the error? docker/buildx#456 * Update actions' versions * Update slack user to notify * Don't use 11.6.0 to avoid bagua incompatibility * Don't use 11.1, and use 11.1.1 * Update .github/workflows/ci-pytorch_test-conda.yml Co-authored-by: Luca Medeiros <[email protected]> * Update trigger * Ignore artfacts from tutorials * Trim docker images to distribute * Add an image for tutorials * Update conda image 3.8x1.10 * Try different conda variants * No need to set cuda for conda jobs * Update who to notify ipu failure * Don't push * update filenaem Co-authored-by: Luca Medeiros <[email protected]> * Avoid entry_points deprecation warning (#14052) Co-authored-by: Adam J. Stewart <[email protected]> Co-authored-by: Akihiro Nitta <[email protected]> * Configure the check-group app (#14165) Co-authored-by: Jirka <[email protected]> * Profile batch transfer and gradient clipping hooks (#14069) Co-authored-by: Rohit Gupta <[email protected]> * Avoid false positive warning about using `sync_dist` when using torchmetrics (#14143) Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Rohit Gupta <[email protected]> * Avoid raising the sampler warning if num_replicas=1 (#14097) Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Rohit Gupta <[email protected]> Co-authored-by: otaj <[email protected]> * Remove skipping logic in favor of path filtering (#14170) * Support checkpoint save and load with Stochastic Weight Averaging (#9938) Co-authored-by: thomas chaton <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Adrian Wälchli <[email protected]> Co-authored-by: Carlos Mocholi <[email protected]> Co-authored-by: Kushashwa Ravi Shrimali <[email protected]> Co-authored-by: Jirka <[email protected]> Co-authored-by: Rohit Gupta <[email protected]> * Use fsdp module to initialize precision scalar for fsdp native (#14092) Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Laverne Henderson <[email protected]> Co-authored-by: Rohit Gupta <[email protected]> * add more issues types (#14174) * add more issues types * Update .github/ISSUE_TEMPLATE/config.yml Co-authored-by: Mansy <[email protected]> * typo Co-authored-by: Adrian Wälchli <[email protected]> Co-authored-by: Kaushik B <[email protected]> Co-authored-by: Mansy <[email protected]> Co-authored-by: Adrian Wälchli <[email protected]> Co-authored-by: Laverne Henderson <[email protected]> Co-authored-by: Akihiro Nitta <[email protected]> * CI: clean building docs (#14216) * CI: clean building docs * group * . * CI: docker focus on PL only (#14246) * CI: docker focus on PL only * group * Allowed setting attributes on `DataLoader` and `BatchSampler` when instantiated inside `*_dataloader` hooks (#14212) Co-authored-by: otaj <[email protected]> * Revert "Remove skipping logic in favor of path filtering (#14170)" (#14244) * Update defaults for WandbLogger's run name and project name (#14145) Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Rohit Gupta <[email protected]> Co-authored-by: Jirka <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Akihiro Nitta <[email protected]> Co-authored-by: Luca Medeiros <[email protected]> Co-authored-by: Adam J. Stewart <[email protected]> Co-authored-by: otaj <[email protected]> Co-authored-by: Adam Reeve <[email protected]> Co-authored-by: thomas chaton <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Kushashwa Ravi Shrimali <[email protected]> Co-authored-by: Laverne Henderson <[email protected]> Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Kaushik B <[email protected]> Co-authored-by: Mansy <[email protected]>

Avoid raising the sampler warning if num_replicas=1

0693f26

rohitgr7 added bug Something isn't working data handling Generic data-related topic labels Aug 8, 2022

rohitgr7 added this to the pl:1.7.x milestone Aug 8, 2022

rohitgr7 requested review from tchaton, carmocca, Borda, williamFalcon, awaelchli, justusschock and kaushikb11 as code owners August 8, 2022 18:23

chlog

5df8555

github-actions bot added the pl Generic label for PyTorch Lightning package label Aug 8, 2022

chlog

b261d41

mergify bot added the has conflicts label Aug 9, 2022

carmocca approved these changes Aug 9, 2022

View reviewed changes

src/pytorch_lightning/trainer/connectors/data_connector.py Outdated Show resolved Hide resolved

rohitgr7 self-assigned this Aug 9, 2022

awaelchli reviewed Aug 10, 2022

View reviewed changes

src/pytorch_lightning/trainer/connectors/data_connector.py Outdated Show resolved Hide resolved

tests/tests_pytorch/trainer/connectors/test_data_connector.py Outdated Show resolved Hide resolved

rohitgr7 and others added 3 commits August 10, 2022 14:22

update

64321c1

Update src/pytorch_lightning/trainer/connectors/data_connector.py

1d5713c

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

Merge branch 'master' into warn/dist_eval

73bfa64

rohitgr7 requested a review from awaelchli August 10, 2022 08:53

mergify bot removed the has conflicts label Aug 10, 2022

awaelchli approved these changes Aug 10, 2022

View reviewed changes

mergify bot added the ready PRs ready to be merged label Aug 10, 2022

otaj approved these changes Aug 10, 2022

View reviewed changes

Merge branch 'master' into warn/dist_eval

91c5ced

otaj enabled auto-merge (squash) August 10, 2022 12:50

mergify bot added has conflicts and removed ready PRs ready to be merged labels Aug 10, 2022

Merge branch 'master' into warn/dist_eval

4d810ef

mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Aug 10, 2022

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

2979a85

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

rohitgr7 requested a review from edenlightning as a code owner August 10, 2022 17:21

rohitgr7 and others added 2 commits August 10, 2022 22:53

rev

870e155

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

752c6d4

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

mergify bot added has conflicts and removed ready PRs ready to be merged labels Aug 11, 2022

Borda approved these changes Aug 12, 2022

View reviewed changes

Merge branch 'master' into warn/dist_eval

c1522c3

mergify bot added ready PRs ready to be merged and removed has conflicts ready PRs ready to be merged labels Aug 12, 2022

otaj merged commit c8e22b4 into master Aug 12, 2022

otaj deleted the warn/dist_eval branch August 12, 2022 08:44

awaelchli added a commit that referenced this pull request Aug 15, 2022

Avoid raising the sampler warning if num_replicas=1 (#14097)

6a78b2a

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

jessecambon pushed a commit to jessecambon/lightning that referenced this pull request Aug 16, 2022

Avoid raising the sampler warning if num_replicas=1 (Lightning-AI#14097)

58217d9

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid raising the sampler warning if num_replicas=1 #14097

Avoid raising the sampler warning if num_replicas=1 #14097

rohitgr7 commented Aug 8, 2022 •

edited by github-actions bot

Loading

codecov bot commented Aug 8, 2022 •

edited

Loading

awaelchli commented Aug 9, 2022

Avoid raising the sampler warning if num_replicas=1 #14097

Avoid raising the sampler warning if num_replicas=1 #14097

Conversation

rohitgr7 commented Aug 8, 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?

codecov bot commented Aug 8, 2022 • edited Loading

Codecov Report

awaelchli commented Aug 9, 2022

rohitgr7 commented Aug 8, 2022 •

edited by github-actions bot

Loading

codecov bot commented Aug 8, 2022 •

edited

Loading