Merge pull request !19316 from yeyunpeng2020/java
This commit is contained in:
i-robot 2021-07-05 02:00:22 +00:00 committed by Gitee
commit 44283b1aec
2 changed files with 28 additions and 26 deletions

View File

@ -527,32 +527,32 @@ build_lite_x86_64_jni_and_jar()
cp ./libmindspore-lite-jni.so ${LITE_JAVA_PATH}/native/libs/linux_x86/ cp ./libmindspore-lite-jni.so ${LITE_JAVA_PATH}/native/libs/linux_x86/
cp ./libmindspore-lite-jni.so ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/ cp ./libmindspore-lite-jni.so ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
cd ${LITE_JAVA_PATH}/java
rm -rf gradle .gradle gradlew gradlew.bat
gradle wrapper --gradle-version 6.6.1 --distribution-type all
# build java common # build java common
cd ${LITE_JAVA_PATH}/java/common ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/common
gradle clean ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/common
gradle build
cp ${LITE_JAVA_PATH}/java/common/build/libs/mindspore-lite-java-common.jar ${LITE_JAVA_PATH}/java/linux_x86/libs/ cp ${LITE_JAVA_PATH}/java/common/build/libs/mindspore-lite-java-common.jar ${LITE_JAVA_PATH}/java/linux_x86/libs/
# build java fl_client # build java fl_client
if [[ "X$is_train" = "Xon" ]]; then if [[ "X$is_train" = "Xon" ]]; then
cd ${LITE_JAVA_PATH}/java/fl_client ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/fl_client
gradle clean
echo "--------------------building createFlatBuffers for fl_client------------------------" echo "--------------------building createFlatBuffers for fl_client------------------------"
gradle createFlatBuffers ${LITE_JAVA_PATH}/java/gradlew createFlatBuffers -p ${LITE_JAVA_PATH}/java/fl_client
echo "--------------------create FlatBuffers for fl_client success--------------------" echo "--------------------create FlatBuffers for fl_client success--------------------"
gradle build ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/fl_client
gradle clearJar ${LITE_JAVA_PATH}/java/gradlew clearJar -p ${LITE_JAVA_PATH}/java/fl_client
echo "--------------------building flReleaseJar for fl_client------------------------" echo "--------------------building flReleaseJar for fl_client------------------------"
gradle flReleaseJarX86 --rerun-tasks ${LITE_JAVA_PATH}/java/gradlew flReleaseJarX86 --rerun-tasks -p ${LITE_JAVA_PATH}/java/fl_client
echo "--------------------build jar for fl_client success ------------------------" echo "--------------------build jar for fl_client success ------------------------"
cp ${LITE_JAVA_PATH}/java/fl_client/build/libs/jarX86/mindspore-lite-java-flclient.jar ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/ cp ${LITE_JAVA_PATH}/java/fl_client/build/libs/jarX86/mindspore-lite-java-flclient.jar ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
fi fi
# build jar # build jar
cd ${LITE_JAVA_PATH}/java/linux_x86/ ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/linux_x86/
gradle clean ${LITE_JAVA_PATH}/java/gradlew releaseJar -p ${LITE_JAVA_PATH}/java/linux_x86/
gradle releaseJar cp ${LITE_JAVA_PATH}/java/linux_x86/build/lib/jar/*.jar ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
cp ./build/lib/jar/*.jar ${BASEPATH}/output/tmp/${pkg_name}/runtime/lib/
# package # package
cd ${BASEPATH}/output/tmp cd ${BASEPATH}/output/tmp
@ -767,10 +767,12 @@ build_aar() {
if [[ "X${INC_BUILD}" == "Xoff" ]]; then if [[ "X${INC_BUILD}" == "Xoff" ]]; then
[ -n "${BASEPATH}" ] && rm -rf ${BASEPATH}/mindspore/lite/build [ -n "${BASEPATH}" ] && rm -rf ${BASEPATH}/mindspore/lite/build
fi fi
cd ${LITE_JAVA_PATH}/java
rm -rf gradle .gradle gradlew gradlew.bat
gradle wrapper --gradle-version 6.6.1 --distribution-type all
# build common module # build common module
cd ${LITE_JAVA_PATH}/java/common ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/common
gradle clean ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/common
gradle build
# build aar # build aar
local npu_bak=${MSLITE_ENABLE_NPU} local npu_bak=${MSLITE_ENABLE_NPU}
@ -787,24 +789,22 @@ build_aar() {
is_train=off is_train=off
fi fi
if [[ "X$is_train" = "Xon" ]]; then if [[ "X$is_train" = "Xon" ]]; then
cd ${LITE_JAVA_PATH}/java/fl_client ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/fl_client
gradle clean
echo "--------------------building createFlatBuffers for fl_client------------------------" echo "--------------------building createFlatBuffers for fl_client------------------------"
gradle createFlatBuffers ${LITE_JAVA_PATH}/java/gradlew createFlatBuffers -p ${LITE_JAVA_PATH}/java/fl_client
echo "--------------------create FlatBuffers for fl_client success--------------------" echo "--------------------create FlatBuffers for fl_client success--------------------"
gradle build ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/fl_client
gradle clearJar ${LITE_JAVA_PATH}/java/gradlew clearJar -p ${LITE_JAVA_PATH}/java/fl_client
echo "--------------------building flReleaseJar for fl_client------------------------" echo "--------------------building flReleaseJar for fl_client------------------------"
gradle flReleaseJarAAR --rerun-tasks ${LITE_JAVA_PATH}/java/gradlew flReleaseJarAAR --rerun-tasks -p ${LITE_JAVA_PATH}/java/fl_client
echo "--------------------build jar for fl_client success ------------------------" echo "--------------------build jar for fl_client success ------------------------"
cp ${LITE_JAVA_PATH}/java/fl_client/build/libs/jarAAR/mindspore-lite-java-flclient.jar ${LITE_JAVA_PATH}/java/app/libs cp ${LITE_JAVA_PATH}/java/fl_client/build/libs/jarAAR/mindspore-lite-java-flclient.jar ${LITE_JAVA_PATH}/java/app/libs
fi fi
cp ${LITE_JAVA_PATH}/java/common/build/libs/mindspore-lite-java-common.jar ${LITE_JAVA_PATH}/java/app/libs cp ${LITE_JAVA_PATH}/java/common/build/libs/mindspore-lite-java-common.jar ${LITE_JAVA_PATH}/java/app/libs
cd ${LITE_JAVA_PATH}/java/app ${LITE_JAVA_PATH}/java/gradlew clean -p ${LITE_JAVA_PATH}/java/app
gradle clean ${LITE_JAVA_PATH}/java/gradlew build -p ${LITE_JAVA_PATH}/java/app
gradle build ${LITE_JAVA_PATH}/java/gradlew publish -PLITE_VERSION=${VERSION_STR} -p ${LITE_JAVA_PATH}/java/app
gradle publish -PLITE_VERSION=${VERSION_STR}
cd ${LITE_JAVA_PATH}/java/app/build cd ${LITE_JAVA_PATH}/java/app/build
[ -n "${BASEPATH}" ] && rm -rf ${BASEPATH}/output/*.tar.gz* [ -n "${BASEPATH}" ] && rm -rf ${BASEPATH}/output/*.tar.gz*

View File

@ -3,6 +3,7 @@ buildscript {
repositories { repositories {
google() google()
jcenter() jcenter()
mavenCentral()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:4.0.0" classpath "com.android.tools.build:gradle:4.0.0"
@ -13,6 +14,7 @@ allprojects {
repositories { repositories {
google() google()
jcenter() jcenter()
mavenCentral()
} }
} }