From d144dba4a1aa302d56a45a54546eed7866674484 Mon Sep 17 00:00:00 2001
From: qiaolongfei <qiaolongfei@baidu.com>
Date: Fri, 20 Apr 2018 15:19:09 +0800
Subject: [PATCH] simplify code

---
 paddle/fluid/operators/detail/grpc_server.h  |  3 ---
 paddle/fluid/operators/listen_and_serv_op.cc | 20 ++++++++------------
 paddle/fluid/operators/listen_and_serv_op.h  |  4 ----
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/paddle/fluid/operators/detail/grpc_server.h b/paddle/fluid/operators/detail/grpc_server.h
index 3c113f4ff..452ff5e96 100644
--- a/paddle/fluid/operators/detail/grpc_server.h
+++ b/paddle/fluid/operators/detail/grpc_server.h
@@ -59,8 +59,6 @@ class AsyncGRPCServer final {
 
   void SetProgram(framework::ProgramDesc *program) { program_ = program; }
 
-  void SetPrefetchBlkdId(int blkid) { prefetch_blk_id_ = blkid; }
-
   void SetExecutor(framework::Executor *executor) { executor_ = executor; }
 
   void SetPrefetchPreparedCtx(framework::ExecutorPrepareContext *prepared) {
@@ -114,7 +112,6 @@ class AsyncGRPCServer final {
   std::unique_ptr<std::thread> t_get_;
   std::unique_ptr<std::thread> t_prefetch_;
 
-  int prefetch_blk_id_;
   framework::ExecutorPrepareContext *prefetch_ctx_;
   framework::ProgramDesc *program_;
   framework::Executor *executor_;
diff --git a/paddle/fluid/operators/listen_and_serv_op.cc b/paddle/fluid/operators/listen_and_serv_op.cc
index f6256fc60..49e191b7b 100644
--- a/paddle/fluid/operators/listen_and_serv_op.cc
+++ b/paddle/fluid/operators/listen_and_serv_op.cc
@@ -70,17 +70,6 @@ void ListenAndServOp::Stop() {
   server_thread_->join();
 }
 
-void ListenAndServOp::PreparePrefetchCtx(
-    framework::Executor *executor, framework::BlockDesc *prefetch_block,
-    framework::ProgramDesc *program) const {
-  VLOG(3) << "prefetch block id is " << prefetch_block->ID();
-  rpc_service_->SetExecutor(executor);
-  auto prefetch_prepared = executor->Prepare(*program, prefetch_block->ID());
-  rpc_service_->SetPrefetchBlkdId(prefetch_block->ID());
-  rpc_service_->SetPrefetchPreparedCtx(prefetch_prepared.get());
-  prefetch_prepared.release();
-}
-
 void ListenAndServOp::RunSyncUpdate(
     framework::Executor *executor, framework::ProgramDesc *program,
     framework::Scope *recv_scope, framework::BlockDesc *prefetch_block) const {
@@ -198,7 +187,14 @@ void ListenAndServOp::RunImpl(const framework::Scope &scope,
   rpc_service_->SetScope(&recv_scope);
   rpc_service_->SetDevCtx(&dev_ctx);
   rpc_service_->SetProgram(program);
-  PreparePrefetchCtx(&executor, prefetch_block, program);
+  rpc_service_->SetExecutor(&executor);
+
+  // prepare for prefetch
+  VLOG(3) << "prefetch block id is " << prefetch_block->ID();
+  auto prefetch_prepared = executor.Prepare(*program, prefetch_block->ID());
+  rpc_service_->SetPrefetchPreparedCtx(prefetch_prepared.get());
+  prefetch_prepared.release();
+
   // start the server listening after all member initialized.
   server_thread_.reset(new std::thread(RunServer, rpc_service_));
   VLOG(3) << "wait server thread to become ready...";
diff --git a/paddle/fluid/operators/listen_and_serv_op.h b/paddle/fluid/operators/listen_and_serv_op.h
index 33d15c7d6..68c8da4d3 100644
--- a/paddle/fluid/operators/listen_and_serv_op.h
+++ b/paddle/fluid/operators/listen_and_serv_op.h
@@ -41,10 +41,6 @@ class ListenAndServOp : public framework::OperatorBase {
 
   int GetSelectedPort() const;
 
-  void PreparePrefetchCtx(framework::Executor* executor,
-                          framework::BlockDesc* prefetch_block,
-                          framework::ProgramDesc* program) const;
-
   void RunSyncUpdate(framework::Executor* executor,
                      framework::ProgramDesc* program,
                      framework::Scope* recv_scope,
-- 
GitLab