Move mempool to predictor/mempool

Change-Id: Idd9c5e4dc1c8e01bb55ea04e2a7b4a09c3999ea7

CMakeLists.txt

@@ -97,7 +97,6 @@ if(WITH_MKLDNN)
 endif()
 
 add_subdirectory(configure)
-add_subdirectory(mempool)
 add_subdirectory(predictor)
 add_subdirectory(inferencer-fluid-cpu)
 add_subdirectory(serving)

mempool/CMakeLists.txt

-add_library(mempool ${CMAKE_CURRENT_LIST_DIR}/mempool.cpp)
-add_dependencies(mempool brpc)

predictor/CMakeLists.txt

 include(proto/CMakeLists.txt)
 include(common/CMakeLists.txt)
 include(op/CMakeLists.txt)
+include(mempool/CMakeLists.txt)
 include(framework/CMakeLists.txt)
 include(plugin/CMakeLists.txt)
 include(src/CMakeLists.txt)
@@ -16,18 +17,16 @@ set_source_files_properties(
         ${pdserving_srcs}
         PROPERTIES
         COMPILE_FLAGS  "-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor")
-add_dependencies(pdserving protobuf boost brpc leveldb pdcodegen 
-        configure mempool)
+add_dependencies(pdserving protobuf boost brpc leveldb pdcodegen configure)
 
 target_include_directories(pdserving PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/
         ${CMAKE_CURRENT_BINARY_DIR}/
         ${CMAKE_CURRENT_BINARY_DIR}/../configure
         ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        ${CMAKE_CURRENT_LIST_DIR}/../mempool)
+        )
 target_link_libraries(pdserving
-        brpc protobuf boost leveldb configure 
-        mempool -lpthread -lcrypto -lm -lrt -lssl -ldl -lz)
+        brpc protobuf boost leveldb configure -lpthread -lcrypto -lm -lrt -lssl -ldl -lz)
 
 add_executable(pdserving_exe ${pdserving_srcs})
 set_source_files_properties(
@@ -35,16 +34,16 @@ set_source_files_properties(
         PROPERTIES
         COMPILE_FLAGS  "-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor")
 add_dependencies(pdserving_exe
-        protobuf boost brpc leveldb pdcodegen configure mempool)
+        protobuf boost brpc leveldb pdcodegen configure)
 
 target_include_directories(pdserving_exe PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/
         ${CMAKE_CURRENT_BINARY_DIR}/
         ${CMAKE_CURRENT_BINARY_DIR}/../configure
         ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        ${CMAKE_CURRENT_LIST_DIR}/../mempool)
+        )
 target_link_libraries(pdserving_exe brpc protobuf leveldb 
-        configure mempool -lpthread -lcrypto -lm -lrt -lssl
+        configure -lpthread -lcrypto -lm -lrt -lssl
         -ldl -lz)
 
 add_library(pdclient ${pdclient_srcs})
@@ -59,6 +58,6 @@ target_include_directories(pdclient PUBLIC
         ${CMAKE_CURRENT_BINARY_DIR}/
         ${CMAKE_CURRENT_BINARY_DIR}/../configure
         ${CMAKE_CURRENT_LIST_DIR}/../configure/include
-        ${CMAKE_CURRENT_LIST_DIR}/../mempool)
+        )
 target_link_libraries(pdclient protobuf boost brpc -lpthread -lcrypto -lm -lrt -lssl -ldl -lz)
 

predictor/framework/memory.h

@@ -2,7 +2,7 @@
 #define BAIDU_PADDLE_SERVING_PREDICTOR_MEMORY_H
 
 #include "common/inner_common.h"
-#include "mempool.h"
+#include "mempool/mempool.h"
 
 namespace baidu {
 namespace paddle_serving {

predictor/mempool/CMakeLists.txt

+FILE(GLOB mempool_srcs ${CMAKE_CURRENT_LIST_DIR}/*.cpp)
+LIST(APPEND pdserving_srcs ${mempool_srcs})
+LIST(APPEND pdclient_srcs ${mempool_srcs})

mempool/mempool.cpp → predictor/mempool/mempool.cpp

-#include "mempool.h"
+#include "mempool/mempool.h"
 
 namespace im {