From 0b1d650c61543500c592855b636180b16e235e78 Mon Sep 17 00:00:00 2001 From: agibsonccc Date: Wed, 10 Mar 2021 11:53:03 +0900 Subject: [PATCH] Update android --- .github/workflows/build-android-x86_64.yml | 2 ++ .github/workflows/build-deploy-android-arm64.yml | 1 + libnd4j/pi_build.sh | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.github/workflows/build-android-x86_64.yml b/.github/workflows/build-android-x86_64.yml index 44ea4ee71..31a01bed7 100644 --- a/.github/workflows/build-android-x86_64.yml +++ b/.github/workflows/build-android-x86_64.yml @@ -35,6 +35,8 @@ jobs: MAVEN_USERNAME: ${{ secrets.SONATYPE_USER_1 }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_USER1_PASS }} MAVEN_GPG_PASSPHRASE: ${{ secrets.PACKAGES_GPG_PASS }} + OPENBLAS_PATH: "$HOME/.javacpp/cache/openblas-0.3.13-1.5.5-android-x86_64.jar/lib/" + DEPLOY_TO: ossrh run: | echo "Verifying programs on path. Path is $PATH" echo "Path post update is $PATH. Maven is at `which mvn` cmake is at `which cmake` protoc is at `which protoc`" diff --git a/.github/workflows/build-deploy-android-arm64.yml b/.github/workflows/build-deploy-android-arm64.yml index 682afccb1..42a7b8bd1 100644 --- a/.github/workflows/build-deploy-android-arm64.yml +++ b/.github/workflows/build-deploy-android-arm64.yml @@ -37,6 +37,7 @@ jobs: MAVEN_USERNAME: ${{ secrets.SONATYPE_USER_1 }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_USER1_PASS }} MAVEN_GPG_PASSPHRASE: ${{ secrets.PACKAGES_GPG_PASS }} + DEPLOY_TO: ossrh run: | mvn --version cmake --version diff --git a/libnd4j/pi_build.sh b/libnd4j/pi_build.sh index 8a536d155..ed56bd0f9 100755 --- a/libnd4j/pi_build.sh +++ b/libnd4j/pi_build.sh @@ -317,8 +317,12 @@ message "cd $BASE_DIR/.. " cd $BASE_DIR/.. message "lets build jars" export DHELPER=" -Dlibnd4j.helper=armcompute " + if [ "${DEPLOY}" ]; then echo "Deploying to maven" + if [ -z "$PUBLISH_TO" ]; then + PUBLISH_TO="ossrh" + fi mvn -P"${PUBLISH_TO}" deploy --batch-mode -Dlibnd4j.platform=${LIBND4J_PLATFORM} -Djavacpp.platform=${LIBND4J_PLATFORM} -DprotocCommand=protoc -Djavacpp.platform.compiler=${COMPILER_PREFIX}-${CC_EXE} -Djava.library.path=${JAVA_LIBRARY_PATH} ${DHELPER} -pl ":libnd4j,:nd4j-native" --also-make -DskipTests -Dmaven.test.skip=true -Dmaven.javadoc.skip=true else echo "Installing to local repo"