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

Let TorchCollective works on the torch.distributed WORLD process group by default #16995

Merged

Conversation

belerico
Copy link
Contributor

@belerico belerico commented Mar 8, 2023

What does this PR do?

With this PR TorchCollective works by default on the torch.distributed.group.WORLD process group, without the need to first create a new group.

Fixes #16922

Before submitting
  • Was this discussed/agreed 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:

Reviewer checklist
  • 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

@github-actions github-actions bot added the fabric lightning.fabric.Fabric label Mar 8, 2023
@codecov
Copy link

codecov bot commented Mar 8, 2023

Codecov Report

Merging #16995 (6a9fa30) into master (7bc2a65) will decrease coverage by 23%.
The diff coverage is 85%.

Additional details and impacted files
@@            Coverage Diff            @@
##           master   #16995     +/-   ##
=========================================
- Coverage      82%      59%    -23%     
=========================================
  Files         436      413     -23     
  Lines       31765    31486    -279     
=========================================
- Hits        26009    18687   -7322     
- Misses       5756    12799   +7043     

@belerico belerico changed the title Feature/torch collective default pg Let TorchCollective works on the torch.distributed WORLD process group by default Mar 8, 2023
@awaelchli awaelchli added feature Is an improvement or enhancement community This PR is from the community labels Mar 8, 2023
@awaelchli awaelchli added this to the 2.0 milestone Mar 8, 2023
@Borda Borda requested a review from carmocca March 9, 2023 23:50
@mergify mergify bot removed the has conflicts label Mar 13, 2023
@carmocca carmocca removed this from the 2.0 milestone Mar 13, 2023
@mergify mergify bot added the ready PRs ready to be merged label Mar 13, 2023
@carmocca carmocca added this to the 2.1 milestone Mar 13, 2023
@belerico
Copy link
Contributor Author

belerico commented Mar 15, 2023

I've seen also that from pytorch 2.0 the torch.distributed.distributed_c10d._pg_map should be called from the _world singleton. I don't know if TorchCollective needs to support something like that, if so one can just add the following

if _TORCH_GREATER_EQUAL_2_0:
    from torch.distributed.distributed_c10d import _world

    pg_map = _world.pg_map
else:
    pg_map = dist.distributed_c10d._pg_map

at the beginning and refers to pg_map where needed.
@carmocca @awaelchli, what do you think? I can update the PR in case it's needed

@awaelchli awaelchli enabled auto-merge (squash) March 17, 2023 10:15
@awaelchli awaelchli merged commit bb861cb into Lightning-AI:master Mar 20, 2023
Borda pushed a commit that referenced this pull request Mar 31, 2023
…oup by default (#16995)

Co-authored-by: Adrian Wälchli <[email protected]>
Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: Jirka Borovec <[email protected]>
(cherry picked from commit bb861cb)
Borda pushed a commit that referenced this pull request Mar 31, 2023
…oup by default (#16995)

Co-authored-by: Adrian Wälchli <[email protected]>
Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: Jirka Borovec <[email protected]>
(cherry picked from commit bb861cb)
lantiga pushed a commit that referenced this pull request Apr 3, 2023
…oup by default (#16995)

Co-authored-by: Adrian Wälchli <[email protected]>
Co-authored-by: Carlos Mocholí <[email protected]>
Co-authored-by: Jirka Borovec <[email protected]>
(cherry picked from commit bb861cb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community This PR is from the community fabric lightning.fabric.Fabric feature Is an improvement or enhancement ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Let TorchCollective work with default torch.distributed process group
4 participants