diff --git a/CMakeLists.txt b/CMakeLists.txt index d6aa8f1b85c9c4c1a9ccd5b7d5f5607f9db39bc6..b3111eed8b2ffa5ce742956a841a500c00b7c594 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,7 +265,7 @@ endif() if (WITH_JEMALLOC) find_package(JeMalloc REQUIRED) include_directories(${JEMALLOC_INCLUDE_DIR}) - add_definitions(-DWITH_JEMALLOC) + add_definitions(-DPADDLE_WITH_JEMALLOC) endif() include(generic) # simplify cmake module diff --git a/paddle/fluid/memory/allocation/legacy_allocator.cc b/paddle/fluid/memory/allocation/legacy_allocator.cc index cf6d351a41d968be64d2b5270d05a8a666dcc0b5..04a68d6c23f0d04edbe7a902221807f309636767 100644 --- a/paddle/fluid/memory/allocation/legacy_allocator.cc +++ b/paddle/fluid/memory/allocation/legacy_allocator.cc @@ -17,7 +17,7 @@ #include #include -#ifdef WITH_JEMALLOC +#ifdef PADDLE_WITH_JEMALLOC #include #endif @@ -95,7 +95,7 @@ struct NaiveAllocator { template <> void *Alloc(const platform::CPUPlace &place, size_t size) { VLOG(10) << "Allocate " << size << " bytes on " << platform::Place(place); -#ifdef WITH_JEMALLOC +#ifdef PADDLE_WITH_JEMALLOC void *p = malloc(size); #else void *p = GetCPUBuddyAllocator()->Alloc(size); @@ -110,7 +110,7 @@ void *Alloc(const platform::CPUPlace &place, size_t size) { template <> void Free(const platform::CPUPlace &place, void *p) { VLOG(10) << "Free pointer=" << p << " on " << platform::Place(place); -#ifdef WITH_JEMALLOC +#ifdef PADDLE_WITH_JEMALLOC free(p); #else GetCPUBuddyAllocator()->Free(p); @@ -119,8 +119,8 @@ void Free(const platform::CPUPlace &place, void *p) { template <> size_t Used(const platform::CPUPlace &place) { -#ifdef WITH_JEMALLOC - // fake the result of used memory when WITH_JEMALLOC is ON +#ifdef PADDLE_WITH_JEMALLOC + // fake the result of used memory when PADDLE_WITH_JEMALLOC is ON return 0U; #else return GetCPUBuddyAllocator()->Used();