Browse Source

fix python import

tags/v0.7.0-beta
hexia 5 years ago
parent
commit
0792ceeeef
2 changed files with 15 additions and 1 deletions
  1. +7
    -0
      cmake/package.cmake
  2. +8
    -1
      serving/CMakeLists.txt

+ 7
- 0
cmake/package.cmake View File

@@ -278,6 +278,13 @@ if (ENABLE_SERVING)
COMPONENT mindspore 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( install(
TARGETS inference TARGETS inference
DESTINATION ${INSTALL_LIB_DIR} DESTINATION ${INSTALL_LIB_DIR}


+ 8
- 1
serving/CMakeLists.txt View File

@@ -36,14 +36,15 @@ set(_REFLECTION gRPC::grpc++_reflection)


if (CMAKE_CROSSCOMPILING) if (CMAKE_CROSSCOMPILING)
find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin) find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
find_program(_GRPC_PYTHON_PLUGIN_EXECUTABLE grpc_python_plugin)
else () else ()
set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:gRPC::grpc_cpp_plugin>) set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
set(_GRPC_PYTHON_PLUGIN_EXECUTABLE $<TARGET_FILE:gRPC::grpc_python_plugin>)
endif () endif ()


# Proto file # Proto file
get_filename_component(hw_proto "ms_service.proto" ABSOLUTE) get_filename_component(hw_proto "ms_service.proto" ABSOLUTE)
get_filename_component(hw_proto_path "${hw_proto}" PATH) get_filename_component(hw_proto_path "${hw_proto}" PATH)

# Generated sources # Generated sources
set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/ms_service.pb.cc") set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/ms_service.pb.cc")
set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/ms_service.pb.h") set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/ms_service.pb.h")
@@ -57,6 +58,12 @@ add_custom_command(
-I "${hw_proto_path}" -I "${hw_proto_path}"
--plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}" --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
"${hw_proto}" "${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}") DEPENDS "${hw_proto}")


# Include generated *.pb.h files # Include generated *.pb.h files


Loading…
Cancel
Save