refine for compile pslib.so

6 years ago · 419506f510
parent 2301abc481
commit 419506f510
4 changed files with 4 additions and 3 deletions
--- a/cmake/external/pslib.cmake
+++ b/cmake/external/pslib.cmake
@ -66,7 +66,7 @@ ExternalProject_Add(
    CMAKE_CACHE_ARGS      -DCMAKE_INSTALL_PREFIX:PATH=${PSLIB_INSTALL_ROOT}
 )

-ADD_LIBRARY(pslib STATIC IMPORTED GLOBAL)
+ADD_LIBRARY(pslib SHARED IMPORTED GLOBAL)
 SET_PROPERTY(TARGET pslib PROPERTY IMPORTED_LOCATION ${PSLIB_LIB})
 ADD_DEPENDENCIES(pslib ${PSLIB_PROJECT})
 LIST(APPEND external_project_dependencies pslib)
--- a/cmake/external/pslib_brpc.cmake
+++ b/cmake/external/pslib_brpc.cmake
@ -41,7 +41,7 @@ SET(PSLIB_BRPC_INSTALL_DIR   ${PSLIB_BRPC_INSTALL_ROOT}/${PSLIB_BRPC_DST_DIR})
 SET(PSLIB_BRPC_ROOT          ${PSLIB_BRPC_INSTALL_DIR})
 SET(PSLIB_BRPC_INC_DIR       ${PSLIB_BRPC_ROOT}/include)
 SET(PSLIB_BRPC_LIB_DIR       ${PSLIB_BRPC_ROOT}/lib)
-SET(PSLIB_BRPC_LIB           ${PSLIB_BRPC_LIB_DIR}/libps.so)
+SET(PSLIB_BRPC_LIB           ${PSLIB_BRPC_LIB_DIR}/libbrpc.a)
 SET(PSLIB_BRPC_IOMP_LIB      ${PSLIB_BRPC_LIB_DIR}/libiomp5.so) #todo what is this
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${PSLIB_BRPC_ROOT}/lib")

--- a/paddle/fluid/CMakeLists.txt
+++ b/paddle/fluid/CMakeLists.txt
@ -1,6 +1,7 @@
 add_subdirectory(memory)
 add_subdirectory(platform)
 add_subdirectory(framework)
+#add_subdirectory(distributed)
 add_subdirectory(operators)
 add_subdirectory(string)
 add_subdirectory(recordio)
--- a/paddle/fluid/framework/CMakeLists.txt
+++ b/paddle/fluid/framework/CMakeLists.txt
@ -180,7 +180,7 @@ cc_library(parallel_executor SRCS parallel_executor.cc DEPS
        graph build_strategy
        fast_threaded_ssa_graph_executor variable_helper)

-cc_library(async_executor SRCS async_executor.cc data_feed.cc data_feed_factory.cc executor_thread_worker.cc DEPS op_registry device_context scope framework_proto glog lod_rank_table feed_fetch_method graph_to_program_pass async_executor_proto variable_helper pslib)
+cc_library(async_executor SRCS async_executor.cc data_feed.cc data_feed_factory.cc executor_thread_worker.cc DEPS op_registry device_context scope framework_proto glog lod_rank_table feed_fetch_method graph_to_program_pass async_executor_proto variable_helper pslib_brpc pslib)

 cc_test(data_feed_test SRCS data_feed_test.cc DEPS async_executor)
 cc_library(prune SRCS prune.cc DEPS framework_proto)