From 7146ec00cc568922147606414285f65f6791457b Mon Sep 17 00:00:00 2001 From: Omkar Salpekar Date: Fri, 21 Apr 2023 11:31:43 -0700 Subject: [PATCH] [NovaX] Remove Torchvision Android builds --- .circleci/config.yml | 55 ----------------------------------------- .circleci/config.yml.in | 46 ---------------------------------- .circleci/regenerate.py | 27 -------------------- 3 files changed, 128 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 302c3427344..9b9c403b3d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,14 +174,6 @@ torchvision_ios_params: &torchvision_ios_params IOS_ARCH: << parameters.ios_arch >> IOS_PLATFORM: << parameters.ios_platform >> -torchvision_android_params: &torchvision_android_params - parameters: - build_environment: - type: string - default: "" - environment: - BUILD_ENVIRONMENT: << parameters.build_environment >> - smoke_test_common: &smoke_test_common <<: *binary_common docker: @@ -311,42 +303,6 @@ jobs: cat "$script" source "$script" - binary_android_build: - <<: *torchvision_android_params - docker: - - image: cimg/android:2021.08-ndk - resource_class: xlarge - steps: - - attach_workspace: - at: ~/workspace - - checkout - - run: - name: Build - no_output_timeout: "1h" - command: | - script="/home/circleci/project/.circleci/unittest/android/scripts/binary_android_build.sh" - cat "$script" - source "$script" - - store_artifacts: - path: ~/workspace/artifacts - - binary_android_upload: - <<: *torchvision_android_params - docker: - - image: cimg/android:2021.08-ndk - resource_class: xlarge - steps: - - attach_workspace: - at: ~/workspace - - checkout - - run: - name: Upload - no_output_timeout: "1h" - command: | - script="/home/circleci/project/.circleci/unittest/android/scripts/binary_android_upload.sh" - cat "$script" - source "$script" - binary_macos_conda: <<: *binary_common macos: @@ -777,9 +733,6 @@ workflows: ios_arch: arm64 ios_platform: OS name: binary_libtorchvision_ops_ios_12.0.0_arm64 - - binary_android_build: - build_environment: binary-libtorchvision_ops-android - name: binary_libtorchvision_ops_android unittest: jobs: @@ -860,14 +813,6 @@ workflows: requires: - nightly_binary_libtorchvision_ops_ios_12.0.0_x86_64 - nightly_binary_libtorchvision_ops_ios_12.0.0_arm64 - - binary_android_upload: - build_environment: nightly-binary-libtorchvision_ops-android-upload - context: org-member - filters: - branches: - only: - - nightly - name: nightly_binary_libtorchvision_ops_android_upload - binary_win_wheel: cu_version: cpu filters: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 0a6679938a9..0b01c7b313b 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -174,14 +174,6 @@ torchvision_ios_params: &torchvision_ios_params IOS_ARCH: << parameters.ios_arch >> IOS_PLATFORM: << parameters.ios_platform >> -torchvision_android_params: &torchvision_android_params - parameters: - build_environment: - type: string - default: "" - environment: - BUILD_ENVIRONMENT: << parameters.build_environment >> - smoke_test_common: &smoke_test_common <<: *binary_common docker: @@ -311,42 +303,6 @@ jobs: cat "$script" source "$script" - binary_android_build: - <<: *torchvision_android_params - docker: - - image: cimg/android:2021.08-ndk - resource_class: xlarge - steps: - - attach_workspace: - at: ~/workspace - - checkout - - run: - name: Build - no_output_timeout: "1h" - command: | - script="/home/circleci/project/.circleci/unittest/android/scripts/binary_android_build.sh" - cat "$script" - source "$script" - - store_artifacts: - path: ~/workspace/artifacts - - binary_android_upload: - <<: *torchvision_android_params - docker: - - image: cimg/android:2021.08-ndk - resource_class: xlarge - steps: - - attach_workspace: - at: ~/workspace - - checkout - - run: - name: Upload - no_output_timeout: "1h" - command: | - script="/home/circleci/project/.circleci/unittest/android/scripts/binary_android_upload.sh" - cat "$script" - source "$script" - binary_macos_conda: <<: *binary_common macos: @@ -573,7 +529,6 @@ workflows: jobs: {{ build_workflows(windows_latest_only=True) }} {{ ios_workflows() }} - {{ android_workflows() }} unittest: jobs: @@ -586,7 +541,6 @@ workflows: nightly: jobs: {{ ios_workflows(nightly=True) }} - {{ android_workflows(nightly=True) }} {{ build_workflows(prefix="nightly_", filter_branch="nightly", upload=True) }} docker_build: triggers: diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 11f2f791a73..52dfaa6747c 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -291,32 +291,6 @@ def ios_workflows(indentation=6, nightly=False): return indent(indentation, jobs) -def android_workflows(indentation=6, nightly=False): - jobs = [] - build_job_names = [] - name_prefix = "nightly_" if nightly else "" - env_prefix = "nightly-" if nightly else "" - - name = f"{name_prefix}binary_libtorchvision_ops_android" - build_job_names.append(name) - build_job = { - "build_environment": f"{env_prefix}binary-libtorchvision_ops-android", - "name": name, - } - - if nightly: - upload_job = { - "build_environment": f"{env_prefix}binary-libtorchvision_ops-android-upload", - "context": "org-member", - "filters": gen_filter_branch_tree("nightly"), - "name": f"{name_prefix}binary_libtorchvision_ops_android_upload", - } - jobs.append({"binary_android_upload": upload_job}) - else: - jobs.append({"binary_android_build": build_job}) - return indent(indentation, jobs) - - if __name__ == "__main__": d = os.path.dirname(__file__) env = jinja2.Environment( @@ -333,6 +307,5 @@ def android_workflows(indentation=6, nightly=False): unittest_workflows=unittest_workflows, cmake_workflows=cmake_workflows, ios_workflows=ios_workflows, - android_workflows=android_workflows, ) )