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

Jump to bottom

Have FutureNCCL record streams w/ allocator in addCallback #48496

Closed
wants to merge 8 commits into from
Closed

Have FutureNCCL record streams w/ allocator in addCallback #48496

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
657699b
Have FutureNCCL record streams w/ allocator in addCallback
lw Nov 26, 2020
5239ed8
Update on "Have FutureNCCL record streams w/ allocator in addCallback"
lw Nov 27, 2020
b479dae
Update on "Have FutureNCCL record streams w/ allocator in addCallback"
lw Nov 29, 2020
df6b171
Update on "Have FutureNCCL record streams w/ allocator in addCallback"
lw Nov 29, 2020
bddfb53
Update on "Have FutureNCCL record streams w/ allocator in addCallback"
lw Dec 3, 2020
7571f92
Update on "Have FutureNCCL record streams w/ allocator in addCallback"
lw Dec 4, 2020
5e72780
Update on "Have FutureNCCL record streams w/ allocator in addCallback"
lw Dec 8, 2020
b4bd461
Update on "Have FutureNCCL record streams w/ allocator in addCallback"
lw Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions torch/lib/c10d/ProcessGroupNCCL.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,15 @@ class ProcessGroupNCCL : public ProcessGroup {
// this callback. This new FutureNCCL's cudaEvents will record the
// callback's stream and will have the result value of the callback.
void addCallback(std::function<void(void)> callback) override {
// Do not free the underlying data storage of value_ before its
// usage on futureNCCLCallbackStream_ finish.
for (const at::DataPtr& data_ptr : extractDataPtrs(value_)) {
c10::cuda::CUDACachingAllocator::recordStream(
data_ptr, *futureNCCLCallbackStream_);
}

(*cudaEvents_)[0].block(*futureNCCLCallbackStream_);
// Use the dedicated callback stream to run callback.
c10::OptionalStreamGuard streamGuard{
c10::Stream(*futureNCCLCallbackStream_)};
callback();
Expand All @@ -312,14 +320,6 @@ class ProcessGroupNCCL : public ProcessGroup {
auto fut = c10::make_intrusive<FutureNCCL>(
deviceIndex_, thenFutCudaEvents, futureNCCLCallbackStream_);

// Do not free the underlying data storage of value_ before its
// usage on futureNCCLCallbackStream_ finish.
for (const at::DataPtr& data_ptr : extractDataPtrs(value_)) {
c10::cuda::CUDACachingAllocator::recordStream(
data_ptr, *futureNCCLCallbackStream_);
}

// Use the dedicated callback stream to run callback.
// Cannot move capture std::function in lambda, because it cannot deduce
// the template type for std::function. Hence use std::bind to explicitly
// specify types.
Expand Down