!4693 Modify CMakeList file of lite to generate packages.

Merge pull request !4693 from wangshaocong/lite_cmake

build.sh

@@ -572,39 +572,6 @@ build_minddata_lite_deps()
   build_jpeg_turbo
 }
 
-prepare_md_lite() {
-    if [ "${COMPILE_MINDDATA_LITE}" == "on" ]; then
-    echo "packaging minddata"
-        cp ${BASEPATH}/mindspore/ccsrc/minddata/dataset/include/*h ${OUTPUT_DIR}/include/
-	cp ${BASEPATH}/mindspore/lite/build/minddata/libminddata-lite.so ${OUTPUT_DIR}/lib/
-        if [[ "$LITE_PLATFORM" == "x86_64" ]]; then
-	    mkdir -p ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib
-            cp -r ${BASEPATH}/third_party/libjpeg-turbo/lib/libjpeg.so ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib/
-            cp -r ${BASEPATH}/third_party/libjpeg-turbo/lib/libturbojpeg.so ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib/
-	    mkdir -p ${OUTPUT_DIR}/third_party/opencv/lib/
-	    cp -r ${BASEPATH}/third_party/opencv/build/lib/libopencv_core.so ${OUTPUT_DIR}/third_party/opencv/lib/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/libopencv_imgcodecs.so ${OUTPUT_DIR}/third_party/opencv/lib/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/libopencv_imgproc.so ${OUTPUT_DIR}/third_party/opencv/lib/
-        elif [[ "$LITE_PLATFORM" == "arm64" ]]; then
-            mkdir -p ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib
-            cp -r ${BASEPATH}/third_party/libjpeg-turbo/lib/libjpeg.so ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib/
-            cp -r ${BASEPATH}/third_party/libjpeg-turbo/lib/libturbojpeg.so ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib/
-            mkdir -p ${OUTPUT_DIR}/third_party/opencv/lib/arm64-v8a/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/arm64-v8a/libopencv_core.so ${OUTPUT_DIR}/third_party/opencv/lib/arm64-v8a/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/arm64-v8a/libopencv_imgcodecs.so ${OUTPUT_DIR}/third_party/opencv/lib/arm64-v8a/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/arm64-v8a/libopencv_imgproc.so ${OUTPUT_DIR}/third_party/opencv/lib/arm64-v8a/
-        elif [[ "$LITE_PLATFORM" == "arm32" ]]; then
-            mkdir -p ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib
-            cp -r ${BASEPATH}/third_party/libjpeg-turbo/lib/libjpeg.so ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib/
-            cp -r ${BASEPATH}/third_party/libjpeg-turbo/lib/libturbojpeg.so ${OUTPUT_DIR}/third_party/libjpeg-turbo/lib/
-            mkdir -p ${OUTPUT_DIR}/third_party/opencv/lib/armeabi-v7a/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/armeabi-v7a/libopencv_core.so ${OUTPUT_DIR}/third_party/opencv/lib/armeabi-v7a/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/armeabi-v7a/libopencv_imgcodecs.so ${OUTPUT_DIR}/third_party/opencv/lib/armeabi-v7a/
-            cp -r ${BASEPATH}/third_party/opencv/build/lib/armeabi-v7a/libopencv_imgproc.so ${OUTPUT_DIR}/third_party/opencv/lib/armeabi-v7a/
-        fi
-    fi
-}
-
 build_lite()
 {
     echo "start build mindspore lite project"
@@ -641,7 +608,7 @@ build_lite()
               -DANDROID_STL="c++_shared" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DSUPPORT_TRAIN=${SUPPORT_TRAIN}                     \
               -DBUILD_DEVICE=on -DPLATFORM_ARM64=on -DBUILD_CONVERTER=off -DENABLE_NEON=on -DENABLE_FP16="off"      \
               -DSUPPORT_GPU=${ENABLE_GPU} -DOFFLINE_COMPILE=${OPENCL_OFFLINE_COMPILE} -DBUILD_MINDDATA=${COMPILE_MINDDATA_LITE} \
-              "${BASEPATH}/mindspore/lite"
+              -DCMAKE_INSTALL_PREFIX=${BASEPATH}/output/tmp "${BASEPATH}/mindspore/lite"
     elif [[ "${LITE_PLATFORM}" == "arm32" ]]; then
         checkndk
         cmake -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK}/build/cmake/android.toolchain.cmake" -DANDROID_NATIVE_API_LEVEL="19"      \
@@ -649,88 +616,20 @@ build_lite()
               -DANDROID_STL="c++_shared" -DCMAKE_BUILD_TYPE=${BUILD_TYPE}                                                      \
               -DBUILD_DEVICE=on -DPLATFORM_ARM32=on -DENABLE_NEON=on -DSUPPORT_TRAIN=${SUPPORT_TRAIN} -DBUILD_CONVERTER=off    \
               -DSUPPORT_GPU=${ENABLE_GPU} -DOFFLINE_COMPILE=${OPENCL_OFFLINE_COMPILE} -DBUILD_MINDDATA=${COMPILE_MINDDATA_LITE} \
-               "${BASEPATH}/mindspore/lite"
+               -DCMAKE_INSTALL_PREFIX=${BASEPATH}/output/tmp "${BASEPATH}/mindspore/lite"
     else
         cmake -DBUILD_DEVICE=on -DPLATFORM_ARM64=off -DBUILD_CONVERTER=${ENABLE_CONVERTER} -DSUPPORT_TRAIN=${SUPPORT_TRAIN}   \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DSUPPORT_GPU=${ENABLE_GPU} -DBUILD_MINDDATA=${COMPILE_MINDDATA_LITE} \
-        -DOFFLINE_COMPILE=${OPENCL_OFFLINE_COMPILE} "${BASEPATH}/mindspore/lite"
+        -DOFFLINE_COMPILE=${OPENCL_OFFLINE_COMPILE} -DCMAKE_INSTALL_PREFIX=${BASEPATH}/output/tmp "${BASEPATH}/mindspore/lite"
     fi
-    VERBOSE=2 make -j$THREAD_NUM
+    VERBOSE=2 make -j$THREAD_NUM && make install && make package
     COMPILE_RET=$?
 
     if [[ "${COMPILE_RET}" -ne 0 ]]; then
         echo "---------------- mindspore lite: build failed ----------------"
     else
-        mkdir -pv ${BASEPATH}/mindspore/lite/output/
-        if [[ "$LITE_PLATFORM" == "x86_64" ]]; then
-            OUTPUT_DIR=${BASEPATH}/output/MSLite-0.6.0-linux_x86_64
-            rm -rf ${OUTPUT_DIR} && mkdir -p ${OUTPUT_DIR} && cd ${OUTPUT_DIR}
-            mkdir -p ${OUTPUT_DIR}/converter && mkdir -p ${OUTPUT_DIR}/time_profile
-            mkdir -p ${OUTPUT_DIR}/benchmark && mkdir -p ${OUTPUT_DIR}/include && mkdir -p ${OUTPUT_DIR}/lib
-            mkdir -p ${OUTPUT_DIR}/third_party
-	    prepare_md_lite
-            cp ${BASEPATH}/mindspore/lite/build/tools/converter/converter_lite ${OUTPUT_DIR}/converter/
-            cp ${BASEPATH}/mindspore/lite/build/tools/benchmark/benchmark ${OUTPUT_DIR}/benchmark/
-            cp ${BASEPATH}/mindspore/lite/build/tools/time_profile/timeprofile ${OUTPUT_DIR}/time_profile/
-            cp ${BASEPATH}/mindspore/lite/include/*.h ${OUTPUT_DIR}/include/
-            mkdir -p ${OUTPUT_DIR}/include/ir/dtype/
-            cp ${BASEPATH}/mindspore/core/ir/dtype/type_id.h ${OUTPUT_DIR}/include/ir/dtype/
-            mkdir -p ${OUTPUT_DIR}/include/schema/
-            cp ${BASEPATH}/mindspore/lite/schema/*.h ${OUTPUT_DIR}/include/schema/
-            cp ${BASEPATH}/mindspore/lite/build/src/libmindspore-lite.so ${OUTPUT_DIR}/lib/
-            mkdir -p ${OUTPUT_DIR}/third_party/protobuf/lib
-            cp -r ${BASEPATH}/third_party/protobuf/build/include/ ${OUTPUT_DIR}/third_party/protobuf/
-            cp -r ${BASEPATH}/third_party/protobuf/build/lib/libprotobuf.so.19.0.0 ${OUTPUT_DIR}/third_party/protobuf/lib/libprotobuf.so.19
-            mkdir -p ${OUTPUT_DIR}/third_party/flatbuffers
-            cp -r ${BASEPATH}/third_party/flatbuffers/include/ ${OUTPUT_DIR}/third_party/flatbuffers/
-            cd ..
-            tar -czf MSLite-0.6.0-linux_x86_64.tar.gz MSLite-0.6.0-linux_x86_64/ --warning=no-file-changed
-            sha256sum MSLite-0.6.0-linux_x86_64.tar.gz > MSLite-0.6.0-linux_x86_64.tar.gz.sha256
-            rm -rf MSLite-0.6.0-linux_x86_64/
-        elif [[ "$LITE_PLATFORM" == "arm64" ]]; then
-            OUTPUT_DIR=${BASEPATH}/output/MSLite-0.6.0-linux_arm64
-            rm -rf ${OUTPUT_DIR} && mkdir -p ${OUTPUT_DIR} && cd ${OUTPUT_DIR}
-            mkdir -p ${OUTPUT_DIR}/time_profile && mkdir -p ${OUTPUT_DIR}/benchmark
-            mkdir -p ${OUTPUT_DIR}/include && mkdir -p ${OUTPUT_DIR}/lib
-            mkdir -p ${OUTPUT_DIR}/third_party
-	    prepare_md_lite
-            cp ${BASEPATH}/mindspore/lite/build/tools/benchmark/benchmark ${OUTPUT_DIR}/benchmark/
-            cp ${BASEPATH}/mindspore/lite/build/tools/time_profile/timeprofile ${OUTPUT_DIR}/time_profile/
-            cp ${BASEPATH}/mindspore/lite/include/*.h ${OUTPUT_DIR}/include/
-            mkdir -p ${OUTPUT_DIR}/include/ir/dtype/
-            cp ${BASEPATH}/mindspore/core/ir/dtype/type_id.h ${OUTPUT_DIR}/include/ir/dtype/
-            mkdir -p ${OUTPUT_DIR}/include/schema/
-            cp ${BASEPATH}/mindspore/lite/schema/*.h ${OUTPUT_DIR}/include/schema/
-            cp ${BASEPATH}/mindspore/lite/build/src/libmindspore-lite.so ${OUTPUT_DIR}/lib/
-            cp ${BASEPATH}/mindspore/lite/build/src/runtime/kernel/arm/nnacl/liboptimize.so ${OUTPUT_DIR}/lib/
-            mkdir -p ${OUTPUT_DIR}/third_party/flatbuffers
-            cp -r ${BASEPATH}/third_party/flatbuffers/include/ ${OUTPUT_DIR}/third_party/flatbuffers/
-            cd ..
-            tar -czf MSLite-0.6.0-linux_arm64.tar.gz MSLite-0.6.0-linux_arm64/ --warning=no-file-changed
-            sha256sum MSLite-0.6.0-linux_arm64.tar.gz > MSLite-0.6.0-linux_arm64.tar.gz.sha256
-            rm -rf MSLite-0.6.0-linux_arm64/
-        elif [[ "$LITE_PLATFORM" == "arm32" ]]; then
-            OUTPUT_DIR=${BASEPATH}/output/MSLite-0.6.0-linux_arm32
-            rm -rf ${OUTPUT_DIR} && mkdir -p ${OUTPUT_DIR} && cd ${OUTPUT_DIR}
-            mkdir -p ${OUTPUT_DIR}/time_profile && mkdir -p ${OUTPUT_DIR}/benchmark
-            mkdir -p ${OUTPUT_DIR}/include && mkdir -p ${OUTPUT_DIR}/lib
-            mkdir -p ${OUTPUT_DIR}/third_party
-	    prepare_md_lite
-            cp ${BASEPATH}/mindspore/lite/build/tools/benchmark/benchmark ${OUTPUT_DIR}/benchmark/
-            cp ${BASEPATH}/mindspore/lite/build/tools/time_profile/timeprofile ${OUTPUT_DIR}/time_profile/
-            cp ${BASEPATH}/mindspore/lite/include/*.h ${OUTPUT_DIR}/include/
-            mkdir -p ${OUTPUT_DIR}/include/ir/dtype/
-            cp ${BASEPATH}/mindspore/core/ir/dtype/type_id.h ${OUTPUT_DIR}/include/ir/dtype/
-            mkdir -p ${OUTPUT_DIR}/include/schema/
-            cp ${BASEPATH}/mindspore/lite/schema/*.h ${OUTPUT_DIR}/include/schema/
-            cp ${BASEPATH}/mindspore/lite/build/src/libmindspore-lite.so ${OUTPUT_DIR}/lib/
-            mkdir -p ${OUTPUT_DIR}/third_party/flatbuffers
-            cp -r ${BASEPATH}/third_party/flatbuffers/include/ ${OUTPUT_DIR}/third_party/flatbuffers/
-            cd ..
-            tar -czf MSLite-0.6.0-linux_arm32.tar.gz MSLite-0.6.0-linux_arm32/ --warning=no-file-changed
-            sha256sum MSLite-0.6.0-linux_arm32.tar.gz > MSLite-0.6.0-linux_arm32.tar.gz.sha256
-            rm -rf MSLite-0.6.0-linux_arm32/
-        fi
+        mv ${BASEPATH}/output/tmp/*.tar.gz* ${BASEPATH}/output/
+        rm -rf ${BASEPATH}/output/tmp/
         echo "---------------- mindspore lite: build success ----------------"
     fi
 }

cmake/package_lite.cmake

@@ -0,0 +1,53 @@
+include(CMakePackageConfigHelpers)
+
+set(LIB_DIR ${MAIN_DIR}/lib)
+set(INC_DIR ${MAIN_DIR}/include)
+set(TURBO_DIR ${MAIN_DIR}/third_party/libjpeg-turbo)
+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(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})
+    install(FILES ${TOP_DIR}/third_party/libjpeg-turbo/lib/libturbojpeg.so DESTINATION ${TURBO_DIR}/lib COMPONENT ${COMPONENT_NAME})
+    if (PLATFORM_ARM64)
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/arm64-v8a/libopencv_core.so DESTINATION ${OPENCV_DIR}/lib/arm64-v8a COMPONENT ${COMPONENT_NAME})
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/arm64-v8a/libopencv_imgcodecs.so DESTINATION ${OPENCV_DIR}/lib/arm64-v8a COMPONENT ${COMPONENT_NAME})
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/arm64-v8a/libopencv_imgproc.so DESTINATION ${OPENCV_DIR}/lib/arm64-v8a COMPONENT ${COMPONENT_NAME})
+    elseif (PLATFORM_ARM32)
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/armeabi-v7a/libopencv_core.so DESTINATION ${OPENCV_DIR}/lib/armeabi-v7a COMPONENT ${COMPONENT_NAME})
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/armeabi-v7a/libopencv_imgcodecs.so DESTINATION ${OPENCV_DIR}/lib/armeabi-v7a COMPONENT ${COMPONENT_NAME})
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/armeabi-v7a/libopencv_imgproc.so DESTINATION ${OPENCV_DIR}/lib/armeabi-v7a COMPONENT ${COMPONENT_NAME})
+    else ()
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/libopencv_core.so DESTINATION ${OPENCV_DIR}/lib COMPONENT ${COMPONENT_NAME})
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/libopencv_imgcodecs.so DESTINATION ${OPENCV_DIR}/lib COMPONENT ${COMPONENT_NAME})
+        install(FILES ${TOP_DIR}/third_party/opencv/build/lib/libopencv_imgproc.so DESTINATION ${OPENCV_DIR}/lib COMPONENT ${COMPONENT_NAME})
+    endif ()
+endif ()
+
+if (PLATFORM_ARM64)
+    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(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})
+
+set(CPACK_GENERATOR TGZ)
+set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+set(CPACK_COMPONENTS_ALL ${COMPONENT_NAME})
+set(CPACK_PACKAGE_FILE_NAME ${MAIN_DIR})
+set(CPACK_PACKAGE_DIRECTORY ${TOP_DIR}/output/tmp)
+set(CPACK_PACKAGE_CHECKSUM SHA256)
+include(CPack)

mindspore/lite/CMakeLists.txt

@@ -5,6 +5,28 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_
     message(FATAL_ERROR "GCC vesion ${CMAKE_CXX_COMPILER_VERSION} must not be less than 7.3.0")
 endif ()
 
+set(MS_VERSION_MAJOY 0)
+set(MS_VERSION_MINOR 6)
+set(MS_VERSION_REVISION 0)
+
+set(DIR_PREFIX mindspore-lite)
+set(MS_VERSION ${MS_VERSION_MAJOY}.${MS_VERSION_MINOR}.${MS_VERSION_REVISION})
+set(MAIN_DIR ${DIR_PREFIX}-${MS_VERSION})
+
+if (SUPPORT_GPU)
+    set(PROCESS_UNIT gpu)
+else ()
+    set(PROCESS_UNIT cpu)
+endif ()
+
+if (PLATFORM_ARM64)
+    set(COMPONENT_NAME runtime-arm64-${PROCESS_UNIT})
+elseif (PLATFORM_ARM32)
+    set(COMPONENT_NAME runtime-arm32-${PROCESS_UNIT})
+else ()
+    set(COMPONENT_NAME convert-ubuntu)
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 set(TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 set(CORE_DIR ${TOP_DIR}/mindspore/core)
@@ -157,3 +179,5 @@ if (BUILD_DEVICE)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/time_profile)
 endif()
+
+include(${TOP_DIR}/cmake/package_lite.cmake)

mindspore/lite/test/run_benchmark_nets.sh

@@ -9,8 +9,8 @@ function Run_x86() {
           continue
         fi
         echo ${model_name}
-        echo 'cd  '${convertor_path}'/MSLite-*-linux_x86_64'
-        cd ${convertor_path}/MSLite-*-linux_x86_64 || return 1
+        echo 'cd  '${convertor_path}'/mindspore-lite-'${version}'-convert-ubuntu'
+        cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || return 1
         echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath='${ms_models_path}'/'${model_name}'.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/'${model_name}'.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1' || return 1
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath=${ms_models_path}/${model_name}.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/${model_name}.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/${model_name}.ms.out --warmUpLoopCount=1 --loopCount=1
         if [ $? = 0 ]; then
@@ -30,8 +30,8 @@ function Run_x86() {
           continue
         fi
         echo ${model_name}
-        echo 'cd  '${convertor_path}'/MSLite-*-linux_x86_64'
-        cd ${convertor_path}/MSLite-*-linux_x86_64 || return 1
+        echo 'cd  '${convertor_path}'/mindspore-lite-'${version}'-convert-ubuntu'
+        cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || return 1
         echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath='${ms_models_path}'/'${model_name}'.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/'${model_name}'.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1' || return 1
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath=${ms_models_path}/${model_name}.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/${model_name}.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/${model_name}.ms.out --warmUpLoopCount=1 --loopCount=1
         if [ $? = 0 ]; then
@@ -51,8 +51,8 @@ function Run_x86() {
           continue
         fi
         echo ${model_name}
-        echo 'cd  '${convertor_path}'/MSLite-*-linux_x86_64'
-        cd ${convertor_path}/MSLite-*-linux_x86_64 || return 1
+        echo 'cd  '${convertor_path}'/mindspore-lite-'${version}'-convert-ubuntu'
+        cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || return 1
         echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath='${ms_models_path}'/'${model_name}'.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/'${model_name}'.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1' || return 1
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath=${ms_models_path}/${model_name}.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/${model_name}.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/${model_name}.ms.out --warmUpLoopCount=1 --loopCount=1
         if [ $? = 0 ]; then
@@ -72,8 +72,8 @@ function Run_x86() {
           continue
         fi
         echo ${model_name}
-        echo 'cd  '${convertor_path}'/MSLite-*-linux_x86_64'
-        cd ${convertor_path}/MSLite-*-linux_x86_64 || return 1
+        echo 'cd  '${convertor_path}'/mindspore-lite-'${version}'-convert-ubuntu'
+        cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || return 1
         echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath='${ms_models_path}'/'${model_name}'_posttraining.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/quantTraining/mnist_calibration_data/00099.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/'${model_name}'_posttraining.ms.out --warmUpLoopCount=1 --loopCount=1' || return 1
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath=${ms_models_path}/${model_name}_posttraining.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/quantTraining/mnist_calibration_data/00099.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/${model_name}_posttraining.ms.out --warmUpLoopCount=1 --loopCount=1
         if [ $? = 0 ]; then
@@ -93,8 +93,8 @@ function Run_x86() {
           continue
         fi
         echo ${model_name}
-        echo 'cd  '${convertor_path}'/MSLite-*-linux_x86_64'
-        cd ${convertor_path}/MSLite-*-linux_x86_64 || return 1
+        echo 'cd  '${convertor_path}'/mindspore-lite-'${version}'-convert-ubuntu'
+        cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || return 1
         echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath='${ms_models_path}'/'${model_name}'.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/${model_name}.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1 --numThreads=1' || return 1
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath=${ms_models_path}/${model_name}.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/${model_name}.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/${model_name}.ms.out --warmUpLoopCount=1 --loopCount=1 --numThreads=1
         if [ $? = 0 ]; then
@@ -114,8 +114,8 @@ function Run_x86() {
           continue
         fi
         echo ${model_name}
-        echo 'cd  '${convertor_path}'/MSLite-*-linux_x86_64'
-        cd ${convertor_path}/MSLite-*-linux_x86_64 || return 1
+        echo 'cd  '${convertor_path}'/mindspore-lite-'${version}'-convert-ubuntu'
+        cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || return 1
         echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath='${ms_models_path}'/'${model_name}'.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/'${model_name}'.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/'${model_name}'.ms.out --warmUpLoopCount=1 --loopCount=1' || return 1
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./lib;./benchmark/benchmark --modelPath=${ms_models_path}/${model_name}.ms --inDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/input/${model_name}.ms.bin --calibDataPath=/home/workspace/mindspore_dataset/mslite/models/hiai/input_output/output/${model_name}.ms.out --warmUpLoopCount=1 --loopCount=1 --accuracyThreshold=1.5
         if [ $? = 0 ]; then
@@ -241,19 +241,27 @@ while getopts "a:c:m:d:" opt; do
     esac
 done
 
+file_name=$(ls ${arm_path}/*runtime-arm64*.tar.gz)
+IFS="-" read -r -a file_name_array <<< "$file_name"
+version=${file_name_array[2]}
+IFS="." read -r -a suffix <<< "${file_name_array[-1]}"
+process_unit=${suffix[0]}
+
 # Unzip arm
 cd ${arm_path} || exit 1
-tar -zxf MSLite-*-linux_arm64.tar.gz || exit 1
+mkdir mindspore-lite-${version}-runtime-arm64-${process_unit}
+tar -zxf mindspore-lite-${version}-runtime-arm64-${process_unit}.tar.gz -C mindspore-lite-${version}-runtime-arm64-${process_unit} --strip-components 1 || exit 1
 
 # Unzip convertor
 cd ${convertor_path} || exit 1
-tar -zxf MSLite-*-linux_x86_64.tar.gz || exit 1
-cd ${convertor_path}/MSLite-*-linux_x86_64 || exit 1
+mkdir mindspore-lite-${version}-convert-ubuntu
+tar -zxf mindspore-lite-${version}-convert-ubuntu.tar.gz -C mindspore-lite-${version}-convert-ubuntu --strip-components 1 || exit 1
+cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || exit 1
 cp converter/converter_lite ./ || exit 1
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:./lib/:./third_party/protobuf/lib
 
 # Convert the models
-cd ${convertor_path}/MSLite-*-linux_x86_64 || exit 1
+cd ${convertor_path}/mindspore-lite-${version}-convert-ubuntu || exit 1
 
 # Set models config filepath
 models_tflite_config=${basepath}/models_tflite.cfg
@@ -342,8 +350,8 @@ rm -rf ${basepath}/benchmark_test
 mkdir -p ${basepath}/benchmark_test
 benchmark_test_path=${basepath}/benchmark_test
 cd ${benchmark_test_path} || exit 1
-cp -a ${arm_path}/MSLite-*-linux_arm64/lib/libmindspore-lite.so ${benchmark_test_path}/libmindspore-lite.so || exit 1
-cp -a ${arm_path}/MSLite-*-linux_arm64/benchmark/benchmark ${benchmark_test_path}/benchmark || exit 1
+cp -a ${arm_path}/mindspore-lite-${version}-runtime-arm64-${process_unit}/lib/libmindspore-lite.so ${benchmark_test_path}/libmindspore-lite.so || exit 1
+cp -a ${arm_path}/mindspore-lite-${version}-runtime-arm64-${process_unit}/benchmark/benchmark ${benchmark_test_path}/benchmark || exit 1
 
 # Copy the MindSpore models:
 cp -a ${ms_models_path}/*.ms ${benchmark_test_path} || exit 1

mindspore/lite/tools/benchmark/CMakeLists.txt

@@ -15,3 +15,6 @@ if (PLATFORM_ARM32 OR PLATFORM_ARM64)
 else()
     target_link_libraries(benchmark mindspore-lite pthread)
 endif()
+
+install(TARGETS benchmark
+        RUNTIME DESTINATION ${MAIN_DIR}/benchmark COMPONENT ${COMPONENT_NAME})

mindspore/lite/tools/converter/CMakeLists.txt

@@ -115,3 +115,7 @@ target_link_libraries(converter_lite PRIVATE
         mindspore::eigen
         )
 
+if (NOT PLATFORM_arm64 AND NOT PLATFORM_arm32)
+    install(TARGETS converter_lite
+            RUNTIME DESTINATION ${MAIN_DIR}/converter COMPONENT ${COMPONENT_NAME})
+endif ()

mindspore/lite/tools/time_profile/CMakeLists.txt

@@ -16,3 +16,6 @@ if (PLATFORM_ARM32 OR PLATFORM_ARM64)
 else()
     target_link_libraries(timeprofile mindspore-lite pthread)
 endif()
+
+install(TARGETS timeprofile
+        RUNTIME DESTINATION ${MAIN_DIR}/time_profile COMPONENT ${COMPONENT_NAME})