Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use custom NDK version instead of action default NDK #531

Merged
merged 1 commit into from
Jan 15, 2021
Merged

Use custom NDK version instead of action default NDK #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/native_jni_s3_pytorch_android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}" --sdk_root=${ANDROID_SDK_ROOT}
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}"
- name: build android
run: |
export ANDROID_NDK=${ANDROID_HOME}/ndk-bundle
export ANDROID_NDK=${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}
./gradlew :pytorch:pytorch-native:compileAndroidJNI
- name: Upload compiled jni library
uses: actions/upload-artifact@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/native_release_pytorch_android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}" --sdk_root=${ANDROID_SDK_ROOT}
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}"
- name: publish android core to staging
run: |
export ANDROID_NDK=${ANDROID_HOME}/ndk-bundle
export ANDROID_NDK=${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}
cd android
./gradlew :pytorch-native:assemble
./gradlew publish -Pstaging
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/native_s3_pytorch_android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
- name: install Python Dependencies
run: pip install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}" --sdk_root=${ANDROID_SDK_ROOT}
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}"
- name: build android
run: |
export ANDROID_NDK=${ANDROID_HOME}/ndk-bundle
export ANDROID_NDK=${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}
export ANDROID_ABI=${{ matrix.format }}
cd android_pytorch_tmp
bash ./scripts/build_android.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}" --sdk_root=${ANDROID_SDK_ROOT}
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}"
- name: publish android package to Snapshot
run: |
export ANDROID_NDK=${ANDROID_HOME}/ndk-bundle
export ANDROID_NDK=${ANDROID_SDK_ROOT}/ndk/${NDK_VERSION}
cd android
./gradlew :pytorch-native:assemble
./gradlew publish -Psnapshot
Expand Down