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

fix issue 3264 #3267

Merged
merged 1 commit into from
Nov 11, 2021
Merged

fix issue 3264 #3267

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions horovod/common/operations.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,6 +1399,9 @@ EnqueueTensorAllreduces(std::vector<std::shared_ptr<OpContext>>& contexts,
return Status::InvalidArgument("Allreduce: Process set provided does not "
"exist, or has not been registered.");
}
if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
auto& process_set = horovod_global.process_set_table.Get(process_set_id);
Status status;

Expand Down Expand Up @@ -1503,9 +1506,6 @@ EnqueueTensorAllreduces(std::vector<std::shared_ptr<OpContext>>& contexts,
}
}

if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
status = process_set.tensor_queue.AddToTensorQueueMulti(entries, messages);

return status;
Expand All @@ -1527,6 +1527,9 @@ Status EnqueueTensorAllgather(std::shared_ptr<OpContext> context,
return Status::InvalidArgument("Allgather: Process set provided does not "
"exist, or has not been registered.");
}
if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
auto& process_set = horovod_global.process_set_table.Get(process_set_id);

if (!process_set.IsCurrentProcessIncluded()) {
Expand Down Expand Up @@ -1556,9 +1559,6 @@ Status EnqueueTensorAllgather(std::shared_ptr<OpContext> context,
e.callback = callback;
e.nvtx_op_range.Start(RegisteredNvtxOp::HorovodAllgather, e.tensor->size());

if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
Status status = process_set.tensor_queue.AddToTensorQueue(e, message);
if (status.ok()) {
LOG(TRACE, horovod_global.global_controller->GetRank())
Expand All @@ -1584,6 +1584,9 @@ Status EnqueueTensorBroadcast(std::shared_ptr<OpContext> context,
return Status::InvalidArgument("Broadcast: Process set provided does not "
"exist, or has not been registered.");
}
if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
auto& process_set = horovod_global.process_set_table.Get(process_set_id);

int root_rank_in_process_set;
Expand Down Expand Up @@ -1626,9 +1629,6 @@ Status EnqueueTensorBroadcast(std::shared_ptr<OpContext> context,
" is not a member of the provided process set.");
}

if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
Status status = process_set.tensor_queue.AddToTensorQueue(e, message);
if (status.ok()) {
LOG(TRACE, horovod_global.global_controller->GetRank())
Expand All @@ -1654,6 +1654,9 @@ Status EnqueueTensorAlltoall(std::shared_ptr<OpContext> context,
return Status::InvalidArgument("Alltoall: Process set provided does not "
"exist, or has not been registered.");
}
if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
auto& process_set = horovod_global.process_set_table.Get(process_set_id);

// Check arguments
Expand Down Expand Up @@ -1713,9 +1716,6 @@ Status EnqueueTensorAlltoall(std::shared_ptr<OpContext> context,
"Number of entries in splits does not equal number of workers.");
}

if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
Status status = process_set.tensor_queue.AddToTensorQueue(e, message);
if (status.ok()) {
LOG(TRACE, horovod_global.global_controller->GetRank())
Expand All @@ -1731,6 +1731,9 @@ Status EnqueueJoin(std::shared_ptr<OpContext> context,
ReadyEventList ready_event_list, const std::string& name,
const int device, StatusCallback callback,
int32_t process_set_id) {
if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
auto& process_set = horovod_global.process_set_table.Get(process_set_id);

Request message;
Expand All @@ -1747,9 +1750,6 @@ Status EnqueueJoin(std::shared_ptr<OpContext> context,
e.device = device;
e.callback = callback;

if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
Status status = process_set.tensor_queue.AddToTensorQueue(e, message);
if (status.ok()) {
LOG(TRACE, horovod_global.global_controller->GetRank())
Expand All @@ -1761,6 +1761,9 @@ Status EnqueueJoin(std::shared_ptr<OpContext> context,
// Contexts and controller must be initialized and the background thread
// must be running before this function is called.
Status EnqueueBarrier(StatusCallback callback, int32_t process_set_id) {
if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
auto& process_set = horovod_global.process_set_table.Get(process_set_id);

if (!process_set.IsCurrentProcessIncluded()) {
Expand All @@ -1782,9 +1785,6 @@ Status EnqueueBarrier(StatusCallback callback, int32_t process_set_id) {
e.process_set_id = process_set_id;
e.callback = callback;

if (horovod_global.shut_down) {
return SHUT_DOWN_ERROR;
}
Status status = process_set.tensor_queue.AddToTensorQueue(e, message);
if (status.ok()) {
LOG(TRACE, horovod_global.global_controller->GetRank())
Expand Down