From f81caa4e1114ef78afa15730f7963c289418fe63 Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Sat, 22 Jul 2017 16:14:15 -0700 Subject: [PATCH 1/2] Add dependency memory->device_context, because we now use platform::GPUPlaceGuard --- paddle/memory/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/paddle/memory/CMakeLists.txt b/paddle/memory/CMakeLists.txt index 4cd40e2c2a..3e53d1ce65 100644 --- a/paddle/memory/CMakeLists.txt +++ b/paddle/memory/CMakeLists.txt @@ -8,7 +8,10 @@ cc_library(paddle_memory memory memcpy meta_data - meta_cache memory_block - buddy_allocator system_allocator) + meta_cache + memory_block + buddy_allocator + system_allocator + device_context) cc_test(memory_test SRCS memory_test.cc DEPS place paddle_memory) From de6f9c487952c9f9668c2438d3ee901e12c4c8eb Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Sat, 22 Jul 2017 16:15:23 -0700 Subject: [PATCH 2/2] Add dependency memory->device_context, because we now use platform::GPUPlaceGuard --- paddle/memory/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/paddle/memory/CMakeLists.txt b/paddle/memory/CMakeLists.txt index 3e53d1ce65..8035d93bfe 100644 --- a/paddle/memory/CMakeLists.txt +++ b/paddle/memory/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(detail) cc_library(memory SRCS memory.cc) -cc_library(memcpy SRCS memcpy.cc) +cc_library(memcpy SRCS memcpy.cc DEPS device_context) cc_library(paddle_memory DEPS @@ -11,7 +11,6 @@ cc_library(paddle_memory meta_cache memory_block buddy_allocator - system_allocator - device_context) + system_allocator) cc_test(memory_test SRCS memory_test.cc DEPS place paddle_memory)