From 923e33ce5a7c6b5a5d2b64c82f81303263a823c2 Mon Sep 17 00:00:00 2001 From: chenping Date: Sat, 26 Mar 2022 10:50:18 +0800 Subject: [PATCH] Ascend710 online compile bugfix --- cmake/package_lite.cmake | 12 ++++++------ mindspore/lite/src/CMakeLists.txt | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index 1646f531bc6..517f4042656 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -718,12 +718,12 @@ else() DESTINATION ${RUNTIME_LIB_DIR} RENAME libturbojpeg.so.0 COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${tinyxml2_LIBPATH}/libtinyxml2.so.8.0.0 DESTINATION ${RUNTIME_LIB_DIR} RENAME libtinyxml2.so.8 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${icu4c_LIBPATH}/libicuuc.so.67.1 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libicuuc.so.67 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${icu4c_LIBPATH}/libicudata.so.67.1 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libicudata.so.67 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${icu4c_LIBPATH}/libicui18n.so.67.1 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libicui18n.so.67 COMPONENT ${RUNTIME_COMPONENT_NAME}) + install(FILES ${icu4c_LIBPATH}/libicuuc.so.69.1 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libicuuc.so.69 COMPONENT ${RUNTIME_COMPONENT_NAME}) + install(FILES ${icu4c_LIBPATH}/libicudata.so.69.1 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libicudata.so.69 COMPONENT ${RUNTIME_COMPONENT_NAME}) + install(FILES ${icu4c_LIBPATH}/libicui18n.so.69.1 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libicui18n.so.69 COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${grpc_LIBPATH}/libmindspore_grpc++.so.1.36.1 DESTINATION ${RUNTIME_LIB_DIR} RENAME libmindspore_grpc++.so.1 COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${grpc_LIBPATH}/libmindspore_grpc.so.15.0.0 DESTINATION diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index 5b6c5be119a..b64ef38e4ed 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -6,7 +6,9 @@ include_directories(${CCSRC_DIR}/plugin/device/cpu/kernel) include_directories(${CORE_DIR}) set(TOOLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../tools) -add_compile_definitions(BUILD_LITE_INFERENCE) +if(NOT MSLITE_ENABLE_RUNTIME_CONVERT) + add_compile_definitions(BUILD_LITE_INFERENCE) +endif() if(NOT MSLITE_ENABLE_STRING_KERNEL) add_compile_definitions(STRING_KERNEL_CLIP) endif()