diff --git a/cmake/package.cmake b/cmake/package.cmake index c0cf0f23e623da488f4d57bf0259df74031bc46e..18e365c91e5b68ed18850ee952d5d58586ec60f5 100644 --- a/cmake/package.cmake +++ b/cmake/package.cmake @@ -278,6 +278,13 @@ if (ENABLE_SERVING) COMPONENT mindspore ) + file(GLOB MS_SERVING_PY_LIST ${CMAKE_SOURCE_DIR}/serving/*.py) + install( + FILES ${MS_SERVING_PY_LIST} + DESTINATION ${INSTALL_PY_DIR} + COMPONENT mindspore + ) + install( TARGETS inference DESTINATION ${INSTALL_LIB_DIR} diff --git a/serving/CMakeLists.txt b/serving/CMakeLists.txt index c9c41d4f899c3b5d4d41e36314d9b508c60a7fdc..860b4defdb1079eec34b74d209fce2280f0cf652 100644 --- a/serving/CMakeLists.txt +++ b/serving/CMakeLists.txt @@ -36,14 +36,15 @@ set(_REFLECTION gRPC::grpc++_reflection) if (CMAKE_CROSSCOMPILING) find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) + find_program(_GRPC_PYTHON_PLUGIN_EXECUTABLE grpc_python_plugin) else () set(_GRPC_CPP_PLUGIN_EXECUTABLE $) + set(_GRPC_PYTHON_PLUGIN_EXECUTABLE $) endif () # Proto file get_filename_component(hw_proto "ms_service.proto" ABSOLUTE) get_filename_component(hw_proto_path "${hw_proto}" PATH) - # Generated sources set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/ms_service.pb.cc") set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/ms_service.pb.h") @@ -57,6 +58,12 @@ add_custom_command( -I "${hw_proto_path}" --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}" "${hw_proto}" + COMMAND ${_PROTOBUF_PROTOC} + ARGS --grpc_out "${PROJECT_SOURCE_DIR}/serving/" + --python_out "${PROJECT_SOURCE_DIR}/serving/" + -I "${hw_proto_path}" + --plugin=protoc-gen-grpc="${_GRPC_PYTHON_PLUGIN_EXECUTABLE}" + "${hw_proto}" DEPENDS "${hw_proto}") # Include generated *.pb.h files