!11567 [MSLITE][Develop] fix lite_release_package

From: @sunsuodong
Reviewed-by: @HilbertDavid,@xsmq
Signed-off-by: @xsmq
pull/11567/MERGE
mindspore-ci-bot 4 years ago committed by Gitee
commit e468d83be2

@ -487,7 +487,7 @@ build_mindspore()
checkndk() { checkndk() {
if [ "${ANDROID_NDK}" ]; then if [ "${ANDROID_NDK}" ]; then
echo -e "\e[31mANDROID_NDK_PATH=$ANDROID_NDK \e[0m" echo -e "\e[31mANDROID_NDK=$ANDROID_NDK \e[0m"
else else
echo -e "\e[31mplease set ANDROID_NDK in environment variable for example: export ANDROID_NDK=/root/usr/android-ndk-r20b/ \e[0m" echo -e "\e[31mplease set ANDROID_NDK in environment variable for example: export ANDROID_NDK=/root/usr/android-ndk-r20b/ \e[0m"
exit 1 exit 1
@ -707,7 +707,7 @@ build_java() {
make_clean() make_clean()
{ {
echo "enbale make clean" echo "enable make clean"
cd "${BUILD_PATH}/mindspore" cd "${BUILD_PATH}/mindspore"
cmake --build . --target clean cmake --build . --target clean
} }

@ -58,11 +58,10 @@ function android_release_package()
tar -xzf ${input_path}/android_aarch32/${src_arm32_pkg_name}.tar.gz tar -xzf ${input_path}/android_aarch32/${src_arm32_pkg_name}.tar.gz
# ARM32 and ARM64 have the same header file. # ARM32 and ARM64 have the same header file.
mkdir -p ${dst_android_pkg_name}/third_party
mkdir -p ${dst_android_pkg_name}/minddata/ mkdir -p ${dst_android_pkg_name}/minddata/
cp -r ${src_arm64_pkg_name}/include/ ${dst_android_pkg_name}/ cp -r ${src_arm64_pkg_name}/include/ ${dst_android_pkg_name}/
cp -r ${src_arm64_pkg_name}/third_party/flatbuffers/ ${dst_android_pkg_name}/third_party/
cp -r ${src_arm64_pkg_name}/minddata/include/ ${dst_android_pkg_name}/minddata/ cp -r ${src_arm64_pkg_name}/minddata/include/ ${dst_android_pkg_name}/minddata/
cp ${src_arm64_pkg_name}/.commit_id ${dst_android_pkg_name}/
# Executable files and dynamic libraries are different in different architectures. # Executable files and dynamic libraries are different in different architectures.
mkdir -p ${dst_android_pkg_name}/benchmark/aarch64/ mkdir -p ${dst_android_pkg_name}/benchmark/aarch64/
@ -71,23 +70,23 @@ function android_release_package()
mkdir -p ${dst_android_pkg_name}/lib/aarch32/ mkdir -p ${dst_android_pkg_name}/lib/aarch32/
mkdir -p ${dst_android_pkg_name}/minddata/lib/aarch64/ mkdir -p ${dst_android_pkg_name}/minddata/lib/aarch64/
mkdir -p ${dst_android_pkg_name}/minddata/lib/aarch32/ mkdir -p ${dst_android_pkg_name}/minddata/lib/aarch32/
mkdir -p ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch64/
mkdir -p ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch32/
cp ${src_arm64_pkg_name}/benchmark/* ${dst_android_pkg_name}/benchmark/aarch64/ cp ${src_arm64_pkg_name}/benchmark/* ${dst_android_pkg_name}/benchmark/aarch64/
cp ${src_arm32_pkg_name}/benchmark/* ${dst_android_pkg_name}/benchmark/aarch32/ cp ${src_arm32_pkg_name}/benchmark/* ${dst_android_pkg_name}/benchmark/aarch32/
cp ${src_arm64_pkg_name}/lib/* ${dst_android_pkg_name}/lib/aarch64/ cp ${src_arm64_pkg_name}/lib/* ${dst_android_pkg_name}/lib/aarch64/
cp ${src_arm32_pkg_name}/lib/* ${dst_android_pkg_name}/lib/aarch32/ cp ${src_arm32_pkg_name}/lib/* ${dst_android_pkg_name}/lib/aarch32/
cp ${src_arm64_pkg_name}/minddata/lib/* ${dst_android_pkg_name}/minddata/lib/aarch64/ cp ${src_arm64_pkg_name}/minddata/lib/* ${dst_android_pkg_name}/minddata/lib/aarch64/
cp ${src_arm32_pkg_name}/minddata/lib/* ${dst_android_pkg_name}/minddata/lib/aarch32/ cp ${src_arm32_pkg_name}/minddata/lib/* ${dst_android_pkg_name}/minddata/lib/aarch32/
cp ${src_arm64_pkg_name}/minddata/third_party/libjpeg-turbo/lib/* ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch64/
cp ${src_arm32_pkg_name}/minddata/third_party/libjpeg-turbo/lib/* ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch32/
if [ ${name} == "train" ] if [ ${name} == "train" ]
then then
mkdir -p ${dst_android_pkg_name}/benchmark_train/aarch64/ mkdir -p ${dst_android_pkg_name}/benchmark_train/aarch64/
mkdir -p ${dst_android_pkg_name}/benchmark_train/aarch32/ mkdir -p ${dst_android_pkg_name}/benchmark_train/aarch32/
mkdir -p ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch64/
mkdir -p ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch32/
cp ${src_arm64_pkg_name}/benchmark_train/* ${dst_android_pkg_name}/benchmark_train/aarch64/ cp ${src_arm64_pkg_name}/benchmark_train/* ${dst_android_pkg_name}/benchmark_train/aarch64/
cp ${src_arm32_pkg_name}/benchmark_train/* ${dst_android_pkg_name}/benchmark_train/aarch32/ cp ${src_arm32_pkg_name}/benchmark_train/* ${dst_android_pkg_name}/benchmark_train/aarch32/
cp ${src_arm64_pkg_name}/minddata/third_party/libjpeg-turbo/lib/* ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch64/
cp ${src_arm32_pkg_name}/minddata/third_party/libjpeg-turbo/lib/* ${dst_android_pkg_name}/minddata/third_party/libjpeg-turbo/lib/aarch32/
fi fi
mkdir -p ${dst_android_pkg_name}/third_party/hiai_ddk/lib/aarch64/ mkdir -p ${dst_android_pkg_name}/third_party/hiai_ddk/lib/aarch64/
cp -r ${src_arm64_pkg_name}/third_party/hiai_ddk/lib/* ${dst_android_pkg_name}/third_party/hiai_ddk/lib/aarch64/ cp -r ${src_arm64_pkg_name}/third_party/hiai_ddk/lib/* ${dst_android_pkg_name}/third_party/hiai_ddk/lib/aarch64/

Loading…
Cancel
Save