Skip to content

GitLab

Unverified Commit 8aa31740 authored by Andrey Talman's avatar Andrey Talman Committed by GitHub
Browse files

Add CUDA-11.5 builds to torchvision (#5024) 

* Add CUDA-11.5 builds to torchvision

* Try to fix cudatoolkit issue

* Trying to use cuda11.5 instead of the toolkit

* Trying to rollback last two changes

* Testing

* Using conda-forge only for cuda115 builds

* Fix typo
parent d716c426
Hide whitespace changes
Inline Side-by-side
Showing with 640 additions and 5 deletions
.circleci/config.yml
View file @ 8aa31740
...@@ -1108,6 +1108,12 @@ workflows: ...@@ -1108,6 +1108,12 @@ workflows:
name: binary_linux_wheel_py3.6_cu113 name: binary_linux_wheel_py3.6_cu113
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_wheel_py3.6_cu115
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
name: binary_linux_wheel_py3.6_rocm4.2 name: binary_linux_wheel_py3.6_rocm4.2
...@@ -1147,6 +1153,12 @@ workflows: ...@@ -1147,6 +1153,12 @@ workflows:
name: binary_linux_wheel_py3.7_cu113 name: binary_linux_wheel_py3.7_cu113
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_wheel_py3.7_cu115
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
name: binary_linux_wheel_py3.7_rocm4.2 name: binary_linux_wheel_py3.7_rocm4.2
...@@ -1181,6 +1193,12 @@ workflows: ...@@ -1181,6 +1193,12 @@ workflows:
name: binary_linux_wheel_py3.8_cu113 name: binary_linux_wheel_py3.8_cu113
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_wheel_py3.8_cu115
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
name: binary_linux_wheel_py3.8_rocm4.2 name: binary_linux_wheel_py3.8_rocm4.2
...@@ -1215,6 +1233,12 @@ workflows: ...@@ -1215,6 +1233,12 @@ workflows:
name: binary_linux_wheel_py3.9_cu113 name: binary_linux_wheel_py3.9_cu113
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_wheel_py3.9_cu115
python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
name: binary_linux_wheel_py3.9_rocm4.2 name: binary_linux_wheel_py3.9_rocm4.2
...@@ -1276,6 +1300,15 @@ workflows: ...@@ -1276,6 +1300,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.6_cu113 name: binary_win_wheel_py3.6_cu113
python_version: '3.6' python_version: '3.6'
- binary_win_wheel:
cu_version: cu115
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.6_cu115
python_version: '3.6'
- binary_win_wheel: - binary_win_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1303,6 +1336,15 @@ workflows: ...@@ -1303,6 +1336,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cu113 name: binary_win_wheel_py3.7_cu113
python_version: '3.7' python_version: '3.7'
- binary_win_wheel:
cu_version: cu115
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cu115
python_version: '3.7'
- binary_win_wheel: - binary_win_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1330,6 +1372,15 @@ workflows: ...@@ -1330,6 +1372,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cu113 name: binary_win_wheel_py3.8_cu113
python_version: '3.8' python_version: '3.8'
- binary_win_wheel:
cu_version: cu115
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cu115
python_version: '3.8'
- binary_win_wheel: - binary_win_wheel:
cu_version: cpu cu_version: cpu
name: binary_win_wheel_py3.9_cpu name: binary_win_wheel_py3.9_cpu
...@@ -1345,8 +1396,17 @@ workflows: ...@@ -1345,8 +1396,17 @@ workflows:
python_version: '3.9' python_version: '3.9'
- binary_win_wheel: - binary_win_wheel:
cu_version: cu113 cu_version: cu113
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.9_cu113 name: binary_win_wheel_py3.9_cu113
python_version: '3.9' python_version: '3.9'
- binary_win_wheel:
cu_version: cu115
name: binary_win_wheel_py3.9_cu115
python_version: '3.9'
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -1371,6 +1431,12 @@ workflows: ...@@ -1371,6 +1431,12 @@ workflows:
name: binary_linux_conda_py3.6_cu113 name: binary_linux_conda_py3.6_cu113
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_conda_py3.6_cu115
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -1395,6 +1461,12 @@ workflows: ...@@ -1395,6 +1461,12 @@ workflows:
name: binary_linux_conda_py3.7_cu113 name: binary_linux_conda_py3.7_cu113
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_conda_py3.7_cu115
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -1419,6 +1491,12 @@ workflows: ...@@ -1419,6 +1491,12 @@ workflows:
name: binary_linux_conda_py3.8_cu113 name: binary_linux_conda_py3.8_cu113
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_conda_py3.8_cu115
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -1443,6 +1521,12 @@ workflows: ...@@ -1443,6 +1521,12 @@ workflows:
name: binary_linux_conda_py3.9_cu113 name: binary_linux_conda_py3.9_cu113
python_version: '3.9' python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda113 wheel_docker_image: pytorch/manylinux-cuda113
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
name: binary_linux_conda_py3.9_cu115
python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda115
- 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
...@@ -1494,6 +1578,15 @@ workflows: ...@@ -1494,6 +1578,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.6_cu113 name: binary_win_conda_py3.6_cu113
python_version: '3.6' python_version: '3.6'
- binary_win_conda:
cu_version: cu115
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.6_cu115
python_version: '3.6'
- binary_win_conda: - binary_win_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1521,6 +1614,15 @@ workflows: ...@@ -1521,6 +1614,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cu113 name: binary_win_conda_py3.7_cu113
python_version: '3.7' python_version: '3.7'
- binary_win_conda:
cu_version: cu115
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cu115
python_version: '3.7'
- binary_win_conda: - binary_win_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1548,6 +1650,15 @@ workflows: ...@@ -1548,6 +1650,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cu113 name: binary_win_conda_py3.8_cu113
python_version: '3.8' python_version: '3.8'
- binary_win_conda:
cu_version: cu115
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cu115
python_version: '3.8'
- binary_win_conda: - binary_win_conda:
cu_version: cpu cu_version: cpu
name: binary_win_conda_py3.9_cpu name: binary_win_conda_py3.9_cpu
...@@ -1563,8 +1674,17 @@ workflows: ...@@ -1563,8 +1674,17 @@ workflows:
python_version: '3.9' python_version: '3.9'
- binary_win_conda: - binary_win_conda:
cu_version: cu113 cu_version: cu113
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.9_cu113 name: binary_win_conda_py3.9_cu113
python_version: '3.9' python_version: '3.9'
- binary_win_conda:
cu_version: cu115
name: binary_win_conda_py3.9_cu115
python_version: '3.9'
- build_docs: - build_docs:
filters: filters:
branches: branches:
...@@ -1904,6 +2024,37 @@ workflows: ...@@ -1904,6 +2024,37 @@ workflows:
python_version: '3.6' python_version: '3.6'
requires: requires:
- nightly_binary_linux_wheel_py3.6_cu113_upload - nightly_binary_linux_wheel_py3.6_cu113_upload
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.6_cu115
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.6_cu115_upload
requires:
- nightly_binary_linux_wheel_py3.6_cu115
subfolder: cu115/
- smoke_test_linux_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_wheel_py3.6_cu115_smoke_test_pip
python_version: '3.6'
requires:
- nightly_binary_linux_wheel_py3.6_cu115_upload
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
filters: filters:
...@@ -2088,6 +2239,37 @@ workflows: ...@@ -2088,6 +2239,37 @@ workflows:
python_version: '3.7' python_version: '3.7'
requires: requires:
- nightly_binary_linux_wheel_py3.7_cu113_upload - nightly_binary_linux_wheel_py3.7_cu113_upload
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.7_cu115
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.7_cu115_upload
requires:
- nightly_binary_linux_wheel_py3.7_cu115
subfolder: cu115/
- smoke_test_linux_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_wheel_py3.7_cu115_smoke_test_pip
python_version: '3.7'
requires:
- nightly_binary_linux_wheel_py3.7_cu115_upload
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
filters: filters:
...@@ -2272,6 +2454,37 @@ workflows: ...@@ -2272,6 +2454,37 @@ workflows:
python_version: '3.8' python_version: '3.8'
requires: requires:
- nightly_binary_linux_wheel_py3.8_cu113_upload - nightly_binary_linux_wheel_py3.8_cu113_upload
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.8_cu115
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.8_cu115_upload
requires:
- nightly_binary_linux_wheel_py3.8_cu115
subfolder: cu115/
- smoke_test_linux_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_wheel_py3.8_cu115_smoke_test_pip
python_version: '3.8'
requires:
- nightly_binary_linux_wheel_py3.8_cu115_upload
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
filters: filters:
...@@ -2456,6 +2669,37 @@ workflows: ...@@ -2456,6 +2669,37 @@ workflows:
python_version: '3.9' python_version: '3.9'
requires: requires:
- nightly_binary_linux_wheel_py3.9_cu113_upload - nightly_binary_linux_wheel_py3.9_cu113_upload
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.9_cu115
python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.9_cu115_upload
requires:
- nightly_binary_linux_wheel_py3.9_cu115
subfolder: cu115/
- smoke_test_linux_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_wheel_py3.9_cu115_smoke_test_pip
python_version: '3.9'
requires:
- nightly_binary_linux_wheel_py3.9_cu115_upload
- binary_linux_wheel: - binary_linux_wheel:
cu_version: rocm4.2 cu_version: rocm4.2
filters: filters:
...@@ -2691,6 +2935,35 @@ workflows: ...@@ -2691,6 +2935,35 @@ workflows:
python_version: '3.6' python_version: '3.6'
requires: requires:
- nightly_binary_win_wheel_py3.6_cu113_upload - nightly_binary_win_wheel_py3.6_cu113_upload
- binary_win_wheel:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.6_cu115
python_version: '3.6'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.6_cu115_upload
requires:
- nightly_binary_win_wheel_py3.6_cu115
subfolder: cu115/
- smoke_test_win_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_win_wheel_py3.6_cu115_smoke_test_pip
python_version: '3.6'
requires:
- nightly_binary_win_wheel_py3.6_cu115_upload
- binary_win_wheel: - binary_win_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -2778,6 +3051,35 @@ workflows: ...@@ -2778,6 +3051,35 @@ workflows:
python_version: '3.7' python_version: '3.7'
requires: requires:
- nightly_binary_win_wheel_py3.7_cu113_upload - nightly_binary_win_wheel_py3.7_cu113_upload
- binary_win_wheel:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.7_cu115
python_version: '3.7'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.7_cu115_upload
requires:
- nightly_binary_win_wheel_py3.7_cu115
subfolder: cu115/
- smoke_test_win_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_win_wheel_py3.7_cu115_smoke_test_pip
python_version: '3.7'
requires:
- nightly_binary_win_wheel_py3.7_cu115_upload
- binary_win_wheel: - binary_win_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -2865,6 +3167,35 @@ workflows: ...@@ -2865,6 +3167,35 @@ workflows:
python_version: '3.8' python_version: '3.8'
requires: requires:
- nightly_binary_win_wheel_py3.8_cu113_upload - nightly_binary_win_wheel_py3.8_cu113_upload
- binary_win_wheel:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.8_cu115
python_version: '3.8'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.8_cu115_upload
requires:
- nightly_binary_win_wheel_py3.8_cu115
subfolder: cu115/
- smoke_test_win_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_win_wheel_py3.8_cu115_smoke_test_pip
python_version: '3.8'
requires:
- nightly_binary_win_wheel_py3.8_cu115_upload
- binary_win_wheel: - binary_win_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -2952,6 +3283,35 @@ workflows: ...@@ -2952,6 +3283,35 @@ workflows:
python_version: '3.9' python_version: '3.9'
requires: requires:
- nightly_binary_win_wheel_py3.9_cu113_upload - nightly_binary_win_wheel_py3.9_cu113_upload
- binary_win_wheel:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.9_cu115
python_version: '3.9'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.9_cu115_upload
requires:
- nightly_binary_win_wheel_py3.9_cu115
subfolder: cu115/
- smoke_test_win_pip:
filters:
branches:
only:
- nightly
name: nightly_binary_win_wheel_py3.9_cu115_smoke_test_pip
python_version: '3.9'
requires:
- nightly_binary_win_wheel_py3.9_cu115_upload
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -3072,6 +3432,36 @@ workflows: ...@@ -3072,6 +3432,36 @@ workflows:
python_version: '3.6' python_version: '3.6'
requires: requires:
- nightly_binary_linux_conda_py3.6_cu113_upload - nightly_binary_linux_conda_py3.6_cu113_upload
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.6_cu115
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.6_cu115_upload
requires:
- nightly_binary_linux_conda_py3.6_cu115
- smoke_test_linux_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_conda_py3.6_cu115_smoke_test_conda
python_version: '3.6'
requires:
- nightly_binary_linux_conda_py3.6_cu115_upload
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -3192,6 +3582,36 @@ workflows: ...@@ -3192,6 +3582,36 @@ workflows:
python_version: '3.7' python_version: '3.7'
requires: requires:
- nightly_binary_linux_conda_py3.7_cu113_upload - nightly_binary_linux_conda_py3.7_cu113_upload
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.7_cu115
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.7_cu115_upload
requires:
- nightly_binary_linux_conda_py3.7_cu115
- smoke_test_linux_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_conda_py3.7_cu115_smoke_test_conda
python_version: '3.7'
requires:
- nightly_binary_linux_conda_py3.7_cu115_upload
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -3312,6 +3732,36 @@ workflows: ...@@ -3312,6 +3732,36 @@ workflows:
python_version: '3.8' python_version: '3.8'
requires: requires:
- nightly_binary_linux_conda_py3.8_cu113_upload - nightly_binary_linux_conda_py3.8_cu113_upload
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cu115
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cu115_upload
requires:
- nightly_binary_linux_conda_py3.8_cu115
- smoke_test_linux_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_conda_py3.8_cu115_smoke_test_conda
python_version: '3.8'
requires:
- nightly_binary_linux_conda_py3.8_cu115_upload
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cpu conda_docker_image: pytorch/conda-builder:cpu
cu_version: cpu cu_version: cpu
...@@ -3432,6 +3882,36 @@ workflows: ...@@ -3432,6 +3882,36 @@ workflows:
python_version: '3.9' python_version: '3.9'
requires: requires:
- nightly_binary_linux_conda_py3.9_cu113_upload - nightly_binary_linux_conda_py3.9_cu113_upload
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda115
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.9_cu115
python_version: '3.9'
wheel_docker_image: pytorch/manylinux-cuda115
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.9_cu115_upload
requires:
- nightly_binary_linux_conda_py3.9_cu115
- smoke_test_linux_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_linux_conda_py3.9_cu115_smoke_test_conda
python_version: '3.9'
requires:
- nightly_binary_linux_conda_py3.9_cu115_upload
- 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
...@@ -3600,6 +4080,34 @@ workflows: ...@@ -3600,6 +4080,34 @@ workflows:
python_version: '3.6' python_version: '3.6'
requires: requires:
- nightly_binary_win_conda_py3.6_cu113_upload - nightly_binary_win_conda_py3.6_cu113_upload
- binary_win_conda:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.6_cu115
python_version: '3.6'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.6_cu115_upload
requires:
- nightly_binary_win_conda_py3.6_cu115
- smoke_test_win_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_win_conda_py3.6_cu115_smoke_test_conda
python_version: '3.6'
requires:
- nightly_binary_win_conda_py3.6_cu115_upload
- binary_win_conda: - binary_win_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -3684,6 +4192,34 @@ workflows: ...@@ -3684,6 +4192,34 @@ workflows:
python_version: '3.7' python_version: '3.7'
requires: requires:
- nightly_binary_win_conda_py3.7_cu113_upload - nightly_binary_win_conda_py3.7_cu113_upload
- binary_win_conda:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.7_cu115
python_version: '3.7'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.7_cu115_upload
requires:
- nightly_binary_win_conda_py3.7_cu115
- smoke_test_win_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_win_conda_py3.7_cu115_smoke_test_conda
python_version: '3.7'
requires:
- nightly_binary_win_conda_py3.7_cu115_upload
- binary_win_conda: - binary_win_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -3768,6 +4304,34 @@ workflows: ...@@ -3768,6 +4304,34 @@ workflows:
python_version: '3.8' python_version: '3.8'
requires: requires:
- nightly_binary_win_conda_py3.8_cu113_upload - nightly_binary_win_conda_py3.8_cu113_upload
- binary_win_conda:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.8_cu115
python_version: '3.8'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.8_cu115_upload
requires:
- nightly_binary_win_conda_py3.8_cu115
- smoke_test_win_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_win_conda_py3.8_cu115_smoke_test_conda
python_version: '3.8'
requires:
- nightly_binary_win_conda_py3.8_cu115_upload
- binary_win_conda: - binary_win_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -3852,6 +4416,34 @@ workflows: ...@@ -3852,6 +4416,34 @@ workflows:
python_version: '3.9' python_version: '3.9'
requires: requires:
- nightly_binary_win_conda_py3.9_cu113_upload - nightly_binary_win_conda_py3.9_cu113_upload
- binary_win_conda:
cu_version: cu115
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.9_cu115
python_version: '3.9'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.9_cu115_upload
requires:
- nightly_binary_win_conda_py3.9_cu115
- smoke_test_win_conda:
filters:
branches:
only:
- nightly
name: nightly_binary_win_conda_py3.9_cu115_smoke_test_conda
python_version: '3.9'
requires:
- nightly_binary_win_conda_py3.9_cu115_upload
docker_build: docker_build:
triggers: triggers:
- schedule: - schedule:
......
.circleci/regenerate.py
View file @ 8aa31740
...@@ -32,8 +32,8 @@ def build_workflows(prefix="", filter_branch=None, upload=False, indentation=6, ...@@ -32,8 +32,8 @@ def build_workflows(prefix="", filter_branch=None, upload=False, indentation=6,
for os_type in ["linux", "macos", "win"]: for os_type in ["linux", "macos", "win"]:
python_versions = PYTHON_VERSIONS python_versions = PYTHON_VERSIONS
cu_versions_dict = { cu_versions_dict = {
"linux": ["cpu", "cu102", "cu111", "cu113", "rocm4.2", "rocm4.3.1"], "linux": ["cpu", "cu102", "cu111", "cu113", "cu115", "rocm4.2", "rocm4.3.1"],
"win": ["cpu", "cu111", "cu113"], "win": ["cpu", "cu111", "cu113", "cu115"],
"macos": ["cpu"], "macos": ["cpu"],
} }
cu_versions = cu_versions_dict[os_type] cu_versions = cu_versions_dict[os_type]
...@@ -128,6 +128,7 @@ manylinux_images = { ...@@ -128,6 +128,7 @@ manylinux_images = {
"cu111": "pytorch/manylinux-cuda111", "cu111": "pytorch/manylinux-cuda111",
"cu112": "pytorch/manylinux-cuda112", "cu112": "pytorch/manylinux-cuda112",
"cu113": "pytorch/manylinux-cuda113", "cu113": "pytorch/manylinux-cuda113",
"cu115": "pytorch/manylinux-cuda115",
} }
......
packaging/build_conda.sh
View file @ 8aa31740
...@@ -11,5 +11,11 @@ setup_conda_pytorch_constraint ...@@ -11,5 +11,11 @@ setup_conda_pytorch_constraint
setup_conda_cudatoolkit_constraint setup_conda_cudatoolkit_constraint
setup_visual_studio_constraint setup_visual_studio_constraint
setup_junit_results_folder setup_junit_results_folder
# nvidia channel included for cudatoolkit >= 11
conda build -c defaults -c nvidia $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchvision # nvidia channel included for cudatoolkit >= 11 however for 11.5 we use conda-forge
export CUDATOOLKIT_CHANNEL="nvidia"
if [[ "$CU_VERSION" == cu115 ]]; then
export CUDATOOLKIT_CHANNEL="conda-forge"
fi
conda build -c defaults -c $CUDATOOLKIT_CHANNEL $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchvision
packaging/pkg_helpers.bash
View file @ 8aa31740
...@@ -46,6 +46,14 @@ setup_cuda() { ...@@ -46,6 +46,14 @@ setup_cuda() {
# Now work out the CUDA settings # Now work out the CUDA settings
case "$CU_VERSION" in case "$CU_VERSION" in
cu115)
if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.5"
else
export CUDA_HOME=/usr/local/cuda-11.5/
fi
export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
;;
cu113) cu113)
if [[ "$OSTYPE" == "msys" ]]; then if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.3" export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.3"
...@@ -289,6 +297,9 @@ setup_conda_cudatoolkit_constraint() { ...@@ -289,6 +297,9 @@ setup_conda_cudatoolkit_constraint() {
export CONDA_BUILD_VARIANT="cpu" export CONDA_BUILD_VARIANT="cpu"
else else
case "$CU_VERSION" in case "$CU_VERSION" in
cu115)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.5,<11.6 # [not osx]"
;;
cu113) cu113)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.3,<11.4 # [not osx]" export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.3,<11.4 # [not osx]"
;; ;;
...@@ -333,6 +344,9 @@ setup_conda_cudatoolkit_plain_constraint() { ...@@ -333,6 +344,9 @@ setup_conda_cudatoolkit_plain_constraint() {
export CMAKE_USE_CUDA=0 export CMAKE_USE_CUDA=0
else else
case "$CU_VERSION" in case "$CU_VERSION" in
cu115)
export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=11.5"
;;
cu113) cu113)
export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=11.3" export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=11.3"
;; ;;
......
packaging/windows/internal/cuda_install.bat
View file @ 8aa31740
...@@ -21,6 +21,7 @@ set CUDA_VER_MAJOR=%CUDA_VER:~0,-1% ...@@ -21,6 +21,7 @@ set CUDA_VER_MAJOR=%CUDA_VER:~0,-1%
set CUDA_VER_MINOR=%CUDA_VER:~-1,1% set CUDA_VER_MINOR=%CUDA_VER:~-1,1%
set CUDA_VERSION_STR=%CUDA_VER_MAJOR%.%CUDA_VER_MINOR% set CUDA_VERSION_STR=%CUDA_VER_MAJOR%.%CUDA_VER_MINOR%
if %CUDA_VER% EQU 92 goto cuda92 if %CUDA_VER% EQU 92 goto cuda92
if %CUDA_VER% EQU 100 goto cuda100 if %CUDA_VER% EQU 100 goto cuda100
if %CUDA_VER% EQU 101 goto cuda101 if %CUDA_VER% EQU 101 goto cuda101
...@@ -29,6 +30,8 @@ if %CUDA_VER% EQU 110 goto cuda110 ...@@ -29,6 +30,8 @@ if %CUDA_VER% EQU 110 goto cuda110
if %CUDA_VER% EQU 111 goto cuda111 if %CUDA_VER% EQU 111 goto cuda111
if %CUDA_VER% EQU 112 goto cuda112 if %CUDA_VER% EQU 112 goto cuda112
if %CUDA_VER% EQU 113 goto cuda113 if %CUDA_VER% EQU 113 goto cuda113
if %CUDA_VER% EQU 115 goto cuda115
echo CUDA %CUDA_VERSION_STR% is not supported echo CUDA %CUDA_VERSION_STR% is not supported
exit /b 1 exit /b 1
...@@ -180,6 +183,25 @@ if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" ( ...@@ -180,6 +183,25 @@ if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" (
goto cuda_common goto cuda_common
:cuda115
set CUDA_INSTALL_EXE=cuda_11.5.0_496.13_win10.exe
if not exist "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" (
curl -k -L "https://ossci-windows.s3.amazonaws.com/%CUDA_INSTALL_EXE%" --output "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%"
if errorlevel 1 exit /b 1
set "CUDA_SETUP_FILE=%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%"
set "ARGS=thrust_11.5 nvcc_11.5 cuobjdump_11.5 nvprune_11.5 nvprof_11.5 cupti_11.5 cublas_11.5 cublas_dev_11.5 cudart_11.5 cufft_11.5 cufft_dev_11.5 curand_11.5 curand_dev_11.5 cusolver_11.5 cusolver_dev_11.5 cusparse_11.5 cusparse_dev_11.5 npp_11.5 npp_dev_11.5 nvrtc_11.5 nvrtc_dev_11.5 nvml_dev_11.5"
)
set CUDNN_INSTALL_ZIP=cudnn-11.3-windows-x64-v8.2.0.53.zip
if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" (
curl -k -L "http://s3.amazonaws.com/ossci-windows/%CUDNN_INSTALL_ZIP%" --output "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%"
if errorlevel 1 exit /b 1
set "CUDNN_SETUP_FILE=%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%"
)
goto cuda_common
:cuda_common :cuda_common
if not exist "%SRC_DIR%\temp_build\NvToolsExt.7z" ( if not exist "%SRC_DIR%\temp_build\NvToolsExt.7z" (
...@@ -222,7 +244,7 @@ set "NVTOOLSEXT_PATH=%ProgramFiles%\NVIDIA Corporation\NvToolsExt\bin\x64" ...@@ -222,7 +244,7 @@ set "NVTOOLSEXT_PATH=%ProgramFiles%\NVIDIA Corporation\NvToolsExt\bin\x64"
if not exist "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" ( if not exist "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" (
echo CUDA %CUDA_VERSION_STR% installed failed. echo CUDA %CUDA_VERSION_STR% installed failed.
echo --------- RunDll32.exe.log echo --------- RunDll32.exe.log
type "%SRC_DIR%\temp_build\cuda\cuda_install_logs\LOG.RunDll32.exe.log" type "%SRC_DIR%\temp_build\cuda\cuda_install_logs\LOG.RunDll32.exe.log"
echo --------- setup.exe.log ------- echo --------- setup.exe.log -------
type "%SRC_DIR%\temp_build\cuda\cuda_install_logs\LOG.setup.exe.log" type "%SRC_DIR%\temp_build\cuda\cuda_install_logs\LOG.setup.exe.log"
exit /b 1 exit /b 1
......
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