Skip to content

GitLab

Commit 9368f33b authored by atalman's avatar atalman Committed by Facebook GitHub Bot
Browse files

Switch circleci jobs from cu116 to cu117 (#3034) 

Summary:
Switch circleci jobs from cu116 to cu117

Pull Request resolved: https://github.com/pytorch/audio/pull/3034

Reviewed By: DanilBaibak

Differential Revision: D43042385

Pulled By: atalman

fbshipit-source-id: 636e3d86d66a6091d13d731238550d800e77ccc8
parent b7e173fa
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 322 deletions
.circleci/config.yml
View file @ 9368f33b
......@@ -943,19 +943,6 @@ workflows:
python_version: '3.8'
requires:
- binary_windows_wheel_py3.8_cpu
- binary_windows_wheel:
cuda_version: cu116
name: binary_windows_wheel_py3.8_cu116
python_version: '3.8'
requires:
- build_ffmpeg_windows
wheel_docker_image: pytorch/manylinux-cuda116
- smoke_test_windows_pip:
cuda_version: cu116
name: binary_windows_wheel_py3.8_cu116_smoke_test_pip
python_version: '3.8'
requires:
- binary_windows_wheel_py3.8_cu116
- binary_windows_wheel:
cuda_version: cu117
name: binary_windows_wheel_py3.8_cu117
......@@ -994,19 +981,6 @@ workflows:
python_version: '3.9'
requires:
- binary_windows_wheel_py3.9_cpu
- binary_windows_wheel:
cuda_version: cu116
name: binary_windows_wheel_py3.9_cu116
python_version: '3.9'
requires:
- build_ffmpeg_windows
wheel_docker_image: pytorch/manylinux-cuda116
- smoke_test_windows_pip:
cuda_version: cu116
name: binary_windows_wheel_py3.9_cu116_smoke_test_pip
python_version: '3.9'
requires:
- binary_windows_wheel_py3.9_cu116
- binary_windows_wheel:
cuda_version: cu117
name: binary_windows_wheel_py3.9_cu117
......@@ -1045,19 +1019,6 @@ workflows:
python_version: '3.10'
requires:
- binary_windows_wheel_py3.10_cpu
- binary_windows_wheel:
cuda_version: cu116
name: binary_windows_wheel_py3.10_cu116
python_version: '3.10'
requires:
- build_ffmpeg_windows
wheel_docker_image: pytorch/manylinux-cuda116
- smoke_test_windows_pip:
cuda_version: cu116
name: binary_windows_wheel_py3.10_cu116_smoke_test_pip
python_version: '3.10'
requires:
- binary_windows_wheel_py3.10_cu116
- binary_windows_wheel:
cuda_version: cu117
name: binary_windows_wheel_py3.10_cu117
......@@ -1085,18 +1046,18 @@ workflows:
requires:
- binary_windows_wheel_py3.10_cu118
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
name: binary_linux_conda_py3.8_cu116
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
name: binary_linux_conda_py3.8_cu117
python_version: '3.8'
requires:
- build_ffmpeg_linux
- smoke_test_linux_conda_gpu:
cuda_version: cu116
name: binary_linux_conda_py3.8_cu116_smoke_test_conda
cuda_version: cu117
name: binary_linux_conda_py3.8_cu117_smoke_test_conda
python_version: '3.8'
requires:
- binary_linux_conda_py3.8_cu116
- binary_linux_conda_py3.8_cu117
- binary_macos_conda:
conda_docker_image: pytorch/conda-builder:cpu
cuda_version: cpu
......@@ -1131,19 +1092,6 @@ workflows:
python_version: '3.8'
requires:
- binary_windows_conda_py3.8_cpu
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
name: binary_windows_conda_py3.8_cu116
python_version: '3.8'
requires:
- build_ffmpeg_windows
- smoke_test_windows_conda_gpu:
cuda_version: cu116
name: binary_windows_conda_py3.8_cu116_smoke_test_conda
python_version: '3.8'
requires:
- binary_windows_conda_py3.8_cu116
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
......@@ -1183,19 +1131,6 @@ workflows:
python_version: '3.9'
requires:
- binary_windows_conda_py3.9_cpu
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
name: binary_windows_conda_py3.9_cu116
python_version: '3.9'
requires:
- build_ffmpeg_windows
- smoke_test_windows_conda_gpu:
cuda_version: cu116
name: binary_windows_conda_py3.9_cu116_smoke_test_conda
python_version: '3.9'
requires:
- binary_windows_conda_py3.9_cu116
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
......@@ -1235,19 +1170,6 @@ workflows:
python_version: '3.10'
requires:
- binary_windows_conda_py3.10_cpu
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
name: binary_windows_conda_py3.10_cu116
python_version: '3.10'
requires:
- build_ffmpeg_windows
- smoke_test_windows_conda_gpu:
cuda_version: cu116
name: binary_windows_conda_py3.10_cu116_smoke_test_conda
python_version: '3.10'
requires:
- binary_windows_conda_py3.10_cu116
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
......@@ -1275,7 +1197,7 @@ workflows:
requires:
- binary_windows_conda_py3.10_cu118
- build_docs:
cuda_version: cu116
cuda_version: cu117
filters:
branches:
only:
......@@ -1285,7 +1207,7 @@ workflows:
name: build_docs
python_version: '3.8'
requires:
- binary_linux_conda_py3.8_cu116
- binary_linux_conda_py3.8_cu117
- upload_docs:
context: org-member
filters:
......@@ -1325,19 +1247,19 @@ workflows:
requires:
- download_third_parties
- unittest_linux_gpu:
cuda_version: cu116
cuda_version: cu117
name: unittest_linux_gpu_py3.8
python_version: '3.8'
requires:
- download_third_parties
- unittest_linux_gpu:
cuda_version: cu116
cuda_version: cu117
name: unittest_linux_gpu_py3.9
python_version: '3.9'
requires:
- download_third_parties
- unittest_linux_gpu:
cuda_version: cu116
cuda_version: cu117
name: unittest_linux_gpu_py3.10
python_version: '3.10'
requires:
......@@ -1349,7 +1271,7 @@ workflows:
requires:
- download_third_parties
- unittest_windows_gpu:
cuda_version: cu116
cuda_version: cu117
name: unittest_windows_gpu_py3.8
python_version: '3.8'
requires:
......@@ -1443,43 +1365,6 @@ workflows:
python_version: '3.8'
requires:
- nightly_binary_windows_wheel_py3.8_cpu
- binary_windows_wheel:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.8_cu116
python_version: '3.8'
requires:
- build_ffmpeg_windows
wheel_docker_image: pytorch/manylinux-cuda116
- binary_wheel_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.8_cu116_upload
requires:
- nightly_binary_windows_wheel_py3.8_cu116
subfolder: cu116/
- smoke_test_windows_pip:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.8_cu116_smoke_test_pip
python_version: '3.8'
requires:
- nightly_binary_windows_wheel_py3.8_cu116
- binary_windows_wheel:
cuda_version: cu117
filters:
......@@ -1590,43 +1475,6 @@ workflows:
python_version: '3.9'
requires:
- nightly_binary_windows_wheel_py3.9_cpu
- binary_windows_wheel:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.9_cu116
python_version: '3.9'
requires:
- build_ffmpeg_windows
wheel_docker_image: pytorch/manylinux-cuda116
- binary_wheel_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.9_cu116_upload
requires:
- nightly_binary_windows_wheel_py3.9_cu116
subfolder: cu116/
- smoke_test_windows_pip:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.9_cu116_smoke_test_pip
python_version: '3.9'
requires:
- nightly_binary_windows_wheel_py3.9_cu116
- binary_windows_wheel:
cuda_version: cu117
filters:
......@@ -1737,43 +1585,6 @@ workflows:
python_version: '3.10'
requires:
- nightly_binary_windows_wheel_py3.10_cpu
- binary_windows_wheel:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.10_cu116
python_version: '3.10'
requires:
- build_ffmpeg_windows
wheel_docker_image: pytorch/manylinux-cuda116
- binary_wheel_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.10_cu116_upload
requires:
- nightly_binary_windows_wheel_py3.10_cu116
subfolder: cu116/
- smoke_test_windows_pip:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_wheel_py3.10_cu116_smoke_test_pip
python_version: '3.10'
requires:
- nightly_binary_windows_wheel_py3.10_cu116
- binary_windows_wheel:
cuda_version: cu117
filters:
......@@ -1849,30 +1660,30 @@ workflows:
requires:
- nightly_binary_windows_wheel_py3.10_cu118
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cu116
name: nightly_binary_linux_conda_py3.8_cu117
python_version: '3.8'
requires:
- build_ffmpeg_linux
- smoke_test_linux_conda_gpu:
cuda_version: cu116
cuda_version: cu117
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cu116_smoke_test_conda
name: nightly_binary_linux_conda_py3.8_cu117_smoke_test_conda
python_version: '3.8'
requires:
- nightly_binary_linux_conda_py3.8_cu116
- nightly_binary_linux_conda_py3.8_cu117
- binary_macos_conda:
conda_docker_image: pytorch/conda-builder:cpu
cuda_version: cpu
......@@ -1981,42 +1792,6 @@ workflows:
python_version: '3.8'
requires:
- nightly_binary_windows_conda_py3.8_cpu
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.8_cu116
python_version: '3.8'
requires:
- build_ffmpeg_windows
- binary_conda_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.8_cu116_upload
requires:
- nightly_binary_windows_conda_py3.8_cu116
- smoke_test_windows_conda_gpu:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.8_cu116_smoke_test_conda
python_version: '3.8'
requires:
- nightly_binary_windows_conda_py3.8_cu116
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
......@@ -2125,42 +1900,6 @@ workflows:
python_version: '3.9'
requires:
- nightly_binary_windows_conda_py3.9_cpu
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.9_cu116
python_version: '3.9'
requires:
- build_ffmpeg_windows
- binary_conda_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.9_cu116_upload
requires:
- nightly_binary_windows_conda_py3.9_cu116
- smoke_test_windows_conda_gpu:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.9_cu116_smoke_test_conda
python_version: '3.9'
requires:
- nightly_binary_windows_conda_py3.9_cu116
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
......@@ -2269,42 +2008,6 @@ workflows:
python_version: '3.10'
requires:
- nightly_binary_windows_conda_py3.10_cpu
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.10_cu116
python_version: '3.10'
requires:
- build_ffmpeg_windows
- binary_conda_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.10_cu116_upload
requires:
- nightly_binary_windows_conda_py3.10_cu116
- smoke_test_windows_conda_gpu:
cuda_version: cu116
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_windows_conda_py3.10_cu116_smoke_test_conda
python_version: '3.10'
requires:
- nightly_binary_windows_conda_py3.10_cu116
- binary_windows_conda:
conda_docker_image: pytorch/conda-builder:cuda117
cuda_version: cu117
......
.circleci/regenerate.py
View file @ 9368f33b
......@@ -23,8 +23,8 @@ from jinja2 import select_autoescape
PYTHON_VERSIONS = ["3.8", "3.9", "3.10"]
CU_VERSIONS_DICT = {
"linux": ["cpu", "cu116", "cu117", "cu118", "rocm5.2", "rocm5.3"],
"windows": ["cpu", "cu116", "cu117", "cu118"],
"linux": ["cpu", "cu117", "cu118", "rocm5.2", "rocm5.3"],
"windows": ["cpu", "cu117", "cu118"],
"macos": ["cpu"],
}
......@@ -48,7 +48,7 @@ def build_workflows(prefix="", upload=False, filter_branch=None, indentation=6):
or (
os_type == "linux"
and btype == "conda"
and (python_version != "3.8" or cu_version != "cu116")
and (python_version != "3.8" or cu_version != "cu117")
)
or (os_type == "macos" and btype == "wheel")
):
......@@ -60,7 +60,7 @@ def build_workflows(prefix="", upload=False, filter_branch=None, indentation=6):
# the fields must match the build_docs "requires" dependency
fb = "/.*/"
if os_type == "linux" and btype == "conda" and python_version == "3.8" and cu_version == "cu116":
if os_type == "linux" and btype == "conda" and python_version == "3.8" and cu_version == "cu117":
w += build_workflow_pair(btype, os_type, python_version, cu_version, fb, prefix, False)
continue
......@@ -120,9 +120,9 @@ def build_doc_job(filter_branch):
job = {
"name": "build_docs",
"python_version": "3.8",
"cuda_version": "cu116",
"cuda_version": "cu117",
"requires": [
"binary_linux_conda_py3.8_cu116",
"binary_linux_conda_py3.8_cu117",
],
}
......@@ -254,7 +254,7 @@ def unittest_workflows(indentation=6):
job = {
"name": f"unittest_{os_type}_{device_type}_py{python_version}",
"python_version": python_version,
"cuda_version": "cpu" if device_type == "cpu" else "cu116",
"cuda_version": "cpu" if device_type == "cpu" else "cu117",
"requires": ["download_third_parties"],
}
......
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