From 676dfd18754012fc14b7db29a9884d30b88a2894 Mon Sep 17 00:00:00 2001
From: chengduoZH <zhaochengduo@163.com>
Date: Mon, 7 May 2018 20:32:19 +0800
Subject: [PATCH] follow comments

---
 paddle/fluid/framework/details/fetch_op_handle.cc        | 9 +++------
 .../fluid/framework/details/nccl_all_reduce_op_handle.cc | 4 +++-
 paddle/fluid/framework/details/send_op_handle.cc         | 4 +++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/paddle/fluid/framework/details/fetch_op_handle.cc b/paddle/fluid/framework/details/fetch_op_handle.cc
index 88c7caadb79..a3cae8c64cd 100644
--- a/paddle/fluid/framework/details/fetch_op_handle.cc
+++ b/paddle/fluid/framework/details/fetch_op_handle.cc
@@ -49,7 +49,9 @@ void FetchOpHandle::RunImpl() {
       platform::DeviceContextPool::Instance().Get(platform::CPUPlace());
   for (auto *input : inputs_) {
     auto *var = static_cast<VarHandle *>(input);
-    if (var->generated_op_) var->generated_op_->Wait(cpu_ctx);
+    if (var->generated_op_) {
+      var->generated_op_->Wait(cpu_ctx);
+    }
   }
   tensors_.resize(inputs_.size());
   auto *var_handle = static_cast<VarHandle *>(inputs_[0]);
@@ -61,14 +63,9 @@ void FetchOpHandle::RunImpl() {
     auto &scope = scopes[i];
     auto *var =
         scope->FindVar(kLocalExecScopeName)->Get<Scope *>()->FindVar(var_name);
-    if (var == nullptr) {
-      scope->FindVar(var_name);
-    }
-
     PADDLE_ENFORCE_NOT_NULL(var, "Cannot find variable %s in execution scope",
                             var_name);
     auto &t = var->Get<framework::LoDTensor>();
-
     if (platform::is_gpu_place(t.place())) {
 #ifdef PADDLE_WITH_CUDA
       TensorCopySync(t, cpu, &tensors_[i]);
diff --git a/paddle/fluid/framework/details/nccl_all_reduce_op_handle.cc b/paddle/fluid/framework/details/nccl_all_reduce_op_handle.cc
index e568174957c..16aa5d067ab 100644
--- a/paddle/fluid/framework/details/nccl_all_reduce_op_handle.cc
+++ b/paddle/fluid/framework/details/nccl_all_reduce_op_handle.cc
@@ -36,7 +36,9 @@ void NCCLAllReduceOpHandle::RunImpl() {
     // Wait input done
     for (auto *in : inputs_) {
       auto &p = static_cast<VarHandle *>(in)->place_;
-      if (in->generated_op_) in->generated_op_->Wait(dev_ctxes_[p]);
+      if (in->generated_op_) {
+        in->generated_op_->Wait(dev_ctxes_[p]);
+      }
     }
 
     auto &var_name = static_cast<VarHandle *>(this->inputs_[0])->name_;
diff --git a/paddle/fluid/framework/details/send_op_handle.cc b/paddle/fluid/framework/details/send_op_handle.cc
index 797d795d3d7..bd97c5260db 100644
--- a/paddle/fluid/framework/details/send_op_handle.cc
+++ b/paddle/fluid/framework/details/send_op_handle.cc
@@ -32,7 +32,9 @@ void SendOpHandle::RunImpl() {
     if (in->DebugString() == "dummy") {  // HACK
       continue;
     }
-    if (in->generated_op_) in->generated_op_->Wait(dev_ctxes_[p]);
+    if (in->generated_op_) {
+      in->generated_op_->Wait(dev_ctxes_[p]);
+    }
   }
   auto &tmp_scope = local_scope_->FindVar(kLocalExecScopeName)->Get<Scope *>();
   // FIXME(wuyi): can not use RunAndRecordEvent here, for it will cause dead
-- 
GitLab