rename pkg simple

build.sh

@@ -565,6 +565,12 @@ build_lite()
 {
     get_version
     echo "============ Start building MindSpore Lite ${VERSION_STR} ============"
+
+    LITE_ENABLE_GPU=${ENABLE_GPU}
+    if [[ "${DEVICE}" == "" && "${LITE_PLATFORM}" == "arm64" ]]; then
+      LITE_ENABLE_GPU="on"
+    fi
+
     if [ "${ENABLE_GPU}" == "on" ] && [ "${LITE_PLATFORM}" == "arm64" ] || [ $1 == "arm64" ]; then
       echo "start build opencl"
     fi
@@ -590,7 +596,7 @@ build_lite()
               -DANDROID_STL=${ANDROID_STL} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DSUPPORT_TRAIN=${SUPPORT_TRAIN}                     \
               -DPLATFORM_ARM64=on -DENABLE_NEON=on -DENABLE_FP16="off"      \
               -DENABLE_TOOLS=${ENABLE_TOOLS} -DENABLE_CONVERTER=${ENABLE_CONVERTER} -DBUILD_TESTCASES=${RUN_TESTCASES} \
-              -DSUPPORT_GPU=${ENABLE_GPU} -DSUPPORT_NPU=${ENABLE_NPU} \
+              -DSUPPORT_GPU=${LITE_ENABLE_GPU} -DSUPPORT_NPU=${ENABLE_NPU} \
               -DOFFLINE_COMPILE=${OPENCL_OFFLINE_COMPILE} -DBUILD_MINDDATA=${COMPILE_MINDDATA_LITE} \
               -DCMAKE_INSTALL_PREFIX=${BASEPATH}/output/tmp -DMS_VERSION_MAJOR=${VERSION_MAJOR}                           \
               -DMS_VERSION_MINOR=${VERSION_MINOR} -DMS_VERSION_REVISION=${VERSION_REVISION} -DENABLE_VERBOSE=${ENABLE_VERBOSE} \
@@ -633,33 +639,33 @@ build_lite()
 
 build_lite_java_arm64() {
     # build mindspore-lite arm64
-    if [[ "X$INC_BUILD" = "Xoff" ]] || [[ ! -f "${BASEPATH}/output/mindspore-lite-${VERSION_STR}-runtime-arm64-cpu.tar.gz" ]]; then
+    if [[ "X$INC_BUILD" = "Xoff" ]] || [[ ! -f "${BASEPATH}/output/mindspore-lite-${VERSION_STR}-inference-android-aarch64.tar.gz" ]]; then
       build_lite "arm64" "off"
     fi
     # copy arm64 so
     cd ${BASEPATH}/output/
-    rm -rf mindspore-lite-${VERSION_STR}-runtime-arm64-cpu
-    tar -zxvf mindspore-lite-${VERSION_STR}-runtime-arm64-cpu.tar.gz
+    rm -rf mindspore-lite-${VERSION_STR}-inference-android-aarch64
+    tar -zxvf mindspore-lite-${VERSION_STR}-inference-android-aarch64.tar.gz
     [ -n "${JAVA_PATH}" ] && rm -rf ${JAVA_PATH}/java/app/libs/arm64-v8a/
     mkdir -p ${JAVA_PATH}/java/app/libs/arm64-v8a/
-    cp ${BASEPATH}/output/mindspore-lite-${VERSION_STR}-runtime-arm64-cpu/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
-    echo mindspore-lite-${VERSION_STR}-runtime-arm64-cpu
-    [ -n "${VERSION_STR}" ] && rm -rf mindspore-lite-${VERSION_STR}-runtime-arm64-cpu
+    cp ${BASEPATH}/output/mindspore-lite-${VERSION_STR}-inference-android-aarch64/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/arm64-v8a/
+    echo mindspore-lite-${VERSION_STR}-inference-android-aarch64
+    [ -n "${VERSION_STR}" ] && rm -rf mindspore-lite-${VERSION_STR}-inference-android-aarch64
 }
 
 build_lite_java_arm32() {
     # build mindspore-lite arm32
-    if [[ "X$INC_BUILD" = "Xoff" ]] || [[ ! -f "${BASEPATH}/output/mindspore-lite-${VERSION_STR}-runtime-arm32-cpu.tar.gz" ]]; then
+    if [[ "X$INC_BUILD" = "Xoff" ]] || [[ ! -f "${BASEPATH}/output/mindspore-lite-${VERSION_STR}-inference-android-aarch32.tar.gz" ]]; then
       build_lite  "arm32" "off"
     fi
     # copy arm32 so
     cd ${BASEPATH}/output/
-    rm -rf mindspore-lite-${VERSION_STR}-runtime-arm32-cpu
-    tar -zxvf mindspore-lite-${VERSION_STR}-runtime-arm32-cpu.tar.gz
+    rm -rf mindspore-lite-${VERSION_STR}-inference-android-aarch32
+    tar -zxvf mindspore-lite-${VERSION_STR}-inference-android-aarch32.tar.gz
     [ -n "${JAVA_PATH}" ] && rm -rf ${JAVA_PATH}/java/app/libs/armeabi-v7a/
     mkdir -p ${JAVA_PATH}/java/app/libs/armeabi-v7a/
-    cp ${BASEPATH}/output/mindspore-lite-${VERSION_STR}-runtime-arm32-cpu/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
-    [ -n "${VERSION_STR}" ] && rm -rf mindspore-lite-${VERSION_STR}-runtime-arm32-cpu
+    cp ${BASEPATH}/output/mindspore-lite-${VERSION_STR}-inference-android-aarch32/lib/libmindspore-lite.so ${JAVA_PATH}/java/app/libs/armeabi-v7a/
+    [ -n "${VERSION_STR}" ] && rm -rf mindspore-lite-${VERSION_STR}-inference-android-aarch32
 }
 
 build_jni_arm64() {

mindspore/lite/CMakeLists.txt

@@ -64,38 +64,36 @@ add_compile_options(-fPIC)
 
 if (SUPPORT_TRAIN)
     if (PLATFORM_ARM64)
-        set(COMPONENT_NAME runtime-arm64-${PROCESS_UNIT}-train)
+        set(RUNTIME_COMPONENT_NAME train-android-aarch64)
     elseif (PLATFORM_ARM32)
-        set(COMPONENT_NAME runtime-arm32-${PROCESS_UNIT}-train)
+        set(RUNTIME_COMPONENT_NAME train-android-aarch32)
     elseif (WIN32)
-        set(PARSER_NAME libconverter-parser-win-${PROCESS_UNIT}-train)
-        set(COMPONENT_NAME converter-win-${PROCESS_UNIT}-train)
-        set(WIN_RUN_X86_NAME win-runtime-x86-${PROCESS_UNIT})
+        set(RUNTIME_COMPONENT_NAME train-win-x64)
+        set(CONVERTER_COMPONENT_NAME train-converter-win-x64)
     else ()
-        set(COMPONENT_NAME converter-ubuntu-train)
+        set(RUNTIME_COMPONENT_NAME train-linux-x64)
+        set(CONVERTER_COMPONENT_NAME train-converter-linux-x64)
     endif ()
-    set(RUN_X86_COMPONENT_NAME runtime-x86-${PROCESS_UNIT}-train)
 else ()
     if (PLATFORM_ARM64)
-        set(COMPONENT_NAME runtime-arm64-${PROCESS_UNIT})
+        set(RUNTIME_COMPONENT_NAME inference-android-aarch64)
     elseif (PLATFORM_ARM32)
-        set(COMPONENT_NAME runtime-arm32-${PROCESS_UNIT})
+        set(RUNTIME_COMPONENT_NAME inference-android-aarch32)
     elseif (WIN32)
-        set(PARSER_NAME libconverter-parser-win-${PROCESS_UNIT})
-        set(COMPONENT_NAME converter-win-${PROCESS_UNIT})
         if ("${X86_64_SIMD}" STREQUAL "off")
-            set(WIN_RUN_X86_NAME win-runtime-x86-${PROCESS_UNIT})
+            set(RUNTIME_COMPONENT_NAME inference-win-x64)
         else ()
-            set(WIN_RUN_X86_NAME win-runtime-x86-${X86_64_SIMD}-${PROCESS_UNIT})
+            set(RUNTIME_COMPONENT_NAME inference-win-x64-${X86_64_SIMD})
         endif()
+        set(CONVERTER_COMPONENT_NAME converter-win-x64)
     else ()
-        set(COMPONENT_NAME converter-ubuntu)
+        if ("${X86_64_SIMD}" STREQUAL "off")
+            set(RUNTIME_COMPONENT_NAME inference-linux-x64)
+        else ()
+            set(RUNTIME_COMPONENT_NAME inference-linux-x64-${X86_64_SIMD})
+        endif()
+        set(CONVERTER_COMPONENT_NAME converter-linux-x64)
     endif()
-    if ("${X86_64_SIMD}" STREQUAL "off")
-        set(RUN_X86_COMPONENT_NAME runtime-x86-${PROCESS_UNIT})
-    else ()
-        set(RUN_X86_COMPONENT_NAME runtime-x86-${X86_64_SIMD}-${PROCESS_UNIT})
-    endif ()
 endif ()
 
 string(REPLACE "/mindspore/lite" "" TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR})

mindspore/lite/test/run_net_train.sh

@@ -29,15 +29,15 @@ function Run_Export(){
 function Run_Converter() {
     # Unzip x86 runtime and convertor
     cd ${x86_path} || exit 1
-    tar -zxf mindspore-lite-${version}-runtime-x86-${process_unit_x86}-train.tar.gz || exit 1
+    tar -zxf mindspore-lite-${version}-train-linux-x64.tar.gz || exit 1
 
-    tar -zxf mindspore-lite-${version}-converter-ubuntu-train.tar.gz || exit 1
-    cd ${x86_path}/mindspore-lite-${version}-converter-ubuntu-train || exit 1
+    tar -zxf mindspore-lite-${version}-train-converter-linux-x64.tar.gz || exit 1
+    cd ${x86_path}/mindspore-lite-${version}-train-converter-linux-x64 || exit 1
     cp converter/converter_lite ./ || exit 1
     
 
     # Convert the models
-    cd ${x86_path}/mindspore-lite-${version}-converter-ubuntu-train || exit 1
+    cd ${x86_path}/mindspore-lite-${version}-train-converter-linux-x64 || exit 1
 
     rm -rf ${ms_models_path}
     mkdir -p ${ms_models_path}
@@ -72,8 +72,8 @@ function Run_x86() {
         fi
         
         echo ${model_name}'_train' >> "${run_x86_log_file}"
-        echo 'cd  '${x86_path}'/mindspore-lite-'${version}'-runtime-x86-'${process_unit_x86}-train >> "${run_x86_log_file}"
-        cd ${x86_path}/mindspore-lite-${version}-runtime-x86-${process_unit_x86}-train || return 1
+        echo 'cd  '${x86_path}'/mindspore-lite-'${version}'-train-linux-x64' >> "${run_x86_log_file}"
+        cd ${x86_path}/mindspore-lite-${version}-train-linux-x64 || return 1
         echo 'LD_LIBRARY_PATH='${LD_LIBRARY_PATH}':./lib:./third_party/libjpeg-turbo/lib:./third_party/opencv/lib;./net_train/net_train --epochs='${epoch_num}' --modelFile='${ms_models_path}'/'${model_name}'_train.ms --inDataFile='${train_io_path}/${model_name}_input1.bin,${train_io_path}/${model_name}_input2.bin' --expectedDataFile='${train_io_path}'/'${model_name}'_outputs.bin --exportFile='${ms_models_path}'/'${model_name}'_train_exported.ms'  >> "${run_x86_log_file}"
         echo '-------------------------------------------------------------------------------' >> "${run_x86_log_file}"
         LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:./lib:./third_party/libjpeg-turbo/lib:./third_party/opencv/lib \
@@ -97,7 +97,7 @@ function Run_arm() {
     tmp_dir=/data/local/tmp/net_train_test
     if [ "$1" == arm64 ]; then
         arm_path=${arm64_path}
-        process_unit=${process_unit_arm64}
+        process_unit="aarch64"
         version_arm=${version_arm64}
         run_arm_log_file=${run_arm64_log_file} 
         adb_cmd_run_file=${adb_cmd_arm64_run_file} 
@@ -105,7 +105,7 @@ function Run_arm() {
         adb_cmd_file=${adb_cmd_arm64_file}
     elif [ "$1" == arm32 ]; then
         arm_path=${arm32_path}
-        process_unit=${process_unit_arm32}
+        process_unit="aarch32"
         version_arm=${version_arm32}
         run_arm_log_file=${run_arm32_log_file} 
         adb_cmd_run_file=${adb_cmd_arm32_run_file} 
@@ -114,30 +114,29 @@ function Run_arm() {
     else
         echo 'type ' $1 'is not supported'
         exit 1
-    fi   
-    arm_type=$1
+    fi
 
     # Unzip
     cd ${arm_path} || exit 1
-    tar -zxf mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train.tar.gz || exit 1
+    tar -zxf mindspore-lite-${version_arm}-train-android-${process_unit}.tar.gz || exit 1
 
     # If build with minddata, copy the minddata related libs
     cd ${net_train_test_path} || exit 1
-    if [ -f ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/lib/libminddata-lite.so ]; then
-        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/third_party/libjpeg-turbo/lib/libjpeg.so ${net_train_test_path}/libjpeg.so || exit 1
-        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/third_party/libjpeg-turbo/lib/libturbojpeg.so ${net_train_test_path}/libturbojpeg.so || exit 1
-        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/third_party/opencv/lib/libopencv_core.so ${net_train_test_path}/libopencv_core.so || exit 1
-        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/third_party/opencv/lib/libopencv_imgcodecs.so ${net_train_test_path}/libopencv_imgcodecs.so || exit 1
-        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/third_party/opencv/lib/libopencv_imgproc.so ${net_train_test_path}/libopencv_imgproc.so || exit 1
-        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/lib/libminddata-lite.so ${net_train_test_path}/libminddata-lite.so || exit 1
+    if [ -f ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/lib/libminddata-lite.so ]; then
+        cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/third_party/libjpeg-turbo/lib/libjpeg.so ${net_train_test_path}/libjpeg.so || exit 1
+        cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/third_party/libjpeg-turbo/lib/libturbojpeg.so ${net_train_test_path}/libturbojpeg.so || exit 1
+        cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/third_party/opencv/lib/libopencv_core.so ${net_train_test_path}/libopencv_core.so || exit 1
+        cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/third_party/opencv/lib/libopencv_imgcodecs.so ${net_train_test_path}/libopencv_imgcodecs.so || exit 1
+        cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/third_party/opencv/lib/libopencv_imgproc.so ${net_train_test_path}/libopencv_imgproc.so || exit 1
+        cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/lib/libminddata-lite.so ${net_train_test_path}/libminddata-lite.so || exit 1
     fi
 
-    cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/lib/libmindspore-lite.so ${net_train_test_path}/libmindspore-lite.so || exit 1
+    cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/lib/libmindspore-lite.so ${net_train_test_path}/libmindspore-lite.so || exit 1
 #    if [ "$1" == arm64 ]; then
 #        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/lib/libmindspore-lite-fp16.so ${net_train_test_path}/libmindspore-lite-fp16.so || exit 1
 #        cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/lib/libmindspore-lite-optimize.so ${net_train_test_path}/libmindspore-lite-optimize.so || exit 1
 #    fi
-    cp -a ${arm_path}/mindspore-lite-${version_arm}-runtime-${arm_type}-${process_unit}-train/net_train/net_train ${net_train_test_path}/net_train || exit 1
+    cp -a ${arm_path}/mindspore-lite-${version_arm}-train-android-${process_unit}/net_train/net_train ${net_train_test_path}/net_train || exit 1
 
     # adb push all needed files to the phone
     adb -s ${device_id} push ${net_train_test_path} /data/local/tmp/ > ${adb_push_log_file}
@@ -260,25 +259,22 @@ then
 fi
 
 arm64_path=${release_path}/android_aarch64
-file=$(ls ${arm64_path}/*runtime-arm64*train.tar.gz)
+file=$(ls ${arm64_path}/*train-android-aarch64.tar.gz)
 file_name="${file##*/}"
 IFS="-" read -r -a file_name_array <<< "$file_name"
 version_arm64=${file_name_array[2]}
-process_unit_arm64=${file_name_array[5]}
 
 arm32_path=${release_path}/android_aarch32
-file=$(ls ${arm32_path}/*runtime-arm32*train.tar.gz)
+file=$(ls ${arm32_path}/*train-android-aarch32.tar.gz)
 file_name="${file##*/}"
 IFS="-" read -r -a file_name_array <<< "$file_name"
 version_arm32=${file_name_array[2]}
-process_unit_arm32=${file_name_array[5]}
 
 x86_path=${release_path}/ubuntu_x86
-file=$(ls ${x86_path}/*runtime-x86*train.tar.gz)
+file=$(ls ${x86_path}/*train-linux-x64.tar.gz)
 file_name="${file##*/}"
 IFS="-" read -r -a file_name_array <<< "$file_name"
 version=${file_name_array[2]}
-process_unit_x86=${file_name_array[5]}
 
 # Set models config filepath
 models_mindspore_train_config=${basepath}/models_ms_train.cfg

mindspore/lite/test/win_runtest.bat

@@ -38,22 +38,22 @@ md benchmark
 
 SET RET_CODE=0
 
-7z x -r "%TOOL_PATH%/mindspore-lite-*-converter-win-cpu.zip" -o"%BENCHMARK_BASE%"
+7z x -r "%TOOL_PATH%/mindspore-lite-*-converter-win-x64.zip" -o"%BENCHMARK_BASE%"
 IF NOT %errorlevel% == 0 (
     echo "Decompression of converter tool fail!"
     SET RET_CODE=1
     goto run_eof
 )
 
-SET SO_PATH=mindspore-lite-*-win-runtime-x86-cpu
+SET SO_PATH=mindspore-lite-*-inference-win-x64
 IF "%3%" == "sse" (
-    SET SO_PATH=mindspore-lite-*-win-runtime-x86-sse-cpu
+    SET SO_PATH=mindspore-lite-*-inference-win-x64-sse
 )
 IF "%3%" == "avx" (
-    SET SO_PATH=mindspore-lite-*-win-runtime-x86-avx-cpu
+    SET SO_PATH=mindspore-lite-*-inference-win-x64-avx
 )
 IF "%3%" == "avx512" (
-    SET SO_PATH=mindspore-lite-*-win-runtime-x86-avx512-cpu
+    SET SO_PATH=mindspore-lite-*-inference-win-x64-avx512
 )
 7z x -r "%TOOL_PATH%/%SO_PATH%.zip" -o"%BENCHMARK_BASE%"
 IF NOT %errorlevel% == 0 (
@@ -70,7 +70,7 @@ SET MODEL_NAME=''
 SET SUFFIX=''
 
 echo "Convert models"
-cd mindspore-lite-*-converter-win-cpu/converter
+cd mindspore-lite-*-converter-win-x64/converter
 
 for /f "tokens=1-2 delims= " %%i in (%MODEL_CONFIG%) do (
     for /f "tokens=1-2 delims=." %%k in ("%%j") do (

mindspore/lite/tools/net_train/CMakeLists.txt

@@ -26,13 +26,13 @@ else()
 endif()
 if (PLATFORM_ARM32 OR PLATFORM_ARM64)
     install(TARGETS net_train
-                RUNTIME DESTINATION ${MAIN_DIR}-${COMPONENT_NAME}/net_train COMPONENT ${COMPONENT_NAME})
+                RUNTIME DESTINATION ${MAIN_DIR}-${RUNTIME_COMPONENT_NAME}/net_train COMPONENT ${RUNTIME_COMPONENT_NAME})
 else()
     if (WIN32)
         install(TARGETS net_train
-            RUNTIME DESTINATION ${MAIN_DIR}-${WIN_RUN_X86_NAME}/net_train COMPONENT ${WIN_RUN_X86_NAME})
+            RUNTIME DESTINATION ${MAIN_DIR}-${RUNTIME_COMPONENT_NAME}/net_train COMPONENT ${RUNTIME_COMPONENT_NAME})
     else ()
         install(TARGETS net_train
-            RUNTIME DESTINATION ${MAIN_DIR}-${RUN_X86_COMPONENT_NAME}/net_train COMPONENT ${RUN_X86_COMPONENT_NAME})
+            RUNTIME DESTINATION ${MAIN_DIR}-${RUNTIME_COMPONENT_NAME}/net_train COMPONENT ${RUNTIME_COMPONENT_NAME})
     endif ()
 endif()