diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh index d811b98cf4d..edaf3dbaba1 100755 --- a/.ci/docker/build.sh +++ b/.ci/docker/build.sh @@ -155,13 +155,13 @@ case "$image" in CONDA_CMAKE=yes ONNX=yes ;; - pytorch-linux-focal-py3-clang9-android-ndk-r19c) + pytorch-linux-focal-py3-clang9-android-ndk-r21e) ANACONDA_PYTHON_VERSION=3.8 CLANG_VERSION=9 LLVMDEV=yes PROTOBUF=yes ANDROID=yes - ANDROID_NDK_VERSION=r19c + ANDROID_NDK_VERSION=r21e GRADLE_VERSION=6.8.3 NINJA_VERSION=1.9.0 ;; diff --git a/.ci/docker/common/install_base.sh b/.ci/docker/common/install_base.sh index 0f85e3105e1..f667cb06d6a 100755 --- a/.ci/docker/common/install_base.sh +++ b/.ci/docker/common/install_base.sh @@ -9,10 +9,7 @@ install_ubuntu() { # "$UBUNTU_VERSION" == "18.04"* # instead of # "$UBUNTU_VERSION" == "18.04" - if [[ "$UBUNTU_VERSION" == "18.04"* ]]; then - cmake3="cmake=3.10*" - maybe_libiomp_dev="libiomp-dev" - elif [[ "$UBUNTU_VERSION" == "20.04"* ]]; then + if [[ "$UBUNTU_VERSION" == "20.04"* ]]; then cmake3="cmake=3.16*" maybe_libiomp_dev="" elif [[ "$UBUNTU_VERSION" == "22.04"* ]]; then diff --git a/.circleci/cimodel/data/simple/util/docker_constants.py b/.circleci/cimodel/data/simple/util/docker_constants.py index 9a96b9f9f2a..8d648539dbb 100644 --- a/.circleci/cimodel/data/simple/util/docker_constants.py +++ b/.circleci/cimodel/data/simple/util/docker_constants.py @@ -32,4 +32,4 @@ def gen_mobile_docker(specifier): DOCKER_IMAGE_ASAN, DOCKER_REQUIREMENT_ASAN = gen_mobile_docker("asan") -DOCKER_IMAGE_NDK, DOCKER_REQUIREMENT_NDK = gen_mobile_docker("android-ndk-r19c") +DOCKER_IMAGE_NDK, DOCKER_REQUIREMENT_NDK = gen_mobile_docker("android-ndk-r21e") diff --git a/.github/workflows/_android-full-build-test.yml b/.github/workflows/_android-full-build-test.yml index 29b58c851e6..20165efe8df 100644 --- a/.github/workflows/_android-full-build-test.yml +++ b/.github/workflows/_android-full-build-test.yml @@ -157,7 +157,7 @@ jobs: # run gradle buildRelease (echo "./.circleci/scripts/build_android_gradle.sh" | docker exec \ - -e BUILD_ENVIRONMENT="pytorch-linux-focal-py3-clang9-android-ndk-r19c-gradle-build" \ + -e BUILD_ENVIRONMENT="pytorch-linux-focal-py3-clang9-android-ndk-r21e-gradle-build" \ -e MAX_JOBS="$(nproc --ignore=2)" \ -e AWS_DEFAULT_REGION \ -e PR_NUMBER \ diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 13ec52d8f5b..dfeb89f72fc 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -42,7 +42,7 @@ jobs: - docker-image-name: pytorch-linux-focal-rocm-n-1-py3 - docker-image-name: pytorch-linux-focal-rocm-n-py3 - docker-image-name: pytorch-linux-jammy-cuda11.8-cudnn8-py3.8-clang12 - - docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r19c + - docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r21e - docker-image-name: pytorch-linux-jammy-py3.8-gcc11 - docker-image-name: pytorch-linux-jammy-py3.8-gcc11-inductor-benchmarks - docker-image-name: pytorch-linux-jammy-py3-clang15-asan diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index e5f78ce8abe..8173ffba551 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -252,7 +252,7 @@ jobs: uses: ./.github/workflows/_linux-build.yml with: build-environment: linux-focal-py3-clang9-mobile-custom-build-static - docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r19c + docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r21e build-generates-artifacts: false test-matrix: | { include: [ @@ -319,23 +319,23 @@ jobs: { config: "default", shard: 1, num_shards: 1, runner: "linux.4xlarge.nvidia.gpu" }, ]} - linux-focal-py3-clang9-android-ndk-r19c-gradle-custom-build-single: - name: linux-focal-py3-clang9-android-ndk-r19c-gradle-custom-build-single + linux-focal-py3-clang9-android-ndk-r21e-gradle-custom-build-single: + name: linux-focal-py3-clang9-android-ndk-r21e-gradle-custom-build-single uses: ./.github/workflows/_android-build-test.yml with: - build-environment: linux-focal-py3-clang9-android-ndk-r19c-gradle-custom-build-single - docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r19c + build-environment: linux-focal-py3-clang9-android-ndk-r21e-gradle-custom-build-single + docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r21e test-matrix: | { include: [ { config: "default", shard: 1, num_shards: 1, runner: "linux.2xlarge" }, ]} - linux-focal-py3-clang9-android-ndk-r19c-gradle-custom-build-single-full-jit: - name: linux-focal-py3-clang9-android-ndk-r19c-gradle-custom-build-single-full-jit + linux-focal-py3-clang9-android-ndk-r21e-gradle-custom-build-single-full-jit: + name: linux-focal-py3-clang9-android-ndk-r21e-gradle-custom-build-single-full-jit uses: ./.github/workflows/_android-build-test.yml with: - build-environment: linux-focal-py3-clang9-android-ndk-r19c-gradle-custom-build-single-full-jit - docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r19c + build-environment: linux-focal-py3-clang9-android-ndk-r21e-gradle-custom-build-single-full-jit + docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r21e test-matrix: | { include: [ { config: "default", shard: 1, num_shards: 1, runner: "linux.2xlarge" }, diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index 5bc13506b43..c4831d364cb 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -76,12 +76,12 @@ jobs: { config: "default", shard: 1, num_shards: 1 }, ]} - pytorch-linux-focal-py3-clang9-android-ndk-r19c-build: - name: pytorch-linux-focal-py3-clang9-android-ndk-r19c-build + pytorch-linux-focal-py3-clang9-android-ndk-r21e-build: + name: pytorch-linux-focal-py3-clang9-android-ndk-r21e-build uses: ./.github/workflows/_android-full-build-test.yml with: - build-environment: pytorch-linux-focal-py3-clang9-android-ndk-r19c-build - docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r19c + build-environment: pytorch-linux-focal-py3-clang9-android-ndk-r21e-build + docker-image-name: pytorch-linux-focal-py3-clang9-android-ndk-r21e test-matrix: | { include: [ { config: "default", shard: 1, num_shards: 1, runner: "linux.2xlarge" },