From ba6c1494da4dfea7f4c8698b748c746fedbb57e5 Mon Sep 17 00:00:00 2001 From: wsc Date: Thu, 20 Aug 2020 19:27:48 +0800 Subject: [PATCH] Modify structure of tar packages of mindspore-lite --- cmake/package_lite.cmake | 23 ++++++++++++----------- mindspore/lite/test/models_caffe.cfg | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index 566329be47..7645700035 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -7,15 +7,9 @@ set(OPENCV_DIR ${MAIN_DIR}/third_party/opencv) set(PROTOBF_DIR ${MAIN_DIR}/third_party/protobuf) set(FLATBF_DIR ${MAIN_DIR}/third_party/flatbuffers) -install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/ DESTINATION ${INC_DIR} COMPONENT ${COMPONENT_NAME} PATTERN "*.h") -install(DIRECTORY ${TOP_DIR}/mindspore/lite/schema/ DESTINATION ${INC_DIR}/schema COMPONENT ${COMPONENT_NAME} PATTERN "*.h") -install(FILES ${TOP_DIR}/mindspore/core/ir/dtype/type_id.h DESTINATION ${INC_DIR}/ir/dtype COMPONENT ${COMPONENT_NAME}) - install(FILES ${TOP_DIR}/mindspore/lite/build/src/libmindspore-lite.so DESTINATION ${LIB_DIR} COMPONENT ${COMPONENT_NAME}) - - if (BUILD_MINDDATA) - install(DIRECTORY ${TOP_DIR}/mindspore/ccsrc/minddata/dataset/include/ DESTINATION ${INC_DIR} COMPONENT ${COMPONENT_NAME} PATTERN "*.h") + install(DIRECTORY ${TOP_DIR}/mindspore/ccsrc/minddata/dataset/include/ DESTINATION ${INC_DIR} COMPONENT ${COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") install(FILES ${TOP_DIR}/mindspore/lite/build/minddata/libminddata-lite.so DESTINATION ${LIB_DIR} COMPONENT ${COMPONENT_NAME}) install(FILES ${TOP_DIR}/third_party/libjpeg-turbo/lib/libjpeg.so DESTINATION ${TURBO_DIR}/lib COMPONENT ${COMPONENT_NAME}) @@ -36,13 +30,20 @@ if (BUILD_MINDDATA) endif () if (PLATFORM_ARM64) + install(FILES ${TOP_DIR}/mindspore/core/ir/dtype/type_id.h DESTINATION ${INC_DIR}/ir/dtype COMPONENT ${COMPONENT_NAME}) + install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/ DESTINATION ${INC_DIR} COMPONENT ${COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") + install(DIRECTORY ${TOP_DIR}/mindspore/lite/schema/ DESTINATION ${INC_DIR}/schema COMPONENT ${COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "inner" EXCLUDE) install(FILES ${TOP_DIR}/mindspore/lite/build/src/runtime/kernel/arm/nnacl/liboptimize.so DESTINATION ${LIB_DIR} COMPONENT ${COMPONENT_NAME}) -elseif (NOT PLATFORM_ARM32) - install(DIRECTORY ${TOP_DIR}/third_party/protobuf/build/include DESTINATION ${PROTOBF_DIR} COMPONENT ${COMPONENT_NAME}) + install(DIRECTORY ${TOP_DIR}/third_party/flatbuffers/include DESTINATION ${FLATBF_DIR} COMPONENT ${COMPONENT_NAME}) +elseif (PLATFORM_ARM32) + install(FILES ${TOP_DIR}/mindspore/core/ir/dtype/type_id.h DESTINATION ${INC_DIR}/ir/dtype COMPONENT ${COMPONENT_NAME}) + install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/ DESTINATION ${INC_DIR} COMPONENT ${COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") + install(DIRECTORY ${TOP_DIR}/mindspore/lite/schema/ DESTINATION ${INC_DIR}/schema COMPONENT ${COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "inner" EXCLUDE) + install(DIRECTORY ${TOP_DIR}/third_party/flatbuffers/include DESTINATION ${FLATBF_DIR} COMPONENT ${COMPONENT_NAME}) +else () install(FILES ${TOP_DIR}/third_party/protobuf/build/lib/libprotobuf.so.19.0.0 DESTINATION ${PROTOBF_DIR}/lib RENAME libprotobuf.so.19 COMPONENT ${COMPONENT_NAME}) -endif () -install(DIRECTORY ${TOP_DIR}/third_party/flatbuffers/include DESTINATION ${FLATBF_DIR} COMPONENT ${COMPONENT_NAME}) +endif () set(CPACK_GENERATOR TGZ) set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) diff --git a/mindspore/lite/test/models_caffe.cfg b/mindspore/lite/test/models_caffe.cfg index d49e7bf759..0542bcabd5 100644 --- a/mindspore/lite/test/models_caffe.cfg +++ b/mindspore/lite/test/models_caffe.cfg @@ -53,4 +53,4 @@ hiai_semantic_seg #hiai_face_recognition_1 hiai_cpu_face_detect detect-mbv1-shortcut-400-400_nopostprocess_simplified -#detect_mbv1_640_480_nopostprecess_simplified +detect_mbv1_640_480_nopostprocess_simplified