From 29c7512b3ce13ca7b89d3ff3f4aea2c7d7f27478 Mon Sep 17 00:00:00 2001
From: liaogang <liaogang@baidu.com>
Date: Wed, 28 Jun 2017 01:31:46 +0800
Subject: [PATCH] FIX: fix memory.h/cc

---
 paddle/memory/memory.cc | 23 ++++++++++++++---------
 paddle/memory/memory.h  |  8 ++++----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/paddle/memory/memory.cc b/paddle/memory/memory.cc
index ca3c01ebdb..0d123d99e2 100644
--- a/paddle/memory/memory.cc
+++ b/paddle/memory/memory.cc
@@ -13,41 +13,46 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/memory/memory.h"
+#include "paddle/memory/detail/buddy_allocator.h"
+#include "paddle/memory/detail/system_allocator.h"
+#include "paddle/platform/assert.h"
 
-#include "paddle/memory/detail/cpu_allocator.h"
-#include "paddle/memory/detail/gpu_allocator.h"
+#include <boost/variant.hpp>
 
 namespace paddle {
 namespace memory {
 
-void Alloc(paddle::platform::Place pl, size_t size) {
+void* Alloc(platform::Place pl, size_t size) {
 #ifndef PADDLE_ONLY_CPU
   if (paddle::platform::is_gpu_place(pl)) {
-    return GetGPUBuddyAllocator(pl.device)->Alloc(size);
+    size_t gpu_id = boost::get<platform::GPUPlace>(pl).device;
+    return detail::GetGPUBuddyAllocator(gpu_id)->Alloc(size);
   }
 #endif  // PADDLE_ONLY_CPU
   PADDLE_ASSERT(paddle::platform::is_cpu_place(pl));
-  return GetCPUBuddyAllocator()->Alloc(size);
+  return detail::GetCPUBuddyAllocator()->Alloc(size);
 }
 
 void Free(paddle::platform::Place pl, void* p) {
 #ifndef PADDLE_ONLY_CPU
   if (paddle::platform::is_gpu_place(pl)) {
-    GetGPUBuddyAllocator(pl.device)->Free(p);
+    size_t gpu_id = boost::get<platform::GPUPlace>(pl).device;
+    detail::GetGPUBuddyAllocator(gpu_id)->Free(p);
   }
 #endif  // PADDLE_ONLY_CPU
   PADDLE_ASSERT(paddle::platform::is_cpu_place(pl));
-  GetCPUBuddyAllocator()->Free(p);
+  detail::GetCPUBuddyAllocator()->Free(p);
 }
 
 size_t Used(paddle::platform::Place pl) {
 #ifndef PADDLE_ONLY_CPU
   if (paddle::platform::is_gpu_place(pl)) {
-    return GetGPUBuddyAllocator(pl.device)->Used();
+    size_t gpu_id = boost::get<platform::GPUPlace>(pl).device;
+    return detail::GetGPUBuddyAllocator(gpu_id)->Used();
   }
 #endif  // PADDLE_ONLY_CPU
   PADDLE_ASSERT(paddle::platform::is_cpu_place(pl));
-  return GetCPUBuddyAllocator()->Used();
+  return detail::GetCPUBuddyAllocator()->Used();
 }
 
 }  // namespace memory
diff --git a/paddle/memory/memory.h b/paddle/memory/memory.h
index 0bc609205e..a33092bade 100644
--- a/paddle/memory/memory.h
+++ b/paddle/memory/memory.h
@@ -14,14 +14,14 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/frameowork/place.h"
+#include "paddle/platform/place.h"
 
 namespace paddle {
 namespace memory {
 
-void* Alloc(paddle::framework::Place, size_t);
-void Free(paddle::framework::Place, void*);
-size_t Used(paddle::framework::Place);
+void* Alloc(paddle::platform::Place, size_t);
+void Free(paddle::platform::Place, void*);
+size_t Used(paddle::platform::Place);
 
 }  // namespace memory
 }  // namespace paddle
-- 
GitLab