Skip to content

GitLab

Unverified Commit d45a77d4 authored by Eli Uriegas's avatar Eli Uriegas Committed by GitHub
Browse files

ci: Add cu102 to CI and packaging, remove cu100 (#1980) 



* ci: Add cu102 to CI and packaging

Adds cu102 to our testing matrix as well as change the default manywheel
version to be cu102.

Also adds a function to get manylinux images instead of it being a
conditional block.
Signed-off-by: default avatarEli Uriegas <eliuriegas@fb.com>

* .circleci: Remove cu100, no longer built

We removed the build for cu100 in upstream pytorch as well since we have
begun to support cu102
Signed-off-by: default avatarEli Uriegas <eliuriegas@fb.com>

* Fix lint

* More lint fixes
Co-authored-by: default avatarFrancisco Massa <fvsmassa@gmail.com>
parent cc43e0a9
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 136 deletions
.circleci/config.yml
View file @ d45a77d4
...@@ -301,182 +301,202 @@ workflows: ...@@ -301,182 +301,202 @@ workflows:
cu_version: cpu cu_version: cpu
name: binary_linux_wheel_py3.5_cpu name: binary_linux_wheel_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu92 cu_version: cu92
name: binary_linux_wheel_py3.5_cu92 name: binary_linux_wheel_py3.5_cu92
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_wheel:
cu_version: cu100
name: binary_linux_wheel_py3.5_cu100
python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu101
name: binary_linux_wheel_py3.5_cu101 name: binary_linux_wheel_py3.5_cu101
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_wheel:
cu_version: cu102
name: binary_linux_wheel_py3.5_cu102
python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cpu cu_version: cpu
name: binary_linux_wheel_py3.6_cpu name: binary_linux_wheel_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu92 cu_version: cu92
name: binary_linux_wheel_py3.6_cu92 name: binary_linux_wheel_py3.6_cu92
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_wheel:
cu_version: cu100
name: binary_linux_wheel_py3.6_cu100
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu101
name: binary_linux_wheel_py3.6_cu101 name: binary_linux_wheel_py3.6_cu101
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_wheel:
cu_version: cu102
name: binary_linux_wheel_py3.6_cu102
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cpu cu_version: cpu
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
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu92 cu_version: cu92
name: binary_linux_wheel_py3.7_cu92 name: binary_linux_wheel_py3.7_cu92
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_wheel:
cu_version: cu100
name: binary_linux_wheel_py3.7_cu100
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu101
name: binary_linux_wheel_py3.7_cu101 name: binary_linux_wheel_py3.7_cu101
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_wheel:
cu_version: cu102
name: binary_linux_wheel_py3.7_cu102
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_wheel: - binary_linux_wheel:
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
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu92 cu_version: cu92
name: binary_linux_wheel_py3.8_cu92 name: binary_linux_wheel_py3.8_cu92
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_wheel:
cu_version: cu100
name: binary_linux_wheel_py3.8_cu100
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu101
name: binary_linux_wheel_py3.8_cu101 name: binary_linux_wheel_py3.8_cu101
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_wheel:
cu_version: cu102
name: binary_linux_wheel_py3.8_cu102
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_macos_wheel: - binary_macos_wheel:
cu_version: cpu cu_version: cpu
name: binary_macos_wheel_py3.5_cpu name: binary_macos_wheel_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_macos_wheel: - binary_macos_wheel:
cu_version: cpu cu_version: cpu
name: binary_macos_wheel_py3.6_cpu name: binary_macos_wheel_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_macos_wheel: - binary_macos_wheel:
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
- binary_macos_wheel: - binary_macos_wheel:
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
- binary_linux_conda: - binary_linux_conda:
cu_version: cpu cu_version: cpu
name: binary_linux_conda_py3.5_cpu name: binary_linux_conda_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_conda: - binary_linux_conda:
cu_version: cu92 cu_version: cu92
name: binary_linux_conda_py3.5_cu92 name: binary_linux_conda_py3.5_cu92
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_conda:
cu_version: cu100
name: binary_linux_conda_py3.5_cu100
python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu101
name: binary_linux_conda_py3.5_cu101 name: binary_linux_conda_py3.5_cu101
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_conda:
cu_version: cu102
name: binary_linux_conda_py3.5_cu102
python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_conda: - binary_linux_conda:
cu_version: cpu cu_version: cpu
name: binary_linux_conda_py3.6_cpu name: binary_linux_conda_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_conda: - binary_linux_conda:
cu_version: cu92 cu_version: cu92
name: binary_linux_conda_py3.6_cu92 name: binary_linux_conda_py3.6_cu92
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_conda:
cu_version: cu100
name: binary_linux_conda_py3.6_cu100
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu101
name: binary_linux_conda_py3.6_cu101 name: binary_linux_conda_py3.6_cu101
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_conda:
cu_version: cu102
name: binary_linux_conda_py3.6_cu102
python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_conda: - binary_linux_conda:
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
- binary_linux_conda: - binary_linux_conda:
cu_version: cu92 cu_version: cu92
name: binary_linux_conda_py3.7_cu92 name: binary_linux_conda_py3.7_cu92
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_conda:
cu_version: cu100
name: binary_linux_conda_py3.7_cu100
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu101
name: binary_linux_conda_py3.7_cu101 name: binary_linux_conda_py3.7_cu101
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_conda:
cu_version: cu102
name: binary_linux_conda_py3.7_cu102
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_linux_conda: - binary_linux_conda:
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
- binary_linux_conda: - binary_linux_conda:
cu_version: cu92 cu_version: cu92
name: binary_linux_conda_py3.8_cu92 name: binary_linux_conda_py3.8_cu92
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda92 wheel_docker_image: pytorch/manylinux-cuda92
- binary_linux_conda:
cu_version: cu100
name: binary_linux_conda_py3.8_cu100
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda100
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu101
name: binary_linux_conda_py3.8_cu101 name: binary_linux_conda_py3.8_cu101
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda101
- binary_linux_conda:
cu_version: cu102
name: binary_linux_conda_py3.8_cu102
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_macos_conda: - binary_macos_conda:
cu_version: cpu cu_version: cpu
name: binary_macos_conda_py3.5_cpu name: binary_macos_conda_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_macos_conda: - binary_macos_conda:
cu_version: cpu cu_version: cpu
name: binary_macos_conda_py3.6_cpu name: binary_macos_conda_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_macos_conda: - binary_macos_conda:
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
- binary_macos_conda: - binary_macos_conda:
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'
- binary_linux_conda_cuda: wheel_docker_image: pytorch/manylinux-cuda102
name: torchvision_linux_py3.7_cu100
python_version: "3.7"
cu_version: "cu100"
- binary_win_conda: - binary_win_conda:
name: torchvision_win_py3.6_cpu name: torchvision_win_py3.6_cpu
python_version: "3.6" python_version: "3.6"
...@@ -496,6 +516,7 @@ workflows: ...@@ -496,6 +516,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.5_cpu name: nightly_binary_linux_wheel_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -523,38 +544,39 @@ workflows: ...@@ -523,38 +544,39 @@ workflows:
- nightly_binary_linux_wheel_py3.5_cu92 - nightly_binary_linux_wheel_py3.5_cu92
subfolder: cu92/ subfolder: cu92/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.5_cu100 name: nightly_binary_linux_wheel_py3.5_cu101
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.5_cu100_upload name: nightly_binary_linux_wheel_py3.5_cu101_upload
requires: requires:
- nightly_binary_linux_wheel_py3.5_cu100 - nightly_binary_linux_wheel_py3.5_cu101
subfolder: cu100/ subfolder: cu101/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.5_cu101 name: nightly_binary_linux_wheel_py3.5_cu102
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.5_cu101_upload name: nightly_binary_linux_wheel_py3.5_cu102_upload
requires: requires:
- nightly_binary_linux_wheel_py3.5_cu101 - nightly_binary_linux_wheel_py3.5_cu102
subfolder: cu101/ subfolder: cu102/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -562,6 +584,7 @@ workflows: ...@@ -562,6 +584,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.6_cpu name: nightly_binary_linux_wheel_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -589,38 +612,39 @@ workflows: ...@@ -589,38 +612,39 @@ workflows:
- nightly_binary_linux_wheel_py3.6_cu92 - nightly_binary_linux_wheel_py3.6_cu92
subfolder: cu92/ subfolder: cu92/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.6_cu100 name: nightly_binary_linux_wheel_py3.6_cu101
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.6_cu100_upload name: nightly_binary_linux_wheel_py3.6_cu101_upload
requires: requires:
- nightly_binary_linux_wheel_py3.6_cu100 - nightly_binary_linux_wheel_py3.6_cu101
subfolder: cu100/ subfolder: cu101/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.6_cu101 name: nightly_binary_linux_wheel_py3.6_cu102
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.6_cu101_upload name: nightly_binary_linux_wheel_py3.6_cu102_upload
requires: requires:
- nightly_binary_linux_wheel_py3.6_cu101 - nightly_binary_linux_wheel_py3.6_cu102
subfolder: cu101/ subfolder: cu102/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -628,6 +652,7 @@ workflows: ...@@ -628,6 +652,7 @@ workflows:
only: nightly only: nightly
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
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -655,38 +680,39 @@ workflows: ...@@ -655,38 +680,39 @@ workflows:
- nightly_binary_linux_wheel_py3.7_cu92 - nightly_binary_linux_wheel_py3.7_cu92
subfolder: cu92/ subfolder: cu92/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.7_cu100 name: nightly_binary_linux_wheel_py3.7_cu101
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.7_cu100_upload name: nightly_binary_linux_wheel_py3.7_cu101_upload
requires: requires:
- nightly_binary_linux_wheel_py3.7_cu100 - nightly_binary_linux_wheel_py3.7_cu101
subfolder: cu100/ subfolder: cu101/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.7_cu101 name: nightly_binary_linux_wheel_py3.7_cu102
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.7_cu101_upload name: nightly_binary_linux_wheel_py3.7_cu102_upload
requires: requires:
- nightly_binary_linux_wheel_py3.7_cu101 - nightly_binary_linux_wheel_py3.7_cu102
subfolder: cu101/ subfolder: cu102/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -694,6 +720,7 @@ workflows: ...@@ -694,6 +720,7 @@ workflows:
only: nightly only: nightly
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
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -721,38 +748,39 @@ workflows: ...@@ -721,38 +748,39 @@ workflows:
- nightly_binary_linux_wheel_py3.8_cu92 - nightly_binary_linux_wheel_py3.8_cu92
subfolder: cu92/ subfolder: cu92/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.8_cu100 name: nightly_binary_linux_wheel_py3.8_cu101
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.8_cu100_upload name: nightly_binary_linux_wheel_py3.8_cu101_upload
requires: requires:
- nightly_binary_linux_wheel_py3.8_cu100 - nightly_binary_linux_wheel_py3.8_cu101
subfolder: cu100/ subfolder: cu101/
- binary_linux_wheel: - binary_linux_wheel:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.8_cu101 name: nightly_binary_linux_wheel_py3.8_cu102
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_wheel_py3.8_cu101_upload name: nightly_binary_linux_wheel_py3.8_cu102_upload
requires: requires:
- nightly_binary_linux_wheel_py3.8_cu101 - nightly_binary_linux_wheel_py3.8_cu102
subfolder: cu101/ subfolder: cu102/
- binary_macos_wheel: - binary_macos_wheel:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -760,6 +788,7 @@ workflows: ...@@ -760,6 +788,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_macos_wheel_py3.5_cpu name: nightly_binary_macos_wheel_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -776,6 +805,7 @@ workflows: ...@@ -776,6 +805,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_macos_wheel_py3.6_cpu name: nightly_binary_macos_wheel_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -792,6 +822,7 @@ workflows: ...@@ -792,6 +822,7 @@ workflows:
only: nightly only: nightly
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
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -808,6 +839,7 @@ workflows: ...@@ -808,6 +839,7 @@ workflows:
only: nightly only: nightly
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
- binary_wheel_upload: - binary_wheel_upload:
context: org-member context: org-member
filters: filters:
...@@ -824,6 +856,7 @@ workflows: ...@@ -824,6 +856,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.5_cpu name: nightly_binary_linux_conda_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -849,36 +882,37 @@ workflows: ...@@ -849,36 +882,37 @@ workflows:
requires: requires:
- nightly_binary_linux_conda_py3.5_cu92 - nightly_binary_linux_conda_py3.5_cu92
- binary_linux_conda: - binary_linux_conda:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.5_cu100 name: nightly_binary_linux_conda_py3.5_cu101
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.5_cu100_upload name: nightly_binary_linux_conda_py3.5_cu101_upload
requires: requires:
- nightly_binary_linux_conda_py3.5_cu100 - nightly_binary_linux_conda_py3.5_cu101
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.5_cu101 name: nightly_binary_linux_conda_py3.5_cu102
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.5_cu101_upload name: nightly_binary_linux_conda_py3.5_cu102_upload
requires: requires:
- nightly_binary_linux_conda_py3.5_cu101 - nightly_binary_linux_conda_py3.5_cu102
- binary_linux_conda: - binary_linux_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -886,6 +920,7 @@ workflows: ...@@ -886,6 +920,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.6_cpu name: nightly_binary_linux_conda_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -911,36 +946,37 @@ workflows: ...@@ -911,36 +946,37 @@ workflows:
requires: requires:
- nightly_binary_linux_conda_py3.6_cu92 - nightly_binary_linux_conda_py3.6_cu92
- binary_linux_conda: - binary_linux_conda:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.6_cu100 name: nightly_binary_linux_conda_py3.6_cu101
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.6_cu100_upload name: nightly_binary_linux_conda_py3.6_cu101_upload
requires: requires:
- nightly_binary_linux_conda_py3.6_cu100 - nightly_binary_linux_conda_py3.6_cu101
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.6_cu101 name: nightly_binary_linux_conda_py3.6_cu102
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.6_cu101_upload name: nightly_binary_linux_conda_py3.6_cu102_upload
requires: requires:
- nightly_binary_linux_conda_py3.6_cu101 - nightly_binary_linux_conda_py3.6_cu102
- binary_linux_conda: - binary_linux_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -948,6 +984,7 @@ workflows: ...@@ -948,6 +984,7 @@ workflows:
only: nightly only: nightly
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
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -973,36 +1010,37 @@ workflows: ...@@ -973,36 +1010,37 @@ workflows:
requires: requires:
- nightly_binary_linux_conda_py3.7_cu92 - nightly_binary_linux_conda_py3.7_cu92
- binary_linux_conda: - binary_linux_conda:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.7_cu100 name: nightly_binary_linux_conda_py3.7_cu101
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.7_cu100_upload name: nightly_binary_linux_conda_py3.7_cu101_upload
requires: requires:
- nightly_binary_linux_conda_py3.7_cu100 - nightly_binary_linux_conda_py3.7_cu101
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.7_cu101 name: nightly_binary_linux_conda_py3.7_cu102
python_version: '3.7' python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.7_cu101_upload name: nightly_binary_linux_conda_py3.7_cu102_upload
requires: requires:
- nightly_binary_linux_conda_py3.7_cu101 - nightly_binary_linux_conda_py3.7_cu102
- binary_linux_conda: - binary_linux_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1010,6 +1048,7 @@ workflows: ...@@ -1010,6 +1048,7 @@ workflows:
only: nightly only: nightly
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
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -1035,36 +1074,37 @@ workflows: ...@@ -1035,36 +1074,37 @@ workflows:
requires: requires:
- nightly_binary_linux_conda_py3.8_cu92 - nightly_binary_linux_conda_py3.8_cu92
- binary_linux_conda: - binary_linux_conda:
cu_version: cu100 cu_version: cu101
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.8_cu100 name: nightly_binary_linux_conda_py3.8_cu101
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda100 wheel_docker_image: pytorch/manylinux-cuda101
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.8_cu100_upload name: nightly_binary_linux_conda_py3.8_cu101_upload
requires: requires:
- nightly_binary_linux_conda_py3.8_cu100 - nightly_binary_linux_conda_py3.8_cu101
- binary_linux_conda: - binary_linux_conda:
cu_version: cu101 cu_version: cu102
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.8_cu101 name: nightly_binary_linux_conda_py3.8_cu102
python_version: '3.8' python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
branches: branches:
only: nightly only: nightly
name: nightly_binary_linux_conda_py3.8_cu101_upload name: nightly_binary_linux_conda_py3.8_cu102_upload
requires: requires:
- nightly_binary_linux_conda_py3.8_cu101 - nightly_binary_linux_conda_py3.8_cu102
- binary_macos_conda: - binary_macos_conda:
cu_version: cpu cu_version: cpu
filters: filters:
...@@ -1072,6 +1112,7 @@ workflows: ...@@ -1072,6 +1112,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_macos_conda_py3.5_cpu name: nightly_binary_macos_conda_py3.5_cpu
python_version: '3.5' python_version: '3.5'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -1087,6 +1128,7 @@ workflows: ...@@ -1087,6 +1128,7 @@ workflows:
only: nightly only: nightly
name: nightly_binary_macos_conda_py3.6_cpu name: nightly_binary_macos_conda_py3.6_cpu
python_version: '3.6' python_version: '3.6'
wheel_docker_image: pytorch/manylinux-cuda102
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -1102,6 +1144,7 @@ workflows: ...@@ -1102,6 +1144,7 @@ workflows:
only: nightly only: nightly
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
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
...@@ -1117,6 +1160,7 @@ workflows: ...@@ -1117,6 +1160,7 @@ workflows:
only: nightly only: nightly
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
- binary_conda_upload: - binary_conda_upload:
context: org-member context: org-member
filters: filters:
......
.circleci/config.yml.in
View file @ d45a77d4
...@@ -299,10 +299,6 @@ workflows: ...@@ -299,10 +299,6 @@ workflows:
jobs: jobs:
- circleci_consistency - circleci_consistency
{{ workflows() }} {{ workflows() }}
- binary_linux_conda_cuda:
name: torchvision_linux_py3.7_cu100
python_version: "3.7"
cu_version: "cu100"
- binary_win_conda: - binary_win_conda:
name: torchvision_win_py3.6_cpu name: torchvision_win_py3.6_cpu
python_version: "3.6" python_version: "3.6"
......
.circleci/regenerate.py
View file @ d45a77d4
...@@ -24,7 +24,7 @@ def workflows(prefix='', filter_branch=None, upload=False, indentation=6): ...@@ -24,7 +24,7 @@ def workflows(prefix='', filter_branch=None, upload=False, indentation=6):
for btype in ["wheel", "conda"]: for btype in ["wheel", "conda"]:
for os_type in ["linux", "macos"]: for os_type in ["linux", "macos"]:
for python_version in ["3.5", "3.6", "3.7", "3.8"]: for python_version in ["3.5", "3.6", "3.7", "3.8"]:
for cu_version in (["cpu", "cu92", "cu100", "cu101"] if os_type == "linux" else ["cpu"]): for cu_version in (["cpu", "cu92", "cu101", "cu102"] if os_type == "linux" else ["cpu"]):
for unicode in ([False, True] if btype == "wheel" and python_version == "2.7" else [False]): for unicode in ([False, True] if btype == "wheel" and python_version == "2.7" else [False]):
w += workflow_pair( w += workflow_pair(
btype, os_type, python_version, cu_version, btype, os_type, python_version, cu_version,
...@@ -49,6 +49,20 @@ def workflow_pair(btype, os_type, python_version, cu_version, unicode, prefix='' ...@@ -49,6 +49,20 @@ def workflow_pair(btype, os_type, python_version, cu_version, unicode, prefix=''
return w return w
manylinux_images = {
"cu92": "pytorch/manylinux-cuda92",
"cu101": "pytorch/manylinux-cuda101",
"cu102": "pytorch/manylinux-cuda102",
}
def get_manylinux_image(cu_version):
cu_suffix = "102"
if cu_version.startswith('cu'):
cu_suffix = cu_version[len('cu'):]
return f"pytorch/manylinux-cuda{cu_suffix}"
def generate_base_workflow(base_workflow_name, python_version, cu_version, def generate_base_workflow(base_workflow_name, python_version, cu_version,
unicode, os_type, btype, *, filter_branch=None): unicode, os_type, btype, *, filter_branch=None):
...@@ -61,10 +75,7 @@ def generate_base_workflow(base_workflow_name, python_version, cu_version, ...@@ -61,10 +75,7 @@ def generate_base_workflow(base_workflow_name, python_version, cu_version,
if unicode: if unicode:
d["unicode_abi"] = '1' d["unicode_abi"] = '1'
if cu_version == "cu92": d["wheel_docker_image"] = get_manylinux_image(cu_version)
d["wheel_docker_image"] = "pytorch/manylinux-cuda92"
elif cu_version == "cu100":
d["wheel_docker_image"] = "pytorch/manylinux-cuda100"
if filter_branch is not None: if filter_branch is not None:
d["filters"] = {"branches": {"only": filter_branch}} d["filters"] = {"branches": {"only": filter_branch}}
......
packaging/pkg_helpers.bash
View file @ d45a77d4
...@@ -36,7 +36,7 @@ setup_cuda() { ...@@ -36,7 +36,7 @@ setup_cuda() {
# Wheel builds need suffixes (but not if they're on OS X, which never has suffix) # Wheel builds need suffixes (but not if they're on OS X, which never has suffix)
if [[ "$BUILD_TYPE" == "wheel" ]] && [[ "$(uname)" != Darwin ]]; then if [[ "$BUILD_TYPE" == "wheel" ]] && [[ "$(uname)" != Darwin ]]; then
# The default CUDA has no suffix # The default CUDA has no suffix
if [[ "$CU_VERSION" != "cu101" ]]; then if [[ "$CU_VERSION" != "cu102" ]]; then
export PYTORCH_VERSION_SUFFIX="+$CU_VERSION" export PYTORCH_VERSION_SUFFIX="+$CU_VERSION"
fi fi
# Match the suffix scheme of pytorch, unless this package does not have # Match the suffix scheme of pytorch, unless this package does not have
...@@ -49,6 +49,17 @@ setup_cuda() { ...@@ -49,6 +49,17 @@ setup_cuda() {
# Now work out the CUDA settings # Now work out the CUDA settings
case "$CU_VERSION" in case "$CU_VERSION" in
cu102)
if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.2"
else
export CUDA_HOME=/usr/local/cuda-10.2/
fi
export FORCE_CUDA=1
# Hard-coding gencode flags is temporary situation until
# https://github.com/pytorch/pytorch/pull/23408 lands
export NVCC_FLAGS="-gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_50,code=compute_50"
;;
cu101) cu101)
if [[ "$OSTYPE" == "msys" ]]; then if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.1" export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.1"
...@@ -240,6 +251,9 @@ setup_conda_cudatoolkit_constraint() { ...@@ -240,6 +251,9 @@ setup_conda_cudatoolkit_constraint() {
export CONDA_CUDATOOLKIT_CONSTRAINT="" export CONDA_CUDATOOLKIT_CONSTRAINT=""
else else
case "$CU_VERSION" in case "$CU_VERSION" in
cu102)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=10.2,<10.3 # [not osx]"
;;
cu101) cu101)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=10.1,<10.2 # [not osx]" export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=10.1,<10.2 # [not osx]"
;; ;;
......
packaging/wheel/linux_manywheel.sh
View file @ d45a77d4
...@@ -6,9 +6,9 @@ if [ "$#" -ne 1 ]; then ...@@ -6,9 +6,9 @@ if [ "$#" -ne 1 ]; then
echo "CUDA version should be cu92, cu100 or cpu" echo "CUDA version should be cu92, cu100 or cpu"
exit 1 exit 1
fi fi
export CUVER="$1" # cu92 cu100 cpu export CUVER="$1" # cu[0-9]* cpu
if [[ "$CUVER" == "cu101" ]]; then if [[ "$CUVER" == "cu102" ]]; then
cu_suffix="" cu_suffix=""
else else
cu_suffix="+$CUVER" cu_suffix="+$CUVER"
......
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