Skip to content

GitLab

Unverified Commit 0113b00d authored by Andrey Talman's avatar Andrey Talman Committed by GitHub
Browse files

Move cirecleci cu102 jobs to cpu (#6650)

parent a35be97a
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
.circleci/config.yml
View file @ 0113b00d
...@@ -223,7 +223,7 @@ binary_common: &binary_common ...@@ -223,7 +223,7 @@ binary_common: &binary_common
wheel_docker_image: wheel_docker_image:
description: "Wheel only: what docker image to use" description: "Wheel only: what docker image to use"
type: string type: string
default: "pytorch/manylinux-cuda102" default: ""
conda_docker_image: conda_docker_image:
description: "Conda only: what docker image to use" description: "Conda only: what docker image to use"
type: string type: string
...@@ -724,7 +724,7 @@ jobs: ...@@ -724,7 +724,7 @@ jobs:
unittest_linux_cpu: unittest_linux_cpu:
<<: *binary_common <<: *binary_common
docker: docker:
- image: "pytorch/manylinux-cuda102" - image: "pytorch/manylinux-cpu"
resource_class: 2xlarge+ resource_class: 2xlarge+
steps: steps:
- checkout - checkout
...@@ -941,7 +941,7 @@ jobs: ...@@ -941,7 +941,7 @@ jobs:
cmake_linux_cpu: cmake_linux_cpu:
<<: *binary_common <<: *binary_common
docker: docker:
- image: "pytorch/manylinux-cuda102" - image: "pytorch/manylinux-cpu"
resource_class: 2xlarge+ resource_class: 2xlarge+
steps: steps:
- checkout_merge - checkout_merge
...@@ -1105,7 +1105,7 @@ workflows: ...@@ -1105,7 +1105,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_linux_wheel_py3.7_cpu name: binary_linux_wheel_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_wheel: - binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1139,7 +1139,7 @@ workflows: ...@@ -1139,7 +1139,7 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_wheel_py3.8_cpu name: binary_linux_wheel_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_wheel: - binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1173,7 +1173,7 @@ workflows: ...@@ -1173,7 +1173,7 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_wheel_py3.9_cpu name: binary_linux_wheel_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_wheel: - binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1207,7 +1207,7 @@ workflows: ...@@ -1207,7 +1207,7 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_wheel_py3.10_cpu name: binary_linux_wheel_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_wheel: - binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1241,25 +1241,25 @@ workflows: ...@@ -1241,25 +1241,25 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_macos_wheel_py3.7_cpu name: binary_macos_wheel_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_macos_wheel: - binary_macos_wheel:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
name: binary_macos_wheel_py3.8_cpu name: binary_macos_wheel_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_macos_wheel: - binary_macos_wheel:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
name: binary_macos_wheel_py3.9_cpu name: binary_macos_wheel_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_macos_wheel: - binary_macos_wheel:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
name: binary_macos_wheel_py3.10_cpu name: binary_macos_wheel_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_win_wheel: - binary_win_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1363,7 +1363,7 @@ workflows: ...@@ -1363,7 +1363,7 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_conda_py3.7_cpu name: binary_linux_conda_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1387,7 +1387,7 @@ workflows: ...@@ -1387,7 +1387,7 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_conda_py3.8_cpu name: binary_linux_conda_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1411,7 +1411,7 @@ workflows: ...@@ -1411,7 +1411,7 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_conda_py3.9_cpu name: binary_linux_conda_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1435,7 +1435,7 @@ workflows: ...@@ -1435,7 +1435,7 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_conda_py3.10_cpu name: binary_linux_conda_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102 conda_docker_image: pytorch/conda-builder:cuda102
cu_version: cu102 cu_version: cu102
...@@ -1459,25 +1459,25 @@ workflows: ...@@ -1459,25 +1459,25 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_macos_conda_py3.7_cpu name: binary_macos_conda_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_macos_conda: - binary_macos_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
name: binary_macos_conda_py3.8_cpu name: binary_macos_conda_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_macos_conda: - binary_macos_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
name: binary_macos_conda_py3.9_cpu name: binary_macos_conda_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_macos_conda: - binary_macos_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
name: binary_macos_conda_py3.10_cpu name: binary_macos_conda_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_win_conda: - binary_win_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1801,7 +1801,7 @@ workflows: ...@@ -1801,7 +1801,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.7_cpu name: nightly_binary_linux_wheel_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -1931,7 +1931,7 @@ workflows: ...@@ -1931,7 +1931,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.8_cpu name: nightly_binary_linux_wheel_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -2061,7 +2061,7 @@ workflows: ...@@ -2061,7 +2061,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.9_cpu name: nightly_binary_linux_wheel_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -2191,7 +2191,7 @@ workflows: ...@@ -2191,7 +2191,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.10_cpu name: nightly_binary_linux_wheel_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -2321,7 +2321,7 @@ workflows: ...@@ -2321,7 +2321,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_wheel_py3.7_cpu name: nightly_binary_macos_wheel_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -2343,7 +2343,7 @@ workflows: ...@@ -2343,7 +2343,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_wheel_py3.8_cpu name: nightly_binary_macos_wheel_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -2365,7 +2365,7 @@ workflows: ...@@ -2365,7 +2365,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_wheel_py3.9_cpu name: nightly_binary_macos_wheel_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -2387,7 +2387,7 @@ workflows: ...@@ -2387,7 +2387,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_wheel_py3.10_cpu name: nightly_binary_macos_wheel_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -2649,7 +2649,7 @@ workflows: ...@@ -2649,7 +2649,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.7_cpu name: nightly_binary_linux_conda_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -2733,7 +2733,7 @@ workflows: ...@@ -2733,7 +2733,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cpu name: nightly_binary_linux_conda_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -2817,7 +2817,7 @@ workflows: ...@@ -2817,7 +2817,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.9_cpu name: nightly_binary_linux_conda_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -2901,7 +2901,7 @@ workflows: ...@@ -2901,7 +2901,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.10_cpu name: nightly_binary_linux_conda_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -2985,7 +2985,7 @@ workflows: ...@@ -2985,7 +2985,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_conda_py3.7_cpu name: nightly_binary_macos_conda_py3.7_cpu
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -3006,7 +3006,7 @@ workflows: ...@@ -3006,7 +3006,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_conda_py3.8_cpu name: nightly_binary_macos_conda_py3.8_cpu
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -3027,7 +3027,7 @@ workflows: ...@@ -3027,7 +3027,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_conda_py3.9_cpu name: nightly_binary_macos_conda_py3.9_cpu
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -3048,7 +3048,7 @@ workflows: ...@@ -3048,7 +3048,7 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_macos_conda_py3.10_cpu name: nightly_binary_macos_conda_py3.10_cpu
python_version: '3.10' python_version: '3.10'
wheel_docker_image: pytorch/manylinux-cuda102 wheel_docker_image: pytorch/manylinux-cpu
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
......
.circleci/config.yml.in
View file @ 0113b00d
...@@ -223,7 +223,7 @@ binary_common: &binary_common ...@@ -223,7 +223,7 @@ binary_common: &binary_common
wheel_docker_image: wheel_docker_image:
description: "Wheel only: what docker image to use" description: "Wheel only: what docker image to use"
type: string type: string
default: "pytorch/manylinux-cuda102" default: ""
conda_docker_image: conda_docker_image:
description: "Conda only: what docker image to use" description: "Conda only: what docker image to use"
type: string type: string
...@@ -724,7 +724,7 @@ jobs: ...@@ -724,7 +724,7 @@ jobs:
unittest_linux_cpu: unittest_linux_cpu:
<<: *binary_common <<: *binary_common
docker: docker:
- image: "pytorch/manylinux-cuda102" - image: "pytorch/manylinux-cpu"
resource_class: 2xlarge+ resource_class: 2xlarge+
steps: steps:
- checkout - checkout
...@@ -941,7 +941,7 @@ jobs: ...@@ -941,7 +941,7 @@ jobs:
cmake_linux_cpu: cmake_linux_cpu:
<<: *binary_common <<: *binary_common
docker: docker:
- image: "pytorch/manylinux-cuda102" - image: "pytorch/manylinux-cpu"
resource_class: 2xlarge+ resource_class: 2xlarge+
steps: steps:
- checkout_merge - checkout_merge
......
.circleci/regenerate.py
View file @ 0113b00d
...@@ -130,7 +130,7 @@ manylinux_images = { ...@@ -130,7 +130,7 @@ manylinux_images = {
def get_manylinux_image(cu_version): def get_manylinux_image(cu_version):
if cu_version == "cpu": if cu_version == "cpu":
return "pytorch/manylinux-cuda102" return "pytorch/manylinux-cpu"
elif cu_version.startswith("cu"): elif cu_version.startswith("cu"):
cu_suffix = cu_version[len("cu") :] cu_suffix = cu_version[len("cu") :]
return f"pytorch/manylinux-cuda{cu_suffix}" return f"pytorch/manylinux-cuda{cu_suffix}"
......
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