!19139 [MSLITE] Disable mindrt for nnie.

Merge pull request !19139 from wangshaocong/nnie_to_master
This commit is contained in:
i-robot 2021-07-01 01:20:01 +00:00 committed by Gitee
commit 3ad613e9e2
6 changed files with 14 additions and 3 deletions

View File

@ -365,6 +365,8 @@ else()
if(MSLITE_ENABLE_CONVERTER) if(MSLITE_ENABLE_CONVERTER)
install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/registry/ DESTINATION ${CONVERTER_ROOT_DIR}/include/registry install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/registry/ DESTINATION ${CONVERTER_ROOT_DIR}/include/registry
COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") 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 install(TARGETS converter_lite RUNTIME DESTINATION ${CONVERTER_ROOT_DIR}/converter
COMPONENT ${RUNTIME_COMPONENT_NAME}) COMPONENT ${RUNTIME_COMPONENT_NAME})
install(FILES ${TOP_DIR}/mindspore/lite/build/tools/converter/registry/libmslite_converter_plugin.so 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) 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 install(FILES ${PROTOBUF_LIB_PATH} DESTINATION ${CONVERTER_ROOT_DIR}/lib
COMPONENT ${RUNTIME_COMPONENT_NAME}) COMPONENT ${RUNTIME_COMPONENT_NAME})
file(GLOB CYTPO_LIB_PATH ${TOP_DIR}/mindspore/lite/build/.mslib/openssl_*/lib/libcypto.a) file(GLOB CRYPTO_LIB_PATH ${TOP_DIR}/mindspore/lite/build/.mslib/openssl_*/lib/libcrypto.a)
install(FILES ${CYPTO_LIB_PATH} DESTINATION ${CONVERTER_ROOT_DIR}/lib install(FILES ${CRYPTO_LIB_PATH} DESTINATION ${CONVERTER_ROOT_DIR}/lib
COMPONENT ${RUNTIME_COMPONENT_NAME}) COMPONENT ${RUNTIME_COMPONENT_NAME})
endif() endif()
if(NOT SUPPORT_TRAIN AND MSLITE_ENABLE_NNIE) if(NOT SUPPORT_TRAIN AND MSLITE_ENABLE_NNIE)

View File

@ -259,7 +259,7 @@ if(WIN32)
add_compile_definitions(BUILDING_DLL) add_compile_definitions(BUILDING_DLL)
endif() endif()
if(ENABLE_MINDRT) if(ENABLE_MINDRT OR TARGET_HIMIX200)
include_directories(${CORE_DIR}/mindrt/include) include_directories(${CORE_DIR}/mindrt/include)
include_directories(${CORE_DIR}/mindrt/src) include_directories(${CORE_DIR}/mindrt/src)
endif() endif()

View File

@ -145,6 +145,15 @@ if(ENABLE_MINDRT)
${CMAKE_CURRENT_SOURCE_DIR}/lite_mindrt.cc ${CMAKE_CURRENT_SOURCE_DIR}/lite_mindrt.cc
${CMAKE_CURRENT_SOURCE_DIR}/mindrt_executor.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() endif()
add_subdirectory(ops) add_subdirectory(ops)