From 383b96f32c60ec542819c62b4e09009cae9afc9d Mon Sep 17 00:00:00 2001
From: liaogang <liaogang@baidu.com>
Date: Tue, 11 Jul 2017 16:26:58 +0800
Subject: [PATCH] FIX: merge conflicts

---
 paddle/memory/detail/meta_cache.cc | 2 +-
 paddle/memory/memory.cc            | 2 +-
 paddle/platform/CMakeLists.txt     | 2 +-
 paddle/platform/device_context.h   | 3 ++-
 paddle/platform/gpu_info.cc        | 4 ++--
 paddle/platform/gpu_info.h         | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/paddle/memory/detail/meta_cache.cc b/paddle/memory/detail/meta_cache.cc
index 189ab4fc7b..30ff80e7ba 100644
--- a/paddle/memory/detail/meta_cache.cc
+++ b/paddle/memory/detail/meta_cache.cc
@@ -25,7 +25,7 @@ MetadataCache::MetadataCache(bool uses_gpu) : uses_gpu_(uses_gpu) {}
 Metadata MetadataCache::load(const MemoryBlock* block) {
   if (uses_gpu_) {
     auto existing_metadata = cache_.find(block);
-    assert(existing_metadata->second.check_guards());
+    PADDLE_ASSERT(existing_metadata->second.check_guards());
     return existing_metadata->second;
   } else {
     PADDLE_ASSERT(reinterpret_cast<const Metadata*>(block)->check_guards());
diff --git a/paddle/memory/memory.cc b/paddle/memory/memory.cc
index def580f7a4..430ce98bfc 100644
--- a/paddle/memory/memory.cc
+++ b/paddle/memory/memory.cc
@@ -52,7 +52,7 @@ size_t Used<platform::CPUPlace>(platform::CPUPlace place) {
 detail::BuddyAllocator* GetGPUBuddyAllocator(int gpu_id) {
   static detail::BuddyAllocator** as = NULL;
   if (as == NULL) {
-    int gpu_num = platform::GpuDeviceCount();
+    int gpu_num = platform::GetDeviceCount();
     as = new detail::BuddyAllocator*[gpu_num];
     for (int gpu = 0; gpu < gpu_num; gpu++) {
       platform::SetDeviceId(gpu);
diff --git a/paddle/platform/CMakeLists.txt b/paddle/platform/CMakeLists.txt
index 4b3f55b3c7..d16c747aee 100644
--- a/paddle/platform/CMakeLists.txt
+++ b/paddle/platform/CMakeLists.txt
@@ -8,4 +8,4 @@ cc_test(place_test SRCS place_test.cc DEPS place glog gflags)
 
 cc_library(dynamic_loader SRCS dynload/dynamic_loader.cc DEPS gflags glog)
 
-nv_test(device_context_test SRCS device_context_test.cc DEPS dynamic_loader place eigen3)
+nv_test(device_context_test SRCS device_context_test.cc DEPS dynamic_loader place eigen3 gpu_info)
diff --git a/paddle/platform/device_context.h b/paddle/platform/device_context.h
index 160eb4e120..02194581d1 100644
--- a/paddle/platform/device_context.h
+++ b/paddle/platform/device_context.h
@@ -16,10 +16,11 @@ limitations under the License. */
 
 #include "paddle/framework/enforce.h"
 #ifndef PADDLE_ONLY_CPU
-#include "paddle/platform/cuda.h"
 #include "paddle/platform/dynload/cublas.h"
 #include "paddle/platform/dynload/cudnn.h"
 #include "paddle/platform/dynload/curand.h"
+#include "paddle/platform/error.h"
+#include "paddle/platform/gpu_info.h"
 #define EIGEN_USE_GPU
 #endif
 #include "paddle/platform/place.h"
diff --git a/paddle/platform/gpu_info.cc b/paddle/platform/gpu_info.cc
index fe475d23ce..9b917f9d35 100644
--- a/paddle/platform/gpu_info.cc
+++ b/paddle/platform/gpu_info.cc
@@ -23,11 +23,11 @@ DEFINE_double(fraction_of_gpu_memory_to_use, 0.95,
 namespace paddle {
 namespace platform {
 
-int GpuDeviceCount() {
+int GetDeviceCount() {
   int count;
   throw_on_error(
       cudaGetDeviceCount(&count),
-      "cudaGetDeviceCount failed in paddle::platform::GpuDeviceCount");
+      "cudaGetDeviceCount failed in paddle::platform::GetDeviceCount");
   return count;
 }
 
diff --git a/paddle/platform/gpu_info.h b/paddle/platform/gpu_info.h
index 81ee5f6e0a..79e71956bd 100644
--- a/paddle/platform/gpu_info.h
+++ b/paddle/platform/gpu_info.h
@@ -22,7 +22,7 @@ namespace paddle {
 namespace platform {
 
 //! Get the total number of GPU devices in system.
-int GpuDeviceCount();
+int GetDeviceCount();
 
 //! Get the current GPU device id in system.
 int GetCurrentDeviceId();
-- 
GitLab