diff --git a/.circleci/config.yml b/.circleci/config.yml index cc826051bc1..16bc991d863 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,11 +37,11 @@ binary_common: &binary_common build_version: description: "version number of release binary; by default, build a nightly" type: string - default: "" + default: "0.6.0" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string - default: "" + default: "1.5.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.7)" @@ -323,201 +323,421 @@ workflows: name: binary_linux_wheel_py3.5_cpu python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.5_cpu_upload + requires: + - binary_linux_wheel_py3.5_cpu + subfolder: cpu/ - binary_linux_wheel: cu_version: cu92 name: binary_linux_wheel_py3.5_cu92 python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.5_cu92_upload + requires: + - binary_linux_wheel_py3.5_cu92 + subfolder: cu92/ - binary_linux_wheel: cu_version: cu101 name: binary_linux_wheel_py3.5_cu101 python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.5_cu101_upload + requires: + - binary_linux_wheel_py3.5_cu101 + subfolder: cu101/ - binary_linux_wheel: cu_version: cu102 name: binary_linux_wheel_py3.5_cu102 python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.5_cu102_upload + requires: + - binary_linux_wheel_py3.5_cu102 + subfolder: cu102/ - binary_linux_wheel: cu_version: cpu name: binary_linux_wheel_py3.6_cpu python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.6_cpu_upload + requires: + - binary_linux_wheel_py3.6_cpu + subfolder: cpu/ - binary_linux_wheel: cu_version: cu92 name: binary_linux_wheel_py3.6_cu92 python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.6_cu92_upload + requires: + - binary_linux_wheel_py3.6_cu92 + subfolder: cu92/ - binary_linux_wheel: cu_version: cu101 name: binary_linux_wheel_py3.6_cu101 python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.6_cu101_upload + requires: + - binary_linux_wheel_py3.6_cu101 + subfolder: cu101/ - binary_linux_wheel: cu_version: cu102 name: binary_linux_wheel_py3.6_cu102 python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.6_cu102_upload + requires: + - binary_linux_wheel_py3.6_cu102 + subfolder: cu102/ - binary_linux_wheel: cu_version: cpu name: binary_linux_wheel_py3.7_cpu python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.7_cpu_upload + requires: + - binary_linux_wheel_py3.7_cpu + subfolder: cpu/ - binary_linux_wheel: cu_version: cu92 name: binary_linux_wheel_py3.7_cu92 python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.7_cu92_upload + requires: + - binary_linux_wheel_py3.7_cu92 + subfolder: cu92/ - binary_linux_wheel: cu_version: cu101 name: binary_linux_wheel_py3.7_cu101 python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.7_cu101_upload + requires: + - binary_linux_wheel_py3.7_cu101 + subfolder: cu101/ - binary_linux_wheel: cu_version: cu102 name: binary_linux_wheel_py3.7_cu102 python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.7_cu102_upload + requires: + - binary_linux_wheel_py3.7_cu102 + subfolder: cu102/ - binary_linux_wheel: cu_version: cpu name: binary_linux_wheel_py3.8_cpu python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.8_cpu_upload + requires: + - binary_linux_wheel_py3.8_cpu + subfolder: cpu/ - binary_linux_wheel: cu_version: cu92 name: binary_linux_wheel_py3.8_cu92 python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.8_cu92_upload + requires: + - binary_linux_wheel_py3.8_cu92 + subfolder: cu92/ - binary_linux_wheel: cu_version: cu101 name: binary_linux_wheel_py3.8_cu101 python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.8_cu101_upload + requires: + - binary_linux_wheel_py3.8_cu101 + subfolder: cu101/ - binary_linux_wheel: cu_version: cu102 name: binary_linux_wheel_py3.8_cu102 python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.8_cu102_upload + requires: + - binary_linux_wheel_py3.8_cu102 + subfolder: cu102/ - binary_macos_wheel: cu_version: cpu name: binary_macos_wheel_py3.5_cpu python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_macos_wheel_py3.5_cpu_upload + requires: + - binary_macos_wheel_py3.5_cpu + subfolder: '' - binary_macos_wheel: cu_version: cpu name: binary_macos_wheel_py3.6_cpu python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_macos_wheel_py3.6_cpu_upload + requires: + - binary_macos_wheel_py3.6_cpu + subfolder: '' - binary_macos_wheel: cu_version: cpu name: binary_macos_wheel_py3.7_cpu python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_macos_wheel_py3.7_cpu_upload + requires: + - binary_macos_wheel_py3.7_cpu + subfolder: '' - binary_macos_wheel: cu_version: cpu name: binary_macos_wheel_py3.8_cpu python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_wheel_upload: + context: org-member + name: binary_macos_wheel_py3.8_cpu_upload + requires: + - binary_macos_wheel_py3.8_cpu + subfolder: '' - binary_linux_conda: cu_version: cpu name: binary_linux_conda_py3.5_cpu python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.5_cpu_upload + requires: + - binary_linux_conda_py3.5_cpu - binary_linux_conda: cu_version: cu92 name: binary_linux_conda_py3.5_cu92 python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.5_cu92_upload + requires: + - binary_linux_conda_py3.5_cu92 - binary_linux_conda: cu_version: cu101 name: binary_linux_conda_py3.5_cu101 python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.5_cu101_upload + requires: + - binary_linux_conda_py3.5_cu101 - binary_linux_conda: cu_version: cu102 name: binary_linux_conda_py3.5_cu102 python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.5_cu102_upload + requires: + - binary_linux_conda_py3.5_cu102 - binary_linux_conda: cu_version: cpu name: binary_linux_conda_py3.6_cpu python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.6_cpu_upload + requires: + - binary_linux_conda_py3.6_cpu - binary_linux_conda: cu_version: cu92 name: binary_linux_conda_py3.6_cu92 python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.6_cu92_upload + requires: + - binary_linux_conda_py3.6_cu92 - binary_linux_conda: cu_version: cu101 name: binary_linux_conda_py3.6_cu101 python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.6_cu101_upload + requires: + - binary_linux_conda_py3.6_cu101 - binary_linux_conda: cu_version: cu102 name: binary_linux_conda_py3.6_cu102 python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.6_cu102_upload + requires: + - binary_linux_conda_py3.6_cu102 - binary_linux_conda: cu_version: cpu name: binary_linux_conda_py3.7_cpu python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.7_cpu_upload + requires: + - binary_linux_conda_py3.7_cpu - binary_linux_conda: cu_version: cu92 name: binary_linux_conda_py3.7_cu92 python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.7_cu92_upload + requires: + - binary_linux_conda_py3.7_cu92 - binary_linux_conda: cu_version: cu101 name: binary_linux_conda_py3.7_cu101 python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.7_cu101_upload + requires: + - binary_linux_conda_py3.7_cu101 - binary_linux_conda: cu_version: cu102 name: binary_linux_conda_py3.7_cu102 python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.7_cu102_upload + requires: + - binary_linux_conda_py3.7_cu102 - binary_linux_conda: cu_version: cpu name: binary_linux_conda_py3.8_cpu python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.8_cpu_upload + requires: + - binary_linux_conda_py3.8_cpu - binary_linux_conda: cu_version: cu92 name: binary_linux_conda_py3.8_cu92 python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda92 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.8_cu92_upload + requires: + - binary_linux_conda_py3.8_cu92 - binary_linux_conda: cu_version: cu101 name: binary_linux_conda_py3.8_cu101 python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda101 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.8_cu101_upload + requires: + - binary_linux_conda_py3.8_cu101 - binary_linux_conda: cu_version: cu102 name: binary_linux_conda_py3.8_cu102 python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.8_cu102_upload + requires: + - binary_linux_conda_py3.8_cu102 - binary_macos_conda: cu_version: cpu name: binary_macos_conda_py3.5_cpu python_version: '3.5' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_macos_conda_py3.5_cpu_upload + requires: + - binary_macos_conda_py3.5_cpu - binary_macos_conda: cu_version: cpu name: binary_macos_conda_py3.6_cpu python_version: '3.6' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_macos_conda_py3.6_cpu_upload + requires: + - binary_macos_conda_py3.6_cpu - binary_macos_conda: cu_version: cpu name: binary_macos_conda_py3.7_cpu python_version: '3.7' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_macos_conda_py3.7_cpu_upload + requires: + - binary_macos_conda_py3.7_cpu - binary_macos_conda: cu_version: cpu name: binary_macos_conda_py3.8_cpu python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 + - binary_conda_upload: + context: org-member + name: binary_macos_conda_py3.8_cpu_upload + requires: + - binary_macos_conda_py3.8_cpu - binary_linux_conda_cuda: name: torchvision_linux_py3.8_cu102_cuda python_version: "3.8" diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 4b3949b1422..9de67294470 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -37,11 +37,11 @@ binary_common: &binary_common build_version: description: "version number of release binary; by default, build a nightly" type: string - default: "" + default: "0.6.0" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string - default: "" + default: "1.5.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.7)" @@ -319,7 +319,7 @@ workflows: {%- if True %} jobs: - circleci_consistency - {{ workflows() }} + {{ workflows(upload=True) }} - binary_linux_conda_cuda: name: torchvision_linux_py3.8_cu102_cuda python_version: "3.8" diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash index 9e87fcfe8a1..f118480b7b9 100644 --- a/packaging/pkg_helpers.bash +++ b/packaging/pkg_helpers.bash @@ -207,6 +207,7 @@ setup_pip_pytorch_version() { fi else pip_install "torch==$PYTORCH_VERSION$PYTORCH_VERSION_SUFFIX" \ + -f https://download.pytorch.org/whl/test/torch_test.html \ -f https://download.pytorch.org/whl/torch_stable.html \ -f https://download.pytorch.org/whl/nightly/torch_nightly.html fi @@ -233,7 +234,7 @@ setup_conda_pytorch_constraint() { exit 1 fi else - export CONDA_CHANNEL_FLAGS="-c pytorch -c pytorch-nightly" + export CONDA_CHANNEL_FLAGS="-c pytorch-test -c pytorch -c pytorch-nightly" fi if [[ "$CU_VERSION" == cpu ]]; then export CONDA_PYTORCH_BUILD_CONSTRAINT="- pytorch==$PYTORCH_VERSION${PYTORCH_VERSION_SUFFIX}"