mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

rename cortex-m package name

This commit is contained in:
gongdaguo1 2022-06-10 08:13:29 +08:00
parent 6de593f411
commit 9ac581c666
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/lite/CMakeLists.txt
View File

@ -523,7 +523,7 @@ elseif(WIN32)
endif() endif()
elseif(PLATFORM_MCU) elseif(PLATFORM_MCU)
if(TOOLCHAIN_NAME STREQUAL "cortex-m7") if(TOOLCHAIN_NAME STREQUAL "cortex-m7")
set(RUNTIME_COMPONENT_NAME "cortex-m7") set(RUNTIME_COMPONENT_NAME "none-cortex-m7")
endif() endif()
else() else()
if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") AND MSLITE_ENABLE_ACL) if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") AND MSLITE_ENABLE_ACL)

7
mindspore/lite/test/st/scripts/run_benchmark_codegen.sh
View File

@ -193,7 +193,7 @@ function Run_cortex_m_codegen() {
# 1. build benchmark # 1. build benchmark
mkdir -p ${output_file}/build || exit 1 mkdir -p ${output_file}/build || exit 1
cp ${cortex_path}/mindspore-lite-${version}-cortex-m7.tar.gz ${output_file}/build/ || exit 1 cp ${cortex_path}/mindspore-lite-${version}-none-cortex-m7.tar.gz ${output_file}/build/ || exit 1
cd ${output_file} || exit 1 cd ${output_file} || exit 1
in_data=`cat ${models_path}/input_output/input/${model_name}.ms.in.txt` in_data=`cat ${models_path}/input_output/input/${model_name}.ms.in.txt`
out_data=`cat ${models_path}/input_output/output/${model_name}.ms.out.txt` out_data=`cat ${models_path}/input_output/output/${model_name}.ms.out.txt`
@ -202,9 +202,10 @@ function Run_cortex_m_codegen() {
bash build.sh || exit 1 bash build.sh || exit 1
cd ${stm_demo_file} || exit 1 cd ${stm_demo_file} || exit 1
[ -n "${stm_demo_file}" ] && rm -rf ${stm_demo_file}/build [ -n "${stm_demo_file}" ] && rm -rf ${stm_demo_file}/build
sed -i "s/LITE_PACK =/LITE_PACK = mindspore-lite-${version}-cortex-m7/g" Makefile sed -i "s/LITE_PACK =/LITE_PACK = mindspore-lite-${version}-none-cortex-m7/g" Makefile
make >> "$4" || return 1 make >> "$4" || return 1
continue
# 2. run benchmark # 2. run benchmark
bash ${STM32_CUBE_PROG_PATH}/bin/STM32_Programmer.sh -c port=SWD -w build/test_767_01.bin 0x08000000 -s 0x08000000 || exit 1 bash ${STM32_CUBE_PROG_PATH}/bin/STM32_Programmer.sh -c port=SWD -w build/test_767_01.bin 0x08000000 -s 0x08000000 || exit 1
sleep 3 sleep 3
@ -411,7 +412,7 @@ done
x86_path=${release_path}/centos_x86 x86_path=${release_path}/centos_x86
arm32_path=${release_path}/android_aarch32/npu arm32_path=${release_path}/android_aarch32/npu
arm64_path=${release_path}/android_aarch64/npu arm64_path=${release_path}/android_aarch64/npu
cortex_path=${release_path}/cortex-m cortex_path=${release_path}/none_cortex-m
file_name=$(ls ${x86_path}/*-linux-x64.tar.gz) file_name=$(ls ${x86_path}/*-linux-x64.tar.gz)
IFS="-" read -r -a file_name_array <<< "$file_name" IFS="-" read -r -a file_name_array <<< "$file_name"
version=${file_name_array[2]} version=${file_name_array[2]}

6
mindspore/lite/tools/converter/micro/cmake/cortex-m/CMakeLists.txt
View File

@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project(Micro) project(Micro)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-aliasing")
string(REPLACE "-Werror" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)
set(MICRO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) set(MICRO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..)
@ -28,7 +26,7 @@ file(GLOB CMSIS_OPS
${CMSIS_DIR}/CMSIS/NN/Source/ReshapeFunctions/*.c ${CMSIS_DIR}/CMSIS/NN/Source/ReshapeFunctions/*.c
${CMSIS_DIR}/CMSIS/NN/Source/SoftmaxFunctions/*.c ${CMSIS_DIR}/CMSIS/NN/Source/SoftmaxFunctions/*.c
) )
list(REMOVE_ITEM CMSIS_OPS ${CMSIS_DIR}/CMSIS/NN/Source/NNSupportFunctions/arm_nn_mat_mult_nt_t_s8.c)
add_library(cmsis_nn STATIC ${CMSIS_OPS}) add_library(cmsis_nn STATIC ${CMSIS_OPS})
include_directories(${MICRO_DIR}/coder/) include_directories(${MICRO_DIR}/coder/)

2
mindspore/lite/tools/converter/micro/coder/generator/component/const_blocks/load_input.cc
View File

@ -292,7 +292,7 @@ BASEPATH=$(cd "$(dirname $0)"; pwd)
mkdir -p build mkdir -p build
VERSION_STR=1.8.0 VERSION_STR=1.8.0
MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-cortex-m7" MINDSPORE_FILE_NAME="mindspore-lite-${VERSION_STR}-none-cortex-m7"
MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz" MINDSPORE_FILE="${MINDSPORE_FILE_NAME}.tar.gz"
MINDSPORE_LITE_DOWNLOAD_URL=\ MINDSPORE_LITE_DOWNLOAD_URL=\
"https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/cortex-m/${MINDSPORE_FILE}" "https://ms-release.obs.cn-north-4.myhuaweicloud.com/${VERSION_STR}/MindSpore/lite/release/cortex-m/${MINDSPORE_FILE}"