diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index 33454852125..20d2251bbac 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -365,6 +365,8 @@ else() if(MSLITE_ENABLE_CONVERTER) install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/registry/ DESTINATION ${CONVERTER_ROOT_DIR}/include/registry COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") + install(DIRECTORY ${glog_LIBPATH}/../include/glog/ DESTINATION ${CONVERTER_ROOT_DIR}/include/third_party/glog + COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") install(TARGETS converter_lite RUNTIME DESTINATION ${CONVERTER_ROOT_DIR}/converter COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${TOP_DIR}/mindspore/lite/build/tools/converter/registry/libmslite_converter_plugin.so @@ -430,8 +432,8 @@ else() file(GLOB PROTOBUF_LIB_PATH ${TOP_DIR}/mindspore/lite/build/.mslib/protobuf_*/lib/libprotobuf.a) install(FILES ${PROTOBUF_LIB_PATH} DESTINATION ${CONVERTER_ROOT_DIR}/lib COMPONENT ${RUNTIME_COMPONENT_NAME}) - file(GLOB CYTPO_LIB_PATH ${TOP_DIR}/mindspore/lite/build/.mslib/openssl_*/lib/libcypto.a) - install(FILES ${CYPTO_LIB_PATH} DESTINATION ${CONVERTER_ROOT_DIR}/lib + file(GLOB CRYPTO_LIB_PATH ${TOP_DIR}/mindspore/lite/build/.mslib/openssl_*/lib/libcrypto.a) + install(FILES ${CRYPTO_LIB_PATH} DESTINATION ${CONVERTER_ROOT_DIR}/lib COMPONENT ${RUNTIME_COMPONENT_NAME}) endif() if(NOT SUPPORT_TRAIN AND MSLITE_ENABLE_NNIE) diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 42a780304a1..1bd1ac0508a 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -259,7 +259,7 @@ if(WIN32) add_compile_definitions(BUILDING_DLL) endif() -if(ENABLE_MINDRT) +if(ENABLE_MINDRT OR TARGET_HIMIX200) include_directories(${CORE_DIR}/mindrt/include) include_directories(${CORE_DIR}/mindrt/src) endif() diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index 769da87f785..13c81dd0032 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -145,6 +145,15 @@ if(ENABLE_MINDRT) ${CMAKE_CURRENT_SOURCE_DIR}/lite_mindrt.cc ${CMAKE_CURRENT_SOURCE_DIR}/mindrt_executor.cc ) +elseif(TARGET_HIMIX200) + file(GLOB MINDRT_ACTOR ${CORE_DIR}/mindrt/src/actor/*.cc) + set(LITE_SRC + ${LITE_SRC} + ${MINDRT_ACTOR} + ${CORE_DIR}/mindrt/src/thread/core_affinity.cc + ${CORE_DIR}/mindrt/src/thread/actor_threadpool.cc + ${CORE_DIR}/mindrt/src/thread/threadpool.cc + ) endif() add_subdirectory(ops) diff --git a/mindspore/lite/tools/providers/NNIE/Hi3516D/benchmark b/mindspore/lite/tools/providers/NNIE/Hi3516D/benchmark index dba8ffe1413..cf9681a3f9c 100644 Binary files a/mindspore/lite/tools/providers/NNIE/Hi3516D/benchmark and b/mindspore/lite/tools/providers/NNIE/Hi3516D/benchmark differ diff --git a/mindspore/lite/tools/providers/NNIE/Hi3516D/libmslite_nnie.so b/mindspore/lite/tools/providers/NNIE/Hi3516D/libmslite_nnie.so index 83a24fc6d54..6a2c476b004 100644 Binary files a/mindspore/lite/tools/providers/NNIE/Hi3516D/libmslite_nnie.so and b/mindspore/lite/tools/providers/NNIE/Hi3516D/libmslite_nnie.so differ diff --git a/mindspore/lite/tools/providers/NNIE/Hi3516D/libnnie_proposal.so b/mindspore/lite/tools/providers/NNIE/Hi3516D/libnnie_proposal.so index 2a6ad6729ed..5b3063c6b04 100644 Binary files a/mindspore/lite/tools/providers/NNIE/Hi3516D/libnnie_proposal.so and b/mindspore/lite/tools/providers/NNIE/Hi3516D/libnnie_proposal.so differ