From b3116819f3fab4af6ed2458701084e4cb0b7279f Mon Sep 17 00:00:00 2001 From: zhengjun10 Date: Thu, 13 Jan 2022 14:58:24 +0800 Subject: [PATCH] fix micro and x86 release package path --- mindspore/lite/examples/converter_extend/build.sh | 2 +- mindspore/lite/examples/quick_start_cpp/build.sh | 2 +- mindspore/lite/examples/quick_start_flclient/build.sh | 2 +- mindspore/lite/examples/quick_start_java/build.sh | 2 +- mindspore/lite/examples/runtime_extend/build.sh | 2 +- mindspore/lite/examples/runtime_gpu_extend/build.sh | 2 +- mindspore/lite/examples/train_lenet_java/build.sh | 4 ++-- mindspore/lite/micro/coder/graph.cc | 2 +- mindspore/lite/micro/example/mnist_x86/mnist.sh | 2 +- mindspore/lite/micro/example/mobilenetv2/mobilenetv2.sh | 6 ++++-- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/mindspore/lite/examples/converter_extend/build.sh b/mindspore/lite/examples/converter_extend/build.sh index 38d9a8d4ab..fdd33bac54 100644 --- a/mindspore/lite/examples/converter_extend/build.sh +++ b/mindspore/lite/examples/converter_extend/build.sh @@ -25,7 +25,7 @@ get_version MODEL_DOWNLOAD_URL="https://download.mindspore.cn/model_zoo/official/lite/quick_start/add.tflite" MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" -MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" +MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" mkdir -p build mkdir -p model diff --git a/mindspore/lite/examples/quick_start_cpp/build.sh b/mindspore/lite/examples/quick_start_cpp/build.sh index 9e12c9b086..3be451ecf9 100644 --- a/mindspore/lite/examples/quick_start_cpp/build.sh +++ b/mindspore/lite/examples/quick_start_cpp/build.sh @@ -25,7 +25,7 @@ get_version MODEL_DOWNLOAD_URL="https://download.mindspore.cn/model_zoo/official/lite/quick_start/mobilenetv2.ms" MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" -MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" +MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" mkdir -p build mkdir -p lib diff --git a/mindspore/lite/examples/quick_start_flclient/build.sh b/mindspore/lite/examples/quick_start_flclient/build.sh index ebf36e4192..87f1600ee9 100644 --- a/mindspore/lite/examples/quick_start_flclient/build.sh +++ b/mindspore/lite/examples/quick_start_flclient/build.sh @@ -49,7 +49,7 @@ get_version MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" -MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" +MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" rm -rf build/${MINDSPORE_FILE_NAME} rm -rf lib diff --git a/mindspore/lite/examples/quick_start_java/build.sh b/mindspore/lite/examples/quick_start_java/build.sh index 6930b13e30..59f8af502f 100644 --- a/mindspore/lite/examples/quick_start_java/build.sh +++ b/mindspore/lite/examples/quick_start_java/build.sh @@ -25,7 +25,7 @@ get_version MODEL_DOWNLOAD_URL="https://download.mindspore.cn/model_zoo/official/lite/quick_start/mobilenetv2.ms" MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" -MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" +MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" mkdir -p build mkdir -p lib diff --git a/mindspore/lite/examples/runtime_extend/build.sh b/mindspore/lite/examples/runtime_extend/build.sh index 09d7ff2c9a..24c78a3c0b 100644 --- a/mindspore/lite/examples/runtime_extend/build.sh +++ b/mindspore/lite/examples/runtime_extend/build.sh @@ -25,7 +25,7 @@ get_version MODEL_DOWNLOAD_URL="https://download.mindspore.cn/model_zoo/official/lite/quick_start/add_extend.ms" MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" -MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" +MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" mkdir -p build mkdir -p lib diff --git a/mindspore/lite/examples/runtime_gpu_extend/build.sh b/mindspore/lite/examples/runtime_gpu_extend/build.sh index b8eca25644..2cc1dc9e9c 100644 --- a/mindspore/lite/examples/runtime_gpu_extend/build.sh +++ b/mindspore/lite/examples/runtime_gpu_extend/build.sh @@ -26,7 +26,7 @@ MODEL_DOWNLOAD_URL="https://download.mindspore.cn/model_zoo/official/lite/quick_ MODEL_DOWNLOAD_URL2="https://download.mindspore.cn/model_zoo/official/lite/quick_start/add.ms" MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" -MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" +MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" mkdir -p build mkdir -p model diff --git a/mindspore/lite/examples/train_lenet_java/build.sh b/mindspore/lite/examples/train_lenet_java/build.sh index 650ff2cb7e..a9fff1ac2e 100755 --- a/mindspore/lite/examples/train_lenet_java/build.sh +++ b/mindspore/lite/examples/train_lenet_java/build.sh @@ -48,7 +48,7 @@ get_version() { get_version MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" -MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" +MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" mkdir -p build/${MINDSPORE_FILE_NAME} mkdir -p lib @@ -64,7 +64,7 @@ fi tar xzvf ${BASEPATH}/build/${MINDSPORE_FILE} -C ${BASEPATH}/build/${MINDSPORE_FILE_NAME} --strip-components=1 cp -r ${BASEPATH}/build/${MINDSPORE_FILE_NAME}/runtime/lib/* ${BASEPATH}/lib -cp ${BASEPATH}/build/${MINDSPORE_FILE_NAME}/runtime/third_party/libjpeg-turbo/lib/libjpeg.so.62 ${BASEPATH}/lib +cp ${BASEPATH}/build/${MINDSPORE_FILE_NAME}/runtime/third_party/libjpeg-turbo/lib/*so.* ${BASEPATH}/lib cd ${BASEPATH}/ || exit mvn package diff --git a/mindspore/lite/micro/coder/graph.cc b/mindspore/lite/micro/coder/graph.cc index fbd25347c8..0d0ef34244 100644 --- a/mindspore/lite/micro/coder/graph.cc +++ b/mindspore/lite/micro/coder/graph.cc @@ -105,7 +105,7 @@ int CoderGraph::ConvertTensors() { if (quant_param == nullptr) { quant_arg.inited = false; } else { - quant_arg.inited = true; + quant_arg.inited = quant_param->inited(); quant_arg.bitNum = quant_param->numBits(); quant_arg.scale = quant_param->scale(); quant_arg.zeroPoint = quant_param->zeroPoint(); diff --git a/mindspore/lite/micro/example/mnist_x86/mnist.sh b/mindspore/lite/micro/example/mnist_x86/mnist.sh index 91a7be7604..1483de7fe9 100644 --- a/mindspore/lite/micro/example/mnist_x86/mnist.sh +++ b/mindspore/lite/micro/example/mnist_x86/mnist.sh @@ -74,7 +74,7 @@ if [ -n "$TARBALL" ]; then fi download_inference() { - local MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${MINDSPORE_FILE}" + local MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${MINDSPORE_FILE}" wget -c -O ${BASEPATH}/build/${MINDSPORE_FILE} --no-check-certificate ${MINDSPORE_LITE_DOWNLOAD_URL} } if [ ! -e ${BASEPATH}/build/${MINDSPORE_FILE} ]; then diff --git a/mindspore/lite/micro/example/mobilenetv2/mobilenetv2.sh b/mindspore/lite/micro/example/mobilenetv2/mobilenetv2.sh index 1bd2ac455a..824f429d77 100644 --- a/mindspore/lite/micro/example/mobilenetv2/mobilenetv2.sh +++ b/mindspore/lite/micro/example/mobilenetv2/mobilenetv2.sh @@ -64,12 +64,14 @@ get_version() { download_inference() { if [[ "${LITE_PLATFORM}" == "arm64" ]]; then local ARM_NAME=aarch64 + local DEVICE=gpu else local ARM_NAME=aarch32 + local DEVICE=cpu fi MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-android-${ARM_NAME}" local MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" - local MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/android/${MINDSPORE_FILE}" + local MINDSPORE_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/android/${DEVICE}/${MINDSPORE_FILE}" if [ ! -e ${BASEPATH}/build/${MINDSPORE_FILE} ]; then wget -c -O ${BASEPATH}/build/${MINDSPORE_FILE} --no-check-certificate ${MINDSPORE_LITE_DOWNLOAD_URL} @@ -91,7 +93,7 @@ download_mobile() { gen_mobile() { local CODEGEN_FILE_NAME="mindspore-lite-${VERSION_STR}-linux-x64" local CODEGEN_FILE="${CODEGEN_FILE_NAME}.tar.gz" - local CODEGEN_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/${CODEGEN_FILE}" + local CODEGEN_LITE_DOWNLOAD_URL="https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/linux/x86_64/${CODEGEN_FILE}" if [ ! -e ${BASEPATH}/build/${CODEGEN_FILE} ]; then wget -c -O ${BASEPATH}/build/${CODEGEN_FILE} --no-check-certificate ${CODEGEN_LITE_DOWNLOAD_URL}