From c15d2c9edc1dbea3e3d5b5948bb2c5b0cc81eb88 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Fri, 16 Mar 2018 16:13:44 +0800
Subject: [PATCH] Update

---
 paddle/fluid/framework/parallel_executor.cc | 34 +++++++++++++--------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/paddle/fluid/framework/parallel_executor.cc b/paddle/fluid/framework/parallel_executor.cc
index 215ee38ac..996273c72 100644
--- a/paddle/fluid/framework/parallel_executor.cc
+++ b/paddle/fluid/framework/parallel_executor.cc
@@ -171,27 +171,28 @@ class ParallelExecutorPrivate {
       return boost::get<platform::CUDAPlace>(ctx_->GetPlace()).device;
     }
 
-    static void InitNCCLContext(std::map<int, NCCLContext> &contexts) {
+    static void InitNCCLContext(std::unordered_map<int, NCCLContext> &contexts,
+                                const std::vector<platform::Place> &places) {
       std::vector<ncclComm_t> comms;
       std::vector<int> devs;
       comms.resize(contexts.size());
       devs.reserve(contexts.size());
 
-      for (auto &ctx : contexts) {
-        devs.push_back(ctx.first);
+      for (auto &p : places) {
+        devs.push_back(boost::get<platform::CUDAPlace>(p).device);
       }
 
       NCCL_INVOKE(platform::dynload::ncclCommInitAll(
           &comms[0], static_cast<int>(contexts.size()), &devs[0]));
 
       int i = 0;
-      for (auto &ctx : contexts) {
-        ctx.second.comm = comms[i++];
+      for (auto &dev_id : devs) {
+        contexts.at(dev_id).comm = comms[i++];
       }
     }
   };
 
-  std::map<int, NCCLContext> communication_streams_;
+  std::unordered_map<int, NCCLContext> communication_streams_;
 
   NCCLContext &GetNCCLCtx(platform::Place p) {
     int dev_id = boost::get<platform::CUDAPlace>(p).device;
@@ -493,13 +494,20 @@ void ParallelExecutor::BCastParamsToGPUs(
 
       platform::dynload::ncclGroupStart();
 
-      for (auto &place : member_->places_) {
-        auto local_scope = member_->local_scopes_[place];
-        auto *t = local_scope->Var(var_desc->Name())->GetMutable<LoDTensor>();
-        t->Resize(dims);
+      for (size_t i = 0; i < member_->places_.size(); ++i) {
+        auto place = member_->places_[i];
+        void *buffer;
+        if (i == 0) {
+          buffer = const_cast<void *>(main_tensor.data<void>());
+        } else {
+          auto local_scope = member_->local_scopes_[place];
+          auto *t = local_scope->Var(var_desc->Name())->GetMutable<LoDTensor>();
+          t->Resize(dims);
+          buffer = t->mutable_data(place, main_tensor.type());
+        }
+
         auto &nccl_ctx = member_->GetNCCLCtx(place);
-        platform::dynload::ncclBcast(t->mutable_data(place, main_tensor.type()),
-                                     numel, data_type, 0, nccl_ctx.comm,
+        platform::dynload::ncclBcast(buffer, numel, data_type, 0, nccl_ctx.comm,
                                      nccl_ctx.stream());
       }
       platform::dynload::ncclGroupEnd();
@@ -533,7 +541,7 @@ void ParallelExecutor::BuildNCCLCommunicator() const {
   }
 
   ParallelExecutorPrivate::NCCLContext::InitNCCLContext(
-      member_->communication_streams_);
+      member_->communication_streams_, member_->places_);
 #endif
 }
 
-- 
GitLab