add independent inference_lib.cmake

CMakeLists.txt

@@ -156,6 +156,7 @@ include(rdma)               # set rdma libraries
 include(flags)              # set paddle compile flags
 include(version)            # set PADDLE_VERSION
 include(coveralls)          # set code coverage
+include(inference_lib)      # add paddle fluid inference libraries
 
 
 include_directories("${PADDLE_SOURCE_DIR}")

cmake/external/eigen.cmake

@@ -28,11 +28,3 @@ endif()
 add_dependencies(eigen3 extern_eigen3)
 
 LIST(APPEND external_project_dependencies eigen3)
-
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/eigen3")
-add_custom_target(eigen3_lib
-    COMMAND mkdir -p "${lib_dir}/Eigen" "${lib_dir}/unsupported"
-    COMMAND cp "${EIGEN_INCLUDE_DIR}/Eigen/Core" "${lib_dir}/Eigen"
-    COMMAND cp -r "${EIGEN_INCLUDE_DIR}/Eigen/src" "${lib_dir}/Eigen"
-    COMMAND cp -r "${EIGEN_INCLUDE_DIR}/unsupported/Eigen" "${lib_dir}/unsupported"
-)

cmake/external/gflags.cmake

@@ -60,10 +60,3 @@ IF(WITH_C_API)
     INSTALL(FILES ${GFLAGS_LIBRARIES} DESTINATION third_party/gflags/lib)
   ENDIF()
 ENDIF()
-
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/gflags")
-add_custom_target(gflags_lib
-    COMMAND mkdir -p "${lib_dir}/lib"
-    COMMAND cp -r "${GFLAGS_INCLUDE_DIR}" "${lib_dir}"
-    COMMAND cp "${GFLAGS_LIBRARIES}" "${lib_dir}/lib"
-)

cmake/external/glog.cmake

@@ -76,10 +76,3 @@ IF(WITH_C_API)
     INSTALL(FILES ${GLOG_LIBRARIES} DESTINATION third_party/glog/lib)
   ENDIF()
 ENDIF()
-
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/glog")
-add_custom_target(glog_lib
-    COMMAND mkdir -p "${lib_dir}/lib"
-    COMMAND cp -r "${GLOG_INCLUDE_DIR}" "${lib_dir}"
-    COMMAND cp "${GLOG_LIBRARIES}" "${lib_dir}/lib"
-)

cmake/external/protobuf.cmake

@@ -259,13 +259,6 @@ IF(NOT PROTOBUF_FOUND)
         ENDIF()
     ENDIF()
 
-    set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/protobuf")
-    add_custom_target(protobuf_lib
-        COMMAND mkdir -p "${lib_dir}/lib"
-        COMMAND cp -r "${PROTOBUF_INCLUDE_DIR}" "${lib_dir}"
-        COMMAND cp "${PROTOBUF_LITE_LIBRARY}" "${lib_dir}/lib"
-    )
-
     IF(CMAKE_CROSSCOMPILING)
         PROMPT_PROTOBUF_LIB(protobuf_host extern_protobuf)
     ELSE()

cmake/inference_lib.cmake

+# make package for paddle fluid shared and static library
+# third party
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/eigen3")
+add_custom_target(eigen3_lib
+    COMMAND mkdir -p "${lib_dir}/Eigen" "${lib_dir}/unsupported"
+    COMMAND cp "${EIGEN_INCLUDE_DIR}/Eigen/Core" "${lib_dir}/Eigen"
+    COMMAND cp -r "${EIGEN_INCLUDE_DIR}/Eigen/src" "${lib_dir}/Eigen"
+    COMMAND cp -r "${EIGEN_INCLUDE_DIR}/unsupported/Eigen" "${lib_dir}/unsupported"
+)
+
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/gflags")
+add_custom_target(gflags_lib
+    COMMAND mkdir -p "${lib_dir}/lib"
+    COMMAND cp -r "${GFLAGS_INCLUDE_DIR}" "${lib_dir}"
+    COMMAND cp "${GFLAGS_LIBRARIES}" "${lib_dir}/lib"
+)
+
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/glog")
+add_custom_target(glog_lib
+    COMMAND mkdir -p "${lib_dir}/lib"
+    COMMAND cp -r "${GLOG_INCLUDE_DIR}" "${lib_dir}"
+    COMMAND cp "${GLOG_LIBRARIES}" "${lib_dir}/lib"
+)
+
+IF(NOT PROTOBUF_FOUND)
+    set(lib_dir "${CMAKE_INSTALL_PREFIX}/third_party/install/protobuf")
+    add_custom_target(protobuf_lib
+        COMMAND mkdir -p "${lib_dir}/lib"
+        COMMAND cp -r "${PROTOBUF_INCLUDE_DIR}" "${lib_dir}"
+        COMMAND cp "${PROTOBUF_LITE_LIBRARY}" "${lib_dir}/lib"
+    )
+ENDIF(NOT PROTOBUF_FOUND)
+
+# paddle fluid module
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/framework")
+add_custom_target(framework_lib DEPENDS framework_py_proto
+    COMMAND mkdir -p "${lib_dir}/details"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/framework/*.h" "${lib_dir}"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/framework/details/*.h" "${lib_dir}/details"
+    COMMAND cp "${PADDLE_BINARY_DIR}/paddle/framework/framework.pb.h" "${lib_dir}"
+)
+
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/memory")
+add_custom_target(memory_lib
+    COMMAND mkdir -p "${lib_dir}/detail"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/memory/*.h" "${lib_dir}"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/memory/detail/*.h" "${lib_dir}/detail"
+)
+
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/inference")
+add_custom_target(inference_lib DEPENDS paddle_fluid_shared
+    COMMAND mkdir -p "${lib_dir}"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/inference/*.h" "${lib_dir}"
+    COMMAND cp "${PADDLE_BINARY_DIR}/paddle/inference/libpaddle_fluid.so" "${lib_dir}"
+)
+
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/platform")
+add_custom_target(platform_lib
+    COMMAND mkdir -p "${lib_dir}/dynload" "${lib_dir}/details"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/platform/*.h" "${lib_dir}"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/platform/dynload/*.h" "${lib_dir}/dynload"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/platform/details/*.h" "${lib_dir}/details"
+)    
+
+set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/string")
+add_custom_target(string_lib
+    COMMAND mkdir -p "${lib_dir}/tinyformat"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/string/*.h" "${lib_dir}"
+    COMMAND cp "${PADDLE_SOURCE_DIR}/paddle/string/tinyformat/*.h" "${lib_dir}/tinyformat"
+)
+
+add_custom_target(inference_lib_dist DEPENDS 
+  inference_lib framework_lib memory_lib platform_lib string_lib
+  gflags_lib glog_lib protobuf_lib eigen3_lib)

paddle/framework/CMakeLists.txt

@@ -92,12 +92,4 @@ cc_test(init_test SRCS init_test.cc DEPS init)
 cc_test(op_kernel_type_test SRCS op_kernel_type_test.cc DEPS place device_context framework_proto)
 cc_test(cow_ptr_tests SRCS details/cow_ptr_test.cc)
       
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/framework")
-add_custom_target(framework_lib DEPENDS framework_py_proto
-    COMMAND mkdir -p "${lib_dir}/details"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${lib_dir}"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/details/*.h" "${lib_dir}/details"
-    COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/framework.pb.h" "${lib_dir}"
-)
-
 cc_test(channel_test SRCS channel_test.cc)

paddle/inference/CMakeLists.txt

@@ -18,17 +18,6 @@ target_circle_link_libraries(paddle_fluid_shared
 
 SET_TARGET_PROPERTIES(paddle_fluid_shared PROPERTIES OUTPUT_NAME paddle_fluid)
 
-# install library & headers
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/inference")
-add_custom_target(inference_lib DEPENDS paddle_fluid_shared
-    COMMAND mkdir -p "${lib_dir}"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${lib_dir}"
-    COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/libpaddle_fluid.so" "${lib_dir}"
-)
-add_custom_target(inference_lib_dist DEPENDS 
-  inference_lib framework_lib memory_lib platform_lib string_lib
-  gflags_lib glog_lib protobuf_lib eigen3_lib)
-
 if(WITH_TESTING)
   add_subdirectory(tests/book)
 endif()

paddle/memory/CMakeLists.txt

@@ -14,10 +14,3 @@ cc_library(paddle_memory
     system_allocator)
 
 cc_test(memory_test SRCS memory_test.cc DEPS place paddle_memory)
-
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/memory")
-add_custom_target(memory_lib
-    COMMAND mkdir -p "${lib_dir}/detail"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${lib_dir}"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/detail/*.h" "${lib_dir}/detail"
-)

paddle/platform/CMakeLists.txt

@@ -39,11 +39,3 @@ nv_test(nccl_test SRCS nccl_test.cu DEPS dynload_cuda gpu_info device_context)
 
 cc_library(profiler SRCS profiler.cc DEPS device_context)
 cc_test(profiler_test SRCS profiler_test.cc DEPS profiler)
-
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/platform")
-add_custom_target(platform_lib
-    COMMAND mkdir -p "${lib_dir}/dynload" "${lib_dir}/details"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${lib_dir}"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/dynload/*.h" "${lib_dir}/dynload"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/details/*.h" "${lib_dir}/details"
-)    

paddle/string/CMakeLists.txt

@@ -2,10 +2,3 @@ cc_library(stringpiece SRCS piece.cc)
 cc_test(stringpiece_test SRCS piece_test.cc DEPS stringpiece glog gflags)
 cc_test(stringprintf_test SRCS printf_test.cc DEPS glog gflags)
 cc_test(to_string_test SRCS to_string_test.cc)
-
-set(lib_dir "${CMAKE_INSTALL_PREFIX}/paddle/string")
-add_custom_target(string_lib
-    COMMAND mkdir -p "${lib_dir}/tinyformat"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${lib_dir}"
-    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/tinyformat/*.h" "${lib_dir}/tinyformat"
-)