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.

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

[Bugfix] Fix Disco-CUDAGraph Integration #15870

Merged
merged 1 commit into from
Oct 5, 2023
+15 −2
Merged

[Bugfix] Fix Disco-CUDAGraph Integration #15870

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/runtime/disco/nccl/nccl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,19 @@ struct CCLThreadLocalContext {
deviceStream_t default_stream = nullptr;
ncclComm_t comm;

void Clear() { NCCL_CALL(ncclCommDestroy(comm)); }
void Clear() {
NCCL_CALL(ncclCommDestroy(comm));
if (default_stream != nullptr) {
Copy link
Contributor

Choose a reason for hiding this comment

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

IIUC, default_stream is always nullptr

Copy link
Member

Choose a reason for hiding this comment

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

given in this case default_stream is a member that can be changed later, i think having such code is better. Note it is not the same as the default stream in the CUDA terminology, but in the nccl runtime

StreamDestroy(default_stream);
}
}

deviceStream_t GetDefaultStream() { return nullptr; }
deviceStream_t GetDefaultStream() {
const auto* func = tvm::runtime::Registry::Get("runtime.get_" TVM_DISCO_DEVICE_NAME "_stream");
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see any stream initialization in this file , so I'm confused what this function returns

Copy link
Member Author

Choose a reason for hiding this comment

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

it's initialized in cudagraph

ICHECK(func != nullptr);
deviceStream_t stream = static_cast<deviceStream_t>((*func)().operator void*());
return stream == nullptr ? default_stream : stream;
}

static CCLThreadLocalContext* Get() {
thread_local static CCLThreadLocalContext ctx;
Expand Down Expand Up @@ -171,6 +181,9 @@ void InitCCLPerWorker(ShapeTuple device_ids, std::string unique_id_bytes) {
// Step up local context of NCCL
int device_id = device_ids[worker->worker_id];
SetDevice(device_id);
#if TVM_NCCL_RCCL_SWITCH == 0
StreamCreate(&ctx->default_stream);
#endif
Device device{TVM_DISCO_DEVICE_TYPE, device_id};
worker->default_device = device;
worker->ccl = TVM_DISCO_CCL_NAME;
Expand Down
Loading