提交 3e9aa7fd 编写于 作者: L liaogang

FIX: Pass CI

上级 55648b4f
...@@ -78,10 +78,6 @@ ...@@ -78,10 +78,6 @@
# #
# cc_test(example_test SRCS example_test.cc DEPS example glog gflags) # cc_test(example_test SRCS example_test.cc DEPS example glog gflags)
if(WITH_GPU)
add_definitions(-DPADDLE_WITH_GPU)
endif()
if(NOT APPLE) if(NOT APPLE)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
link_libraries(${CMAKE_THREAD_LIBS_INIT}) link_libraries(${CMAKE_THREAD_LIBS_INIT})
......
add_subdirectory(detail) add_subdirectory(detail)
if(${WITH_GPU})
nv_library(memory SRCS memory.cc)
else(${WITH_GPU})
cc_library(memory SRCS memory.cc)
endif(${WITH_GPU})
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#pragma once #pragma once
#include "paddle/memory/detail/system_allocator.h" #include "paddle/memory/detail/buddy_allocator.h"
namespace paddle { namespace paddle {
namespace memory { namespace memory {
......
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
#include "paddle/memory/detail/system_allocator.h" #include "paddle/memory/detail/system_allocator.h"
#include <vector>
#include <mutex>
namespace paddle { namespace paddle {
namespace memory { namespace memory {
namespace detail { namespace detail {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册