From 580f55fa0f73c7d418e92672253708c648599710 Mon Sep 17 00:00:00 2001
From: Yancey1989 <yancey1989@gmail.com>
Date: Mon, 10 Sep 2018 10:38:07 +0800
Subject: [PATCH] update by comment

---
 paddle/fluid/operators/listen_and_serv_op.cc | 9 +++++----
 paddle/fluid/operators/listen_and_serv_op.h  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/paddle/fluid/operators/listen_and_serv_op.cc b/paddle/fluid/operators/listen_and_serv_op.cc
index 1933e6a5d0..abbb3d06d1 100644
--- a/paddle/fluid/operators/listen_and_serv_op.cc
+++ b/paddle/fluid/operators/listen_and_serv_op.cc
@@ -167,9 +167,8 @@ void ListenAndServOp::RunSyncLoop(
                           recv_scope);
     VLOG(2) << "run all blocks spent " << GetTimestamp() - ts << "(ms)";
 
-    // reset received sparse vars to avoid reuse it in the next mini-batch
     ResetReceivedVars(recv_varnames, recv_scope, dev_ctx,
-                      !rpc_service_->NeedResetAllVars());
+                      rpc_service_->NeedResetAllVars());
 
     rpc_service_->SetCond(distributed::kRequestGet);
     rpc_service_->WaitBarrier(distributed::kRequestGet);
@@ -179,7 +178,7 @@ void ListenAndServOp::RunSyncLoop(
 
 void ListenAndServOp::ResetReceivedVars(
     const std::vector<std::string> &recv_varnames, framework::Scope *recv_scope,
-    platform::DeviceContext *dev_ctx, bool only_sparse_vars) const {
+    platform::DeviceContext *dev_ctx, bool reset_all) const {
   for (auto &varname : recv_varnames) {
     auto var = recv_scope->FindVar(varname);
     if (var == nullptr) {
@@ -187,9 +186,11 @@ void ListenAndServOp::ResetReceivedVars(
       continue;
     }
     if (var->IsType<framework::SelectedRows>()) {
+      VLOG(3) << "reset sparse var: " << varname;
       var->GetMutable<framework::SelectedRows>()->mutable_rows()->clear();
     }
-    if (!only_sparse_vars) {
+    if (UNLIKELY(reset_all)) {
+      VLOG(3) << "reset dense var: " << varname;
       if (var->IsType<framework::LoDTensor>()) {
         math::set_constant(*dev_ctx, var->GetMutable<framework::LoDTensor>(),
                            static_cast<float>(0));
diff --git a/paddle/fluid/operators/listen_and_serv_op.h b/paddle/fluid/operators/listen_and_serv_op.h
index f84baa36eb..5102c963b9 100644
--- a/paddle/fluid/operators/listen_and_serv_op.h
+++ b/paddle/fluid/operators/listen_and_serv_op.h
@@ -70,7 +70,7 @@ class ListenAndServOp : public framework::OperatorBase {
   void ResetReceivedVars(const std::vector<std::string>& recv_varnames,
                          framework::Scope* recv_scope,
                          platform::DeviceContext* dev_ctx,
-                         bool only_sparse_vars = true) const;
+                         bool reset_all = false) const;
 
  protected:
   mutable std::shared_ptr<distributed::RPCServer> rpc_service_;
-- 
GitLab