From a7b0d5bd26c03cc79deb1c36e061b91fafdd9897 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Sat, 24 Mar 2018 14:23:03 +0800
Subject: [PATCH] Clean code

---
 paddle/fluid/framework/parallel_executor.cc | 19 ++++++++-----------
 paddle/fluid/framework/parallel_executor.h  |  4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/paddle/fluid/framework/parallel_executor.cc b/paddle/fluid/framework/parallel_executor.cc
index 78963fd56..dc17f6a21 100644
--- a/paddle/fluid/framework/parallel_executor.cc
+++ b/paddle/fluid/framework/parallel_executor.cc
@@ -27,15 +27,16 @@ namespace framework {
 class ParallelExecutorPrivate {
  public:
   explicit ParallelExecutorPrivate(const std::vector<platform::Place> &places)
-      : places_(places), fetch_dev_ctxs_(places) {}
+      : places_(places) {}
 
   std::vector<platform::Place> places_;
-  platform::DeviceContextPool fetch_dev_ctxs_;
   std::vector<Scope *> local_scopes_;
   Scope *global_scope_;
+  std::unique_ptr<details::SSAGraphExecutor> executor_;
 
+#ifdef PADDLE_WITH_CUDA
   std::unique_ptr<platform::NCCLContextMap> nccl_ctxs_;
-  std::unique_ptr<details::SSAGraphExecutor> executor_;
+#endif
 };
 
 ParallelExecutor::ParallelExecutor(
@@ -54,8 +55,10 @@ ParallelExecutor::ParallelExecutor(
     member_->local_scopes_.push_back(&scope->NewScope());
   }
 
-  // Bcast Parameters to all GPUs
-  BuildNCCLCommunicator();
+// Bcast Parameters to all GPUs
+#ifdef PADDLE_WITH_CUDA
+  member_->nccl_ctxs_.reset(new platform::NCCLContextMap(member_->places_));
+#endif
   if (platform::is_gpu_place(places[0]) &&
       member_->local_scopes_.size() != 1) {  // Is CUDA
     BCastParamsToGPUs(startup_program);
@@ -123,12 +126,6 @@ void ParallelExecutor::BCastParamsToGPUs(
 #endif
 }
 
-void ParallelExecutor::BuildNCCLCommunicator() const {
-#ifdef PADDLE_WITH_CUDA
-  member_->nccl_ctxs_.reset(new platform::NCCLContextMap(member_->places_));
-#endif
-}
-
 void ParallelExecutor::Run(const std::vector<std::string> &fetch_tensors,
                            const std::string &fetched_var_name) {
   auto fetch_data = member_->executor_->Run(fetch_tensors);
diff --git a/paddle/fluid/framework/parallel_executor.h b/paddle/fluid/framework/parallel_executor.h
index 39a1c51b9..14489a18c 100644
--- a/paddle/fluid/framework/parallel_executor.h
+++ b/paddle/fluid/framework/parallel_executor.h
@@ -31,6 +31,8 @@ namespace framework {
 class ParallelExecutorPrivate;
 
 class ParallelExecutor {
+  DISABLE_COPY_AND_ASSIGN(ParallelExecutor);
+
  public:
   explicit ParallelExecutor(size_t num_threads,
                             const std::vector<platform::Place>& places,
@@ -46,8 +48,6 @@ class ParallelExecutor {
   ParallelExecutorPrivate* member_;
 
   void BCastParamsToGPUs(const ProgramDesc& startup_program) const;
-
-  void BuildNCCLCommunicator() const;
 };
 
 }  // namespace framework
-- 
GitLab