From: @yeyunpeng2020 Reviewed-by: @hangangqiang,@zhanghaibo5 Signed-off-by: @hangangqiangtags/v1.2.0-rc1
| @@ -827,10 +827,13 @@ build_java() { | |||||
| # install and package | # install and package | ||||
| mkdir -p ${JAVA_PATH}/java/linux_x86/build/lib | mkdir -p ${JAVA_PATH}/java/linux_x86/build/lib | ||||
| cp ${JAVA_PATH}/java/linux_x86/libs/*.so ${JAVA_PATH}/java/linux_x86/build/lib/jar | cp ${JAVA_PATH}/java/linux_x86/libs/*.so ${JAVA_PATH}/java/linux_x86/build/lib/jar | ||||
| cp -r ${JAVA_PATH}/java/linux_x86/build/lib/jar ${BASEPATH}/output/mindspore-lite-${VERSION_STR}-inference-linux-x64/lib/ | |||||
| cd ${BASEPATH}/output | |||||
| tar czf mindspore-lite-${VERSION_STR}-inference-linux-x64.tar.gz mindspore-lite-${VERSION_STR}-inference-linux-x64 | |||||
| cd ${JAVA_PATH}/java/linux_x86/build/ | |||||
| cp -r ${JAVA_PATH}/java/linux_x86/build/lib ${JAVA_PATH}/java/linux_x86/build/mindspore-lite-${VERSION_STR}-inference-linux-x64-jar | |||||
| mkdir -p ${JAVA_PATH}/java/linux_x86/build/mindspore-lite-${VERSION_STR}-inference-linux-x64-jar | |||||
| tar czvf mindspore-lite-${VERSION_STR}-inference-linux-x64-jar.tar.gz ./mindspore-lite-${VERSION_STR}-inference-linux-x64-jar | |||||
| # copy output | # copy output | ||||
| cp mindspore-lite-${VERSION_STR}-inference-linux-x64-jar.tar.gz ${BASEPATH}/output | |||||
| cd ${BASEPATH}/output | |||||
| [ -n "${VERSION_STR}" ] && rm -rf mindspore-lite-${VERSION_STR}-inference-linux-x64 | [ -n "${VERSION_STR}" ] && rm -rf mindspore-lite-${VERSION_STR}-inference-linux-x64 | ||||
| exit 0 | exit 0 | ||||
| } | } | ||||
| @@ -11,7 +11,7 @@ if(BUILD_LITE) | |||||
| -DANDROID_NDK=$ENV{ANDROID_NDK} | -DANDROID_NDK=$ENV{ANDROID_NDK} | ||||
| -DANDROID_ABI=arm64-v8a | -DANDROID_ABI=arm64-v8a | ||||
| -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang | -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang | ||||
| -DANDROID_STL=c++_shared | |||||
| -DANDROID_STL=${ANDROID_STL} | |||||
| ${CMAKE_OPTION}) | ${CMAKE_OPTION}) | ||||
| endif() | endif() | ||||
| if(PLATFORM_ARM32) | if(PLATFORM_ARM32) | ||||
| @@ -20,7 +20,7 @@ if(BUILD_LITE) | |||||
| -DANDROID_NDK=$ENV{ANDROID_NDK} | -DANDROID_NDK=$ENV{ANDROID_NDK} | ||||
| -DANDROID_ABI=armeabi-v7a | -DANDROID_ABI=armeabi-v7a | ||||
| -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang | -DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang | ||||
| -DANDROID_STL=c++_shared | |||||
| -DANDROID_STL=${ANDROID_STL} | |||||
| ${CMAKE_OPTION}) | ${CMAKE_OPTION}) | ||||
| endif() | endif() | ||||
| else() | else() | ||||
| @@ -163,12 +163,10 @@ getCommonFile() { | |||||
| # automatically generate operator list | # automatically generate operator list | ||||
| generateOpsList() { | generateOpsList() { | ||||
| echo "start generate operator list" | echo "start generate operator list" | ||||
| ops=() | |||||
| while IFS='' read -r line; do ops+=("$line"); done < <(egrep "PrimitiveType_.* = " "${MINDSPORE_HOME}/mindspore/lite/build/schema/model_generated.h" | awk -F '_' '{print $2}' | awk -F ' ' '{print $1}') | |||||
| ops_num=$((${#ops[@]} - 3)) | |||||
| echo "ops nums:${ops_num}" | |||||
| ops_list=() | ops_list=() | ||||
| mapfile -t ops_list <<< "${ops[*]:1:$ops_num}" | |||||
| while IFS='' read -r line; do ops_list+=("$line"); done < <(grep -Rn "^table" "${MINDSPORE_HOME}/mindspore/lite/schema/ops.fbs" | awk -F ' ' '{print $2}') | |||||
| ops_num=$((${#ops_list[@]})) | |||||
| echo "ops nums:${ops_num}" | |||||
| } | } | ||||
| echo "Start getting all file associations." | echo "Start getting all file associations." | ||||
| generateOpsList | generateOpsList | ||||