From 114eb17587dfffffa2c2443bb79d2ad140801ffb Mon Sep 17 00:00:00 2001
From: sneaxiy <sneaxiy@126.com>
Date: Mon, 17 Sep 2018 12:03:18 +0000
Subject: [PATCH] fix executor bug

---
 paddle/fluid/framework/executor.cc | 13 +++++++------
 paddle/fluid/framework/executor.h  |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/paddle/fluid/framework/executor.cc b/paddle/fluid/framework/executor.cc
index 650d9086d42..8d8042a0563 100644
--- a/paddle/fluid/framework/executor.cc
+++ b/paddle/fluid/framework/executor.cc
@@ -337,6 +337,7 @@ void Executor::RunPreparedContext(ExecutorPrepareContext* ctx, Scope* scope,
 
   std::unique_ptr<GarbageCollector<Tensor>> gc;
   if (max_memory_size >= 0) {
+    ctx->ResetReferenceCount();
 #ifdef PADDLE_WITH_CUDA
     if (platform::is_gpu_place(place_)) {
       gc.reset(new DefaultStreamGarbageCollector<Tensor>(
@@ -357,11 +358,11 @@ void Executor::RunPreparedContext(ExecutorPrepareContext* ctx, Scope* scope,
       std::vector<std::string> erase_vars;
       for (auto& input : op->Inputs()) {
         for (auto& input_name : input.second) {
-          auto it = ctx->ref_cnts_.find(input_name);
-          if (it == ctx->ref_cnts_.end()) continue;
+          auto it = ctx->cur_ref_cnts_.find(input_name);
+          if (it == ctx->cur_ref_cnts_.end()) continue;
           if (it->second == 1) {  // should delete it
             erase_vars.emplace_back(input_name);
-            ctx->ref_cnts_.erase(input_name);
+            ctx->cur_ref_cnts_.erase(input_name);
           } else {
             --(it->second);
           }
@@ -370,11 +371,11 @@ void Executor::RunPreparedContext(ExecutorPrepareContext* ctx, Scope* scope,
 
       for (auto& output : op->Outputs()) {
         for (auto& output_name : output.second) {
-          auto it = ctx->ref_cnts_.find(output_name);
-          if (it == ctx->ref_cnts_.end()) continue;
+          auto it = ctx->cur_ref_cnts_.find(output_name);
+          if (it == ctx->cur_ref_cnts_.end()) continue;
           if (it->second == 1) {
             erase_vars.emplace_back(output_name);
-            ctx->ref_cnts_.erase(output_name);
+            ctx->cur_ref_cnts_.erase(output_name);
           } else {
             --(it->second);
           }
diff --git a/paddle/fluid/framework/executor.h b/paddle/fluid/framework/executor.h
index b7462687605..f0cc1338a8a 100644
--- a/paddle/fluid/framework/executor.h
+++ b/paddle/fluid/framework/executor.h
@@ -72,11 +72,14 @@ struct ExecutorPrepareContext {
   ExecutorPrepareContext(const framework::ProgramDesc& prog, size_t block_id);
   ~ExecutorPrepareContext();
 
+  void ResetReferenceCount() { cur_ref_cnts_ = ref_cnts_; }
+
   const framework::ProgramDesc& prog_;
   size_t block_id_;
   std::vector<std::unique_ptr<OperatorBase>> ops_;
 
   std::unordered_map<std::string, int> ref_cnts_;
+  std::unordered_map<std::string, int> cur_ref_cnts_;
 };
 
 class Executor {
-- 
GitLab