refine cmake

CMakeLists.txt

@@ -128,14 +128,13 @@ if (NOT CLIENT_ONLY)
 endif()
 
 add_subdirectory(core)
+
 if(NOT CLIENT_ONLY)
 add_subdirectory(paddle_inference)
 endif()
 
-if(CLIENT_ONLY)
 add_subdirectory(python)
 set(PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE})
 set(PYTHON_LIBRARIES ${PYTHON_LIB})
-endif()
 
 add_subdirectory(examples)

cmake/paddlepaddle.cmake

@@ -62,8 +62,8 @@ ExternalProject_Add(
     INSTALL_COMMAND
         ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/paddle/include ${PADDLE_INSTALL_DIR}/include &&
         ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/paddle/lib ${PADDLE_INSTALL_DIR}/lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/third_party ${PADDLE_INSTALL_DIR}/third_party &&
-        ${CMAKE_COMMAND} -E copy ${PADDLE_INSTALL_DIR}/third_party/install/mkldnn/lib/libmkldnn.so.0 ${PADDLE_INSTALL_DIR}/third_party/install/mkldnn/lib/libmkldnn.so
+        ${CMAKE_COMMAND} -E copy_directory ${PADDLE_DOWNLOAD_DIR}/third_party ${PADDLE_INSTALL_DIR}/third_party 
+        #${CMAKE_COMMAND} -E copy ${PADDLE_INSTALL_DIR}/third_party/install/mkldnn/lib/libmkldnn.so.0 ${PADDLE_INSTALL_DIR}/third_party/install/mkldnn/lib/libmkldnn.so
 )
 
 INCLUDE_DIRECTORIES(${PADDLE_INCLUDE_DIR})

core/configure/CMakeLists.txt

@@ -37,3 +37,14 @@ add_custom_command(TARGET sdk_configure_py_proto POST_BUILD
 		COMMAND cp *.py ${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving/proto
 		COMMENT "Copy generated python proto into directory paddle_serving/proto."
 		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+if (NOT CLIENT_ONLY)
+py_proto_compile(server_config_py_proto SRCS proto/server_configure.proto)
+add_custom_target(server_config_py_proto_init ALL COMMAND ${CMAKE_COMMAND} -E touch __init__.py)
+add_dependencies(server_config_py_proto server_config_py_proto_init)
+add_custom_command(TARGET server_config_py_proto POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving/proto
+		COMMAND cp *.py ${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving/proto
+		COMMENT "Copy generated python proto into directory paddle_serving/proto."
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINRARY_DIR})
+endif()

python/CMakeLists.txt

@@ -23,7 +23,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.server.in
 endif()
 
 set(SERVING_CLIENT_CORE ${PADDLE_SERVING_BINARY_DIR}/core/general-client/serving_client.so)
-set(SERVING_SERVER_CORE ${PADDLE_SERVING_BINARY_DIR}/core/predictor/serving_server.so)
 
 message("python env: " ${py_env})
 
@@ -41,10 +40,9 @@ if (NOT CLIENT_ONLY)
 add_custom_command(
    	OUTPUT ${PADDLE_SERVING_BINARY_DIR}/.timestamp
 	COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/paddle_serving/ ${PADDLE_SERVING_BINARY_DIR}/python/
-	COMMAND ${CMAKE_COMMAND} -E copy ${PADDLE_SERVING_BINARY_DIR}/core/predictor/serving_server.so ${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving/serving_server/
 	COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel
 	DEPENDS ${SERVING_SERVER_CORE} server_config_py_proto ${PY_FILES})
-add_custom_target(paddle_python ALL DEPENDS serving_server ${PADDLE_SERVING_BINARY_DIR}/.timestamp)
+add_custom_target(paddle_python ALL DEPENDS ${PADDLE_SERVING_BINARY_DIR}/.timestamp)
 endif()
 
 set(SERVING_CLIENT_PYTHON_PACKAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/dist/)