Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into colsplit-gpu-quan…
Browse files Browse the repository at this point in the history
…tile-cat
  • Loading branch information
rongou committed Sep 20, 2023
2 parents 69daaf3 + 0080c97 commit 3915bbb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rabit/src/allreduce_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ AllreduceBase::TryAllreduceTree(void *sendrecvbuf_,
break;
}
// select must return
auto poll_res = watcher.Poll(timeout_sec);
auto poll_res = watcher.Poll(timeout_sec, false); // fail on macos
if (!poll_res.OK()) {
LOG(FATAL) << poll_res.Report();
}
Expand Down Expand Up @@ -814,7 +814,7 @@ AllreduceBase::TryAllgatherRing(void *sendrecvbuf_, size_t total_size,
break;
}

auto poll_res = watcher.Poll(timeout_sec);
auto poll_res = watcher.Poll(timeout_sec, false); // fail on macos
if (!poll_res.OK()) {
LOG(FATAL) << poll_res.Report();
}
Expand Down Expand Up @@ -919,7 +919,7 @@ AllreduceBase::TryReduceScatterRing(void *sendrecvbuf_,
if (finished) {
break;
}
auto poll_res = watcher.Poll(timeout_sec);
auto poll_res = watcher.Poll(timeout_sec, false); // fail on macos
if (!poll_res.OK()) {
LOG(FATAL) << poll_res.Report();
}
Expand Down

0 comments on commit 3915bbb

Please sign in to comment.