Skip to content

GitLab

Unverified Commit 2b635006 authored by Philip Meier's avatar Philip Meier Committed by GitHub
Browse files

remove android and iOS builds from CI (#7524)

parent 8fa3aa51
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 410 deletions
.circleci/config.yml
View file @ 2b635006
...@@ -46,59 +46,6 @@ commands: ...@@ -46,59 +46,6 @@ commands:
fi fi
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV} echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
brew_update:
description: "Update Homebrew and install base formulae"
steps:
- run:
name: Update Homebrew
no_output_timeout: "10m"
command: |
set -ex
# Update repositories manually.
# Running `brew update` produces a comparison between the
# current checkout and the updated checkout, which takes a
# very long time because the existing checkout is 2y old.
for path in $(find /usr/local/Homebrew -type d -name .git)
do
cd $path/..
git fetch --depth=1 origin
git reset --hard origin/master
done
export HOMEBREW_NO_AUTO_UPDATE=1
# Install expect and moreutils so that we can call `unbuffer` and `ts`.
# moreutils installs a `parallel` executable by default, which conflicts
# with the executable from the GNU `parallel`, so we must unlink GNU
# `parallel` first, and relink it afterwards.
brew install coreutils
brew unlink parallel
brew install moreutils
brew link parallel --overwrite
brew install expect
brew_install:
description: "Install Homebrew formulae"
parameters:
formulae:
type: string
default: ""
steps:
- run:
name: Install << parameters.formulae >>
no_output_timeout: "10m"
command: |
set -ex
export HOMEBREW_NO_AUTO_UPDATE=1
brew install << parameters.formulae >>
run_brew_for_ios_build:
steps:
- brew_update
- brew_install:
formulae: libtool
pip_install: pip_install:
parameters: parameters:
args: args:
...@@ -158,30 +105,6 @@ binary_common: &binary_common ...@@ -158,30 +105,6 @@ binary_common: &binary_common
CU_VERSION: << parameters.cu_version >> CU_VERSION: << parameters.cu_version >>
MACOSX_DEPLOYMENT_TARGET: 10.9 MACOSX_DEPLOYMENT_TARGET: 10.9
torchvision_ios_params: &torchvision_ios_params
parameters:
build_environment:
type: string
default: ""
ios_arch:
type: string
default: ""
ios_platform:
type: string
default: ""
environment:
BUILD_ENVIRONMENT: << parameters.build_environment >>
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 smoke_test_common: &smoke_test_common
<<: *binary_common <<: *binary_common
docker: docker:
...@@ -274,79 +197,6 @@ jobs: ...@@ -274,79 +197,6 @@ jobs:
paths: paths:
- "*" - "*"
binary_ios_build:
<<: *torchvision_ios_params
macos:
xcode: "14.0"
steps:
- attach_workspace:
at: ~/workspace
- checkout
- run_brew_for_ios_build
- run:
name: Build
no_output_timeout: "1h"
command: |
script="/Users/distiller/project/.circleci/unittest/ios/scripts/binary_ios_build.sh"
cat "$script"
source "$script"
- persist_to_workspace:
root: /Users/distiller/workspace/
paths: ios
binary_ios_upload:
<<: *torchvision_ios_params
macos:
xcode: "14.0"
steps:
- attach_workspace:
at: ~/workspace
- checkout
- run_brew_for_ios_build
- run:
name: Upload
no_output_timeout: "1h"
command: |
script="/Users/distiller/project/.circleci/unittest/ios/scripts/binary_ios_upload.sh"
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_macos_conda:
<<: *binary_common <<: *binary_common
macos: macos:
...@@ -792,19 +642,6 @@ workflows: ...@@ -792,19 +642,6 @@ workflows:
cu_version: cu121 cu_version: cu121
name: binary_win_conda_py3.11_cu121 name: binary_win_conda_py3.11_cu121
python_version: '3.11' python_version: '3.11'
- binary_ios_build:
build_environment: binary-libtorchvision_ops-ios-12.0.0-x86_64
ios_arch: x86_64
ios_platform: SIMULATOR
name: binary_libtorchvision_ops_ios_12.0.0_x86_64
- binary_ios_build:
build_environment: binary-libtorchvision_ops-ios-12.0.0-arm64
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
cmake: cmake:
jobs: jobs:
...@@ -832,42 +669,6 @@ workflows: ...@@ -832,42 +669,6 @@ workflows:
nightly: nightly:
jobs: jobs:
- binary_ios_build:
build_environment: nightly-binary-libtorchvision_ops-ios-12.0.0-x86_64
filters:
branches:
only:
- nightly
ios_arch: x86_64
ios_platform: SIMULATOR
name: nightly_binary_libtorchvision_ops_ios_12.0.0_x86_64
- binary_ios_build:
build_environment: nightly-binary-libtorchvision_ops-ios-12.0.0-arm64
filters:
branches:
only:
- nightly
ios_arch: arm64
ios_platform: OS
name: nightly_binary_libtorchvision_ops_ios_12.0.0_arm64
- binary_ios_upload:
build_environment: nightly-binary-libtorchvision_ops-ios-12.0.0-upload
context: org-member
filters:
branches:
only:
- nightly
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: - binary_win_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
......
.circleci/config.yml.in
View file @ 2b635006
...@@ -46,59 +46,6 @@ commands: ...@@ -46,59 +46,6 @@ commands:
fi fi
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV} echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
brew_update:
description: "Update Homebrew and install base formulae"
steps:
- run:
name: Update Homebrew
no_output_timeout: "10m"
command: |
set -ex
# Update repositories manually.
# Running `brew update` produces a comparison between the
# current checkout and the updated checkout, which takes a
# very long time because the existing checkout is 2y old.
for path in $(find /usr/local/Homebrew -type d -name .git)
do
cd $path/..
git fetch --depth=1 origin
git reset --hard origin/master
done
export HOMEBREW_NO_AUTO_UPDATE=1
# Install expect and moreutils so that we can call `unbuffer` and `ts`.
# moreutils installs a `parallel` executable by default, which conflicts
# with the executable from the GNU `parallel`, so we must unlink GNU
# `parallel` first, and relink it afterwards.
brew install coreutils
brew unlink parallel
brew install moreutils
brew link parallel --overwrite
brew install expect
brew_install:
description: "Install Homebrew formulae"
parameters:
formulae:
type: string
default: ""
steps:
- run:
name: Install << parameters.formulae >>
no_output_timeout: "10m"
command: |
set -ex
export HOMEBREW_NO_AUTO_UPDATE=1
brew install << parameters.formulae >>
run_brew_for_ios_build:
steps:
- brew_update
- brew_install:
formulae: libtool
pip_install: pip_install:
parameters: parameters:
args: args:
...@@ -158,30 +105,6 @@ binary_common: &binary_common ...@@ -158,30 +105,6 @@ binary_common: &binary_common
CU_VERSION: << parameters.cu_version >> CU_VERSION: << parameters.cu_version >>
MACOSX_DEPLOYMENT_TARGET: 10.9 MACOSX_DEPLOYMENT_TARGET: 10.9
torchvision_ios_params: &torchvision_ios_params
parameters:
build_environment:
type: string
default: ""
ios_arch:
type: string
default: ""
ios_platform:
type: string
default: ""
environment:
BUILD_ENVIRONMENT: << parameters.build_environment >>
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 smoke_test_common: &smoke_test_common
<<: *binary_common <<: *binary_common
docker: docker:
...@@ -274,79 +197,6 @@ jobs: ...@@ -274,79 +197,6 @@ jobs:
paths: paths:
- "*" - "*"
binary_ios_build:
<<: *torchvision_ios_params
macos:
xcode: "14.0"
steps:
- attach_workspace:
at: ~/workspace
- checkout
- run_brew_for_ios_build
- run:
name: Build
no_output_timeout: "1h"
command: |
script="/Users/distiller/project/.circleci/unittest/ios/scripts/binary_ios_build.sh"
cat "$script"
source "$script"
- persist_to_workspace:
root: /Users/distiller/workspace/
paths: ios
binary_ios_upload:
<<: *torchvision_ios_params
macos:
xcode: "14.0"
steps:
- attach_workspace:
at: ~/workspace
- checkout
- run_brew_for_ios_build
- run:
name: Upload
no_output_timeout: "1h"
command: |
script="/Users/distiller/project/.circleci/unittest/ios/scripts/binary_ios_upload.sh"
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_macos_conda:
<<: *binary_common <<: *binary_common
macos: macos:
...@@ -525,8 +375,6 @@ workflows: ...@@ -525,8 +375,6 @@ workflows:
build: build:
jobs: jobs:
{{ build_workflows(windows_latest_only=True) }} {{ build_workflows(windows_latest_only=True) }}
{{ ios_workflows() }}
{{ android_workflows() }}
cmake: cmake:
jobs: jobs:
...@@ -534,8 +382,6 @@ workflows: ...@@ -534,8 +382,6 @@ workflows:
nightly: nightly:
jobs: jobs:
{{ ios_workflows(nightly=True) }}
{{ android_workflows(nightly=True) }}
{{ build_workflows(prefix="nightly_", filter_branch="nightly", upload=True) }} {{ build_workflows(prefix="nightly_", filter_branch="nightly", upload=True) }}
docker_build: docker_build:
triggers: triggers:
......
.circleci/regenerate.py
View file @ 2b635006
...@@ -233,61 +233,6 @@ def cmake_workflows(indentation=6): ...@@ -233,61 +233,6 @@ def cmake_workflows(indentation=6):
return indent(indentation, jobs) return indent(indentation, jobs)
def ios_workflows(indentation=6, nightly=False):
jobs = []
build_job_names = []
name_prefix = "nightly_" if nightly else ""
env_prefix = "nightly-" if nightly else ""
for arch, platform in [("x86_64", "SIMULATOR"), ("arm64", "OS")]:
name = f"{name_prefix}binary_libtorchvision_ops_ios_12.0.0_{arch}"
build_job_names.append(name)
build_job = {
"build_environment": f"{env_prefix}binary-libtorchvision_ops-ios-12.0.0-{arch}",
"ios_arch": arch,
"ios_platform": platform,
"name": name,
}
if nightly:
build_job["filters"] = gen_filter_branch_tree("nightly")
jobs.append({"binary_ios_build": build_job})
if nightly:
upload_job = {
"build_environment": f"{env_prefix}binary-libtorchvision_ops-ios-12.0.0-upload",
"context": "org-member",
"filters": gen_filter_branch_tree("nightly"),
"requires": build_job_names,
}
jobs.append({"binary_ios_upload": upload_job})
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__": if __name__ == "__main__":
d = os.path.dirname(__file__) d = os.path.dirname(__file__)
env = jinja2.Environment( env = jinja2.Environment(
...@@ -302,7 +247,5 @@ if __name__ == "__main__": ...@@ -302,7 +247,5 @@ if __name__ == "__main__":
env.get_template("config.yml.in").render( env.get_template("config.yml.in").render(
build_workflows=build_workflows, build_workflows=build_workflows,
cmake_workflows=cmake_workflows, cmake_workflows=cmake_workflows,
ios_workflows=ios_workflows,
android_workflows=android_workflows,
) )
) )
android/README.md 0 → 100644
View file @ 2b635006
## Status
The Android demo of TorchVision is currently unmaintained, untested and likely out-of-date.
ios/README.md 0 → 100644
View file @ 2b635006
## Status
The iOS demo of TorchVision is currently unmaintained, untested and likely out-of-date.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment