Fix crash when pairing an odd number of devices without P2P (BVLC/git…

…hub issue BVLC#3531,BVLC#3586)
dllehr81 · May 13, 2016 · 1c99519 · 1c99519
1 parent 38651f2
commit 1c99519
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/caffe/parallel.cpp b/src/caffe/parallel.cpp
@@ -185,9 +185,8 @@ void DevicePair::compute(const vector<int> devices, vector<DevicePair>* pairs) {
   DLOG(INFO) << "GPUs paired by P2P access, remaining: " << s.str();
 
   // Group remaining
-  remaining_depth = ceil(log2(remaining.size()));
-  for (int d = 0; d < remaining_depth; ++d) {
-    for (int i = 0; i < remaining.size(); ++i) {
+  while (remaining.size() > 1) {
+    for (int i = 0; i+1 < remaining.size(); ++i) {
       pairs->push_back(DevicePair(remaining[i], remaining[i + 1]));
       DLOG(INFO) << "Remaining pair: " << remaining[i] << ":"
                  << remaining[i + 1];