From d9ad61d69fb6d3b18e0233cc1b54d7d9ea5fb6cc Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Fri, 24 Jan 2020 04:45:00 +0000 Subject: [PATCH] Update for ps-lite CMakeLists.txt refactor --- 3rdparty/ps-lite | 2 +- CMakeLists.txt | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/3rdparty/ps-lite b/3rdparty/ps-lite index 60b826e4422f..f60105427e4f 160000 --- a/3rdparty/ps-lite +++ b/3rdparty/ps-lite @@ -1 +1 @@ -Subproject commit 60b826e4422fee0df00b892c66ffffea11e5da3f +Subproject commit f60105427e4f626244056c8d527dca54402d0a9c diff --git a/CMakeLists.txt b/CMakeLists.txt index a19987367ad3..72745701400d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -770,10 +770,8 @@ endif() if(USE_DIST_KVSTORE) add_subdirectory("3rdparty/ps-lite") - list(APPEND pslite_LINKER_LIBS pslite protobuf zmq) add_definitions(-DMXNET_USE_DIST_KVSTORE) - include_directories(SYSTEM ${pslite_INCLUDE_DIR}) - list(APPEND mxnet_LINKER_LIBS ${pslite_LINKER_LIBS}) + list(APPEND mxnet_LINKER_LIBS pslite) endif() function(BuildTVMOP) @@ -821,7 +819,7 @@ if(MSVC) target_link_libraries(mxnet PUBLIC dmlc) endif() else() - target_link_libraries(mxnet PUBLIC ${mxnet_LINKER_LIBS}) + target_link_libraries(mxnet_static PUBLIC ${mxnet_LINKER_LIBS}) target_link_libraries(mxnet PUBLIC dmlc) endif() @@ -836,7 +834,6 @@ if(USE_OPENCV AND OpenCV_VERSION_MAJOR GREATER 2) ${mxnet_LINKER_LIBS} ${OpenCV_LIBS} dmlc - ${pslite_LINKER_LIBS} ) else() message(WARNING "OpenCV_VERSION_MAJOR: ${OpenCV_VERSION_MAJOR}, version 3 with imgcodecs \