From 2328bee1cc835d789b83cd4da9bef6b588bc87c5 Mon Sep 17 00:00:00 2001
From: sneaxiy <sneaxiy@126.com>
Date: Thu, 13 Dec 2018 06:34:09 +0000
Subject: [PATCH] fix Windows compile bug test=develop

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

diff --git a/paddle/fluid/framework/details/eager_deletion_op_handle.cc b/paddle/fluid/framework/details/eager_deletion_op_handle.cc
index 3b27415e4..abacb11e3 100644
--- a/paddle/fluid/framework/details/eager_deletion_op_handle.cc
+++ b/paddle/fluid/framework/details/eager_deletion_op_handle.cc
@@ -77,14 +77,14 @@ void EagerDeletionOpHandle::RunImpl() {
     VLOG(2) << "Erase variable " << name;
 
     if (var->IsType<LoDTensor>()) {
-      garbages.emplace_back(var->GetMutable<LoDTensor>()->MoveMemory());
+      garbages.emplace_back(var->GetMutable<LoDTensor>()->MoveMemoryHolder());
     } else if (var->IsType<SelectedRows>()) {
       garbages.emplace_back(
-          var->GetMutable<SelectedRows>()->mutable_value()->MoveMemory());
+          var->GetMutable<SelectedRows>()->mutable_value()->MoveMemoryHolder());
     } else if (var->IsType<LoDTensorArray>()) {
       auto *tensor_arr = var->GetMutable<LoDTensorArray>();
       for (auto &t : *tensor_arr) {
-        garbages.emplace_back(t.MoveMemory());
+        garbages.emplace_back(t.MoveMemoryHolder());
       }
     } else {
       PADDLE_THROW("Type %s of %s is not supported eager deletion",
diff --git a/paddle/fluid/framework/executor.cc b/paddle/fluid/framework/executor.cc
index 16c4552a5..0c4bd336c 100644
--- a/paddle/fluid/framework/executor.cc
+++ b/paddle/fluid/framework/executor.cc
@@ -106,14 +106,16 @@ static void DeleteUnusedTensors(
 
         VLOG(2) << "Erase variable " << name;
         if (var->IsType<LoDTensor>()) {
-          garbages.emplace_back(var->GetMutable<LoDTensor>()->MoveMemory());
-        } else if (var->IsType<SelectedRows>()) {
           garbages.emplace_back(
-              var->GetMutable<SelectedRows>()->mutable_value()->MoveMemory());
+              var->GetMutable<LoDTensor>()->MoveMemoryHolder());
+        } else if (var->IsType<SelectedRows>()) {
+          garbages.emplace_back(var->GetMutable<SelectedRows>()
+                                    ->mutable_value()
+                                    ->MoveMemoryHolder());
         } else if (var->IsType<LoDTensorArray>()) {
           auto* lod_tensor_arr = var->GetMutable<LoDTensorArray>();
           for (auto& t : *lod_tensor_arr) {
-            garbages.emplace_back(t.MoveMemory());
+            garbages.emplace_back(t.MoveMemoryHolder());
           }
         } else {
           PADDLE_THROW("Type %s of %s is not supported eager deletion",
diff --git a/paddle/fluid/framework/tensor.h b/paddle/fluid/framework/tensor.h
index 9f7027f5a..153222506 100644
--- a/paddle/fluid/framework/tensor.h
+++ b/paddle/fluid/framework/tensor.h
@@ -158,7 +158,7 @@ class Tensor {
   const std::shared_ptr<memory::Allocation>& Holder() const { return holder_; }
   size_t offset() const { return offset_; }
 
-  std::shared_ptr<memory::Allocation> MoveMemory() {
+  std::shared_ptr<memory::Allocation> MoveMemoryHolder() {
     return std::move(holder_);
   }
 
-- 
GitLab