Skip to content

Fix test_barrier hang by using static global rank in ProcessGroupXCCL #2036

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix test_barrier hang by using static global rank in ProcessGroupXCCL #2036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60e57f8
Fix test_barrier hang using static global rank
frost-intel Sep 12, 2025
ea1953c
Merge branch 'main' into frost/barrier_hang_fix
frost-intel Sep 19, 2025
e181005
Merge branch 'main' into frost/barrier_hang_fix
frost-intel Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/xccl/ProcessGroupXCCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,11 @@ const std::string& ProcessGroupXCCL::logPrefix() const {
return logPrefix_;
}

const int& ProcessGroupXCCL::globalRank() const {
static int globalRank = rank_;
return globalRank;
}

ProcessGroupXCCL::ProcessGroupXCCL(
const c10::intrusive_ptr<Store>& store,
int rank,
Expand Down Expand Up @@ -377,7 +382,7 @@ ProcessGroupXCCL::ProcessGroupXCCL(
std::string torch_distributed_debug =
getCvarString({"TORCH_DISTRIBUTED_DEBUG"}, OFF.c_str());
LOG(INFO) << logPrefix() << "ProcessGroupXCCL initialization options: "
<< "size: " << size << ", global rank: " << rank_;
<< "size: " << size << ", global rank: " << globalRank();

LOG(INFO) << logPrefix() << "ProcessGroupXCCL environments: "
<< "XCCL version: " << XcclVersion
Expand Down Expand Up @@ -405,7 +410,7 @@ bool ProcessGroupXCCL::dumpDebuggingInfo(bool includeStackTrace /*=true*/) {
if (traceBufferSize_ > 0) {
// TODO: dump_xccl_trace
auto xcclTrace = dump_xccl_trace(true, includeStackTrace, false);
DebugInfoWriter& writer = DebugInfoWriter::getWriter(rank_);
DebugInfoWriter& writer = DebugInfoWriter::getWriter(globalRank());
LOG(INFO) << logPrefix() << "ProcessGroupXCCL dumping xccl trace to "
<< writer.getWriterTarget();
writer.write(xcclTrace);
Expand Down Expand Up @@ -2020,7 +2025,7 @@ c10::DeviceIndex ProcessGroupXCCL::guessDeviceId() const {
return *usedDeviceIdxs_.begin();
}
int devIdx =
static_cast<int16_t>(rank_ % at::detail::getXPUHooks().getNumGPUs());
static_cast<int16_t>(globalRank() % at::detail::getXPUHooks().getNumGPUs());
LOG(WARNING)
<< logPrefix()
<< c10::str(
Expand Down
1 change: 1 addition & 0 deletions src/xccl/ProcessGroupXCCL.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ class TORCH_API ProcessGroupXCCL : public Backend {
c10::DeviceIndex guessDeviceId() const;

const std::vector<uint64_t>& groupRanks() const;
const int& globalRank() const;
void setEnqueuedPgStatus(c10::intrusive_ptr<ProcessGroupXCCL::WorkXCCL> work);
void setCompletedPgStatus(
c10::intrusive_ptr<ProcessGroupXCCL::WorkXCCL> work);
Expand Down
Loading