forked from pytorch/pytorch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Retry download and install NDK when testing Android (pytorch#…
…97067)" This reverts commit d9b289b. Reverted pytorch#97067 on behalf of https://github.com/huydhn due to Need to rework this a bit as sdkmanager does not correctly treat a failed download as failure (surprise) https://github.com/pytorch/pytorch/actions/runs/4495666042/jobs/7909537961
- Loading branch information
1 parent
da7c42f
commit a74ecaf
Showing
1 changed file
with
8 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,28 +53,17 @@ jobs: | |
python-version: 3.8 | ||
environment-file: .github/requirements/conda-env-${{ runner.os }}-${{ runner.arch }} | ||
|
||
- name: Install NDK | ||
uses: nick-fields/[email protected] | ||
with: | ||
timeout_minutes: 5 | ||
max_attempts: 3 | ||
retry_wait_seconds: 90 | ||
command: | | ||
# Install NDK 21 after GitHub update | ||
# https://github.com/actions/virtual-environments/issues/5595 | ||
ANDROID_ROOT="/usr/local/lib/android" | ||
ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk" | ||
SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" | ||
# This step downloads and installs NDK, thus it could be flaky | ||
echo "y" | ${SDKMANAGER} "ndk;21.4.7075529" | ||
echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" >> "${GITHUB_ENV}" | ||
- name: Build PyTorch Android | ||
run: | | ||
# Install NDK 21 after GitHub update | ||
# https://github.com/actions/virtual-environments/issues/5595 | ||
ANDROID_ROOT="/usr/local/lib/android" | ||
ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk" | ||
SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" | ||
echo "y" | ${SDKMANAGER} "ndk;21.4.7075529" | ||
export ANDROID_NDK="${ANDROID_SDK_ROOT}/ndk-bundle" | ||
ln -sfn "${ANDROID_SDK_ROOT}/ndk/21.4.7075529" "${ANDROID_NDK}" | ||
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK} | ||
echo "CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname "$(which conda)")/../"}" >> "${GITHUB_ENV}" | ||
${CONDA_RUN} ./scripts/build_pytorch_android.sh x86 | ||
|