From bb17604b36f37a8c919b1e454932053acee65f50 Mon Sep 17 00:00:00 2001
From: tangwei12 <tangwei12@baidu.com>
Date: Fri, 15 Jun 2018 14:28:24 +0800
Subject: [PATCH] bug fix

---
 paddle/fluid/operators/detail/grpc_client.cc          | 2 +-
 paddle/fluid/operators/detail/request_handler_impl.cc | 5 ++++-
 paddle/fluid/operators/save_op.cc                     | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/paddle/fluid/operators/detail/grpc_client.cc b/paddle/fluid/operators/detail/grpc_client.cc
index 88984386756..1dff3bfa3cb 100644
--- a/paddle/fluid/operators/detail/grpc_client.cc
+++ b/paddle/fluid/operators/detail/grpc_client.cc
@@ -240,7 +240,7 @@ void GRPCClient::AsyncCheckpointNotify(const std::string& ep,
   req.set_notify_type(CHECKPOINT_SAVE_MESSAGE);
   req.set_checkpoint_dir(dir);
 
-  auto rpc = s->stub_->AsyncCheckpointNotify(s->context_.get(), req, &cq);
+  auto rpc = s->stub_->AsyncCheckpointNotify(s->context_.get(), req, &cq_);
   rpc->Finish(&s->reply_, &s->status_, reinterpret_cast<void*>(s));
   req_count_++;
 }
diff --git a/paddle/fluid/operators/detail/request_handler_impl.cc b/paddle/fluid/operators/detail/request_handler_impl.cc
index ffad66700e5..de6ce72d4dc 100644
--- a/paddle/fluid/operators/detail/request_handler_impl.cc
+++ b/paddle/fluid/operators/detail/request_handler_impl.cc
@@ -123,7 +123,10 @@ bool RequestCheckpointHandler::Handle(const std::string& varname,
                                       framework::Scope* scope,
                                       framework::Variable* invar,
                                       framework::Variable** outvar,
-                                      const std::string& out_var_name) {}
+                                      const std::string& out_var_name) {
+  executor_->RunPreparedContext(checkpoint_prepared_ctx_);
+  return true;
+}
 
 }  // namespace detail
 }  // namespace operators
diff --git a/paddle/fluid/operators/save_op.cc b/paddle/fluid/operators/save_op.cc
index 410796eeb6c..3d114538eb8 100644
--- a/paddle/fluid/operators/save_op.cc
+++ b/paddle/fluid/operators/save_op.cc
@@ -96,7 +96,7 @@ class SaveOp : public framework::OperatorBase {
     }
   }
 
-  SaveLodTensor(const string &filename, const platform::Place &place,
+  SaveLodTensor(const std::string &filename, const platform::Place &place,
                 Variable *var) {
     auto &tensor = var->Get<framework::LoDTensor>();
 
@@ -127,7 +127,7 @@ class SaveOp : public framework::OperatorBase {
     fout.close()
   }
 
-  SaveSelectedRows(const string &filename, const platform::Place &place,
+  SaveSelectedRows(const std::string &filename, const platform::Place &place,
                    Variable *var) {
     auto &selectedRows = var->Get<framework::SelectedRows>();
 
@@ -141,7 +141,7 @@ class SaveOp : public framework::OperatorBase {
     PADDLE_ENFORCE(static_cast<bool>(fout), "Cannot open %s to write",
                    filename);
     framework::SerializeToStream(fout, selectedRows, dev_ctx);
-    fout.close()
+    fout.close();
   }
 };
 
-- 
GitLab