diff --git a/.circleci/config.yml b/.circleci/config.yml index 5bdb0e69e72..7943c4ee2f2 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.5.0" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string - default: "" + default: "1.4.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.7)" @@ -297,207 +297,103 @@ workflows: - circleci_consistency - binary_linux_wheel: cu_version: cpu - name: binary_linux_wheel_py2.7_cpu - python_version: '2.7' - - binary_linux_wheel: - cu_version: cpu - name: binary_linux_wheel_py2.7u_cpu - python_version: '2.7' - unicode_abi: '1' - - binary_linux_wheel: - cu_version: cu92 - name: binary_linux_wheel_py2.7_cu92 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_wheel: - cu_version: cu92 - name: binary_linux_wheel_py2.7u_cu92 - python_version: '2.7' - unicode_abi: '1' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_wheel: - cu_version: cu100 - name: binary_linux_wheel_py2.7_cu100 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_linux_wheel: - cu_version: cu100 - name: binary_linux_wheel_py2.7u_cu100 - python_version: '2.7' - unicode_abi: '1' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_linux_wheel: - cu_version: cu101 - name: binary_linux_wheel_py2.7_cu101 - python_version: '2.7' - - binary_linux_wheel: - cu_version: cu101 - name: binary_linux_wheel_py2.7u_cu101 - python_version: '2.7' - unicode_abi: '1' - - binary_linux_wheel: - cu_version: cpu - name: binary_linux_wheel_py3.5_cpu - python_version: '3.5' - - binary_linux_wheel: - cu_version: cu92 - name: binary_linux_wheel_py3.5_cu92 - python_version: '3.5' - 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: - cu_version: cu101 - name: binary_linux_wheel_py3.5_cu101 - python_version: '3.5' - - binary_linux_wheel: - cu_version: cpu - name: binary_linux_wheel_py3.6_cpu - python_version: '3.6' - - binary_linux_wheel: - cu_version: cu92 - name: binary_linux_wheel_py3.6_cu92 - python_version: '3.6' - 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: - cu_version: cu101 - name: binary_linux_wheel_py3.6_cu101 - python_version: '3.6' - - binary_linux_wheel: - cu_version: cpu - name: binary_linux_wheel_py3.7_cpu - python_version: '3.7' + name: binary_linux_wheel_py3.8_cpu + python_version: '3.8' + - 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.7_cu92 - python_version: '3.7' + 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: cu100 - name: binary_linux_wheel_py3.7_cu100 - python_version: '3.7' + name: binary_linux_wheel_py3.8_cu100 + python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda100 + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.8_cu100_upload + requires: + - binary_linux_wheel_py3.8_cu100 + subfolder: cu100/ - binary_linux_wheel: cu_version: cu101 - name: binary_linux_wheel_py3.7_cu101 - python_version: '3.7' - - binary_macos_wheel: - cu_version: cpu - name: binary_macos_wheel_py2.7_cpu - python_version: '2.7' - - binary_macos_wheel: - cu_version: cpu - name: binary_macos_wheel_py2.7u_cpu - python_version: '2.7' - unicode_abi: '1' - - binary_macos_wheel: - cu_version: cpu - name: binary_macos_wheel_py3.5_cpu - python_version: '3.5' - - binary_macos_wheel: - cu_version: cpu - name: binary_macos_wheel_py3.6_cpu - python_version: '3.6' + name: binary_linux_wheel_py3.8_cu101 + python_version: '3.8' + - binary_wheel_upload: + context: org-member + name: binary_linux_wheel_py3.8_cu101_upload + requires: + - binary_linux_wheel_py3.8_cu101 + subfolder: cu101/ - binary_macos_wheel: cu_version: cpu - name: binary_macos_wheel_py3.7_cpu - python_version: '3.7' - - binary_linux_conda: - cu_version: cpu - name: binary_linux_conda_py2.7_cpu - python_version: '2.7' - - binary_linux_conda: - cu_version: cu92 - name: binary_linux_conda_py2.7_cu92 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_linux_conda: - cu_version: cu100 - name: binary_linux_conda_py2.7_cu100 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_linux_conda: - cu_version: cu101 - name: binary_linux_conda_py2.7_cu101 - python_version: '2.7' - - binary_linux_conda: - cu_version: cpu - name: binary_linux_conda_py3.5_cpu - python_version: '3.5' - - binary_linux_conda: - cu_version: cu92 - name: binary_linux_conda_py3.5_cu92 - python_version: '3.5' - 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: - cu_version: cu101 - name: binary_linux_conda_py3.5_cu101 - python_version: '3.5' - - binary_linux_conda: - cu_version: cpu - name: binary_linux_conda_py3.6_cpu - python_version: '3.6' - - binary_linux_conda: - cu_version: cu92 - name: binary_linux_conda_py3.6_cu92 - python_version: '3.6' - 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: - cu_version: cu101 - name: binary_linux_conda_py3.6_cu101 - python_version: '3.6' + name: binary_macos_wheel_py3.8_cpu + python_version: '3.8' + - 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.7_cpu - python_version: '3.7' + name: binary_linux_conda_py3.8_cpu + python_version: '3.8' + - 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.7_cu92 - python_version: '3.7' + 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: cu100 - name: binary_linux_conda_py3.7_cu100 - python_version: '3.7' + name: binary_linux_conda_py3.8_cu100 + python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda100 + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.8_cu100_upload + requires: + - binary_linux_conda_py3.8_cu100 - binary_linux_conda: cu_version: cu101 - name: binary_linux_conda_py3.7_cu101 - python_version: '3.7' - - binary_macos_conda: - cu_version: cpu - name: binary_macos_conda_py2.7_cpu - python_version: '2.7' - - binary_macos_conda: - cu_version: cpu - name: binary_macos_conda_py3.5_cpu - python_version: '3.5' - - binary_macos_conda: - cu_version: cpu - name: binary_macos_conda_py3.6_cpu - python_version: '3.6' + name: binary_linux_conda_py3.8_cu101 + python_version: '3.8' + - binary_conda_upload: + context: org-member + name: binary_linux_conda_py3.8_cu101_upload + requires: + - binary_linux_conda_py3.8_cu101 - binary_macos_conda: cu_version: cpu - name: binary_macos_conda_py3.7_cpu - python_version: '3.7' + name: binary_macos_conda_py3.8_cpu + python_version: '3.8' + - 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.7_cu100 python_version: "3.7" @@ -519,721 +415,157 @@ workflows: filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7_cpu - python_version: '2.7' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7_cpu_upload - requires: - - nightly_binary_linux_wheel_py2.7_cpu - subfolder: cpu/ - - binary_linux_wheel: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7u_cpu - python_version: '2.7' - unicode_abi: '1' + name: nightly_binary_linux_wheel_py3.8_cpu + python_version: '3.8' - binary_wheel_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7u_cpu_upload + name: nightly_binary_linux_wheel_py3.8_cpu_upload requires: - - nightly_binary_linux_wheel_py2.7u_cpu + - nightly_binary_linux_wheel_py3.8_cpu subfolder: cpu/ - binary_linux_wheel: cu_version: cu92 filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7_cu92 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7_cu92_upload - requires: - - nightly_binary_linux_wheel_py2.7_cu92 - subfolder: cu92/ - - binary_linux_wheel: - cu_version: cu92 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7u_cu92 - python_version: '2.7' - unicode_abi: '1' + name: nightly_binary_linux_wheel_py3.8_cu92 + python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda92 - binary_wheel_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7u_cu92_upload + name: nightly_binary_linux_wheel_py3.8_cu92_upload requires: - - nightly_binary_linux_wheel_py2.7u_cu92 + - nightly_binary_linux_wheel_py3.8_cu92 subfolder: cu92/ - binary_linux_wheel: cu_version: cu100 filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7_cu100 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7_cu100_upload - requires: - - nightly_binary_linux_wheel_py2.7_cu100 - subfolder: cu100/ - - binary_linux_wheel: - cu_version: cu100 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7u_cu100 - python_version: '2.7' - unicode_abi: '1' + name: nightly_binary_linux_wheel_py3.8_cu100 + python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda100 - binary_wheel_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7u_cu100_upload + name: nightly_binary_linux_wheel_py3.8_cu100_upload requires: - - nightly_binary_linux_wheel_py2.7u_cu100 + - nightly_binary_linux_wheel_py3.8_cu100 subfolder: cu100/ - binary_linux_wheel: cu_version: cu101 filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7_cu101 - python_version: '2.7' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7_cu101_upload - requires: - - nightly_binary_linux_wheel_py2.7_cu101 - subfolder: cu101/ - - binary_linux_wheel: - cu_version: cu101 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py2.7u_cu101 - python_version: '2.7' - unicode_abi: '1' + name: nightly_binary_linux_wheel_py3.8_cu101 + python_version: '3.8' - binary_wheel_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py2.7u_cu101_upload + name: nightly_binary_linux_wheel_py3.8_cu101_upload requires: - - nightly_binary_linux_wheel_py2.7u_cu101 + - nightly_binary_linux_wheel_py3.8_cu101 subfolder: cu101/ - - binary_linux_wheel: + - binary_macos_wheel: cu_version: cpu filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.5_cpu - python_version: '3.5' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.5_cpu_upload - requires: - - nightly_binary_linux_wheel_py3.5_cpu - subfolder: cpu/ - - binary_linux_wheel: - cu_version: cu92 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.5_cu92 - python_version: '3.5' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.5_cu92_upload - requires: - - nightly_binary_linux_wheel_py3.5_cu92 - subfolder: cu92/ - - binary_linux_wheel: - cu_version: cu100 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.5_cu100 - python_version: '3.5' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.5_cu100_upload - requires: - - nightly_binary_linux_wheel_py3.5_cu100 - subfolder: cu100/ - - binary_linux_wheel: - cu_version: cu101 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.5_cu101 - python_version: '3.5' + name: nightly_binary_macos_wheel_py3.8_cpu + python_version: '3.8' - binary_wheel_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.5_cu101_upload + name: nightly_binary_macos_wheel_py3.8_cpu_upload requires: - - nightly_binary_linux_wheel_py3.5_cu101 - subfolder: cu101/ - - binary_linux_wheel: + - nightly_binary_macos_wheel_py3.8_cpu + subfolder: '' + - binary_linux_conda: cu_version: cpu filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.6_cpu - python_version: '3.6' - - binary_wheel_upload: + name: nightly_binary_linux_conda_py3.8_cpu + python_version: '3.8' + - binary_conda_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.6_cpu_upload + name: nightly_binary_linux_conda_py3.8_cpu_upload requires: - - nightly_binary_linux_wheel_py3.6_cpu - subfolder: cpu/ - - binary_linux_wheel: + - nightly_binary_linux_conda_py3.8_cpu + - binary_linux_conda: cu_version: cu92 filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.6_cu92 - python_version: '3.6' + name: nightly_binary_linux_conda_py3.8_cu92 + python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda92 - - binary_wheel_upload: + - binary_conda_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.6_cu92_upload + name: nightly_binary_linux_conda_py3.8_cu92_upload requires: - - nightly_binary_linux_wheel_py3.6_cu92 - subfolder: cu92/ - - binary_linux_wheel: + - nightly_binary_linux_conda_py3.8_cu92 + - binary_linux_conda: cu_version: cu100 filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.6_cu100 - python_version: '3.6' + name: nightly_binary_linux_conda_py3.8_cu100 + python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda100 - - binary_wheel_upload: + - binary_conda_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.6_cu100_upload + name: nightly_binary_linux_conda_py3.8_cu100_upload requires: - - nightly_binary_linux_wheel_py3.6_cu100 - subfolder: cu100/ - - binary_linux_wheel: + - nightly_binary_linux_conda_py3.8_cu100 + - binary_linux_conda: cu_version: cu101 filters: branches: only: nightly - name: nightly_binary_linux_wheel_py3.6_cu101 - python_version: '3.6' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.6_cu101_upload - requires: - - nightly_binary_linux_wheel_py3.6_cu101 - subfolder: cu101/ - - binary_linux_wheel: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cpu - python_version: '3.7' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cpu_upload - requires: - - nightly_binary_linux_wheel_py3.7_cpu - subfolder: cpu/ - - binary_linux_wheel: - cu_version: cu92 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cu92 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cu92_upload - requires: - - nightly_binary_linux_wheel_py3.7_cu92 - subfolder: cu92/ - - binary_linux_wheel: - cu_version: cu100 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cu100 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cu100_upload - requires: - - nightly_binary_linux_wheel_py3.7_cu100 - subfolder: cu100/ - - binary_linux_wheel: - cu_version: cu101 - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cu101 - python_version: '3.7' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_wheel_py3.7_cu101_upload - requires: - - nightly_binary_linux_wheel_py3.7_cu101 - subfolder: cu101/ - - binary_macos_wheel: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py2.7_cpu - python_version: '2.7' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py2.7_cpu_upload - requires: - - nightly_binary_macos_wheel_py2.7_cpu - subfolder: '' - - binary_macos_wheel: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py2.7u_cpu - python_version: '2.7' - unicode_abi: '1' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py2.7u_cpu_upload - requires: - - nightly_binary_macos_wheel_py2.7u_cpu - subfolder: '' - - binary_macos_wheel: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py3.5_cpu - python_version: '3.5' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py3.5_cpu_upload - requires: - - nightly_binary_macos_wheel_py3.5_cpu - subfolder: '' - - binary_macos_wheel: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py3.6_cpu - python_version: '3.6' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py3.6_cpu_upload - requires: - - nightly_binary_macos_wheel_py3.6_cpu - subfolder: '' - - binary_macos_wheel: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py3.7_cpu - python_version: '3.7' - - binary_wheel_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_macos_wheel_py3.7_cpu_upload - requires: - - nightly_binary_macos_wheel_py3.7_cpu - subfolder: '' - - binary_linux_conda: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cpu - python_version: '2.7' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cpu_upload - requires: - - nightly_binary_linux_conda_py2.7_cpu - - binary_linux_conda: - cu_version: cu92 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cu92 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cu92_upload - requires: - - nightly_binary_linux_conda_py2.7_cu92 - - binary_linux_conda: - cu_version: cu100 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cu100 - python_version: '2.7' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cu100_upload - requires: - - nightly_binary_linux_conda_py2.7_cu100 - - binary_linux_conda: - cu_version: cu101 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cu101 - python_version: '2.7' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py2.7_cu101_upload - requires: - - nightly_binary_linux_conda_py2.7_cu101 - - binary_linux_conda: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cpu - python_version: '3.5' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cpu_upload - requires: - - nightly_binary_linux_conda_py3.5_cpu - - binary_linux_conda: - cu_version: cu92 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cu92 - python_version: '3.5' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cu92_upload - requires: - - nightly_binary_linux_conda_py3.5_cu92 - - binary_linux_conda: - cu_version: cu100 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cu100 - python_version: '3.5' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cu100_upload - requires: - - nightly_binary_linux_conda_py3.5_cu100 - - binary_linux_conda: - cu_version: cu101 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cu101 - python_version: '3.5' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.5_cu101_upload - requires: - - nightly_binary_linux_conda_py3.5_cu101 - - binary_linux_conda: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cpu - python_version: '3.6' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cpu_upload - requires: - - nightly_binary_linux_conda_py3.6_cpu - - binary_linux_conda: - cu_version: cu92 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cu92 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cu92_upload - requires: - - nightly_binary_linux_conda_py3.6_cu92 - - binary_linux_conda: - cu_version: cu100 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cu100 - python_version: '3.6' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cu100_upload - requires: - - nightly_binary_linux_conda_py3.6_cu100 - - binary_linux_conda: - cu_version: cu101 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cu101 - python_version: '3.6' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.6_cu101_upload - requires: - - nightly_binary_linux_conda_py3.6_cu101 - - binary_linux_conda: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cpu - python_version: '3.7' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cpu_upload - requires: - - nightly_binary_linux_conda_py3.7_cpu - - binary_linux_conda: - cu_version: cu92 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cu92 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda92 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cu92_upload - requires: - - nightly_binary_linux_conda_py3.7_cu92 - - binary_linux_conda: - cu_version: cu100 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cu100 - python_version: '3.7' - wheel_docker_image: pytorch/manylinux-cuda100 - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cu100_upload - requires: - - nightly_binary_linux_conda_py3.7_cu100 - - binary_linux_conda: - cu_version: cu101 - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cu101 - python_version: '3.7' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_linux_conda_py3.7_cu101_upload - requires: - - nightly_binary_linux_conda_py3.7_cu101 - - binary_macos_conda: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_conda_py2.7_cpu - python_version: '2.7' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_macos_conda_py2.7_cpu_upload - requires: - - nightly_binary_macos_conda_py2.7_cpu - - binary_macos_conda: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_conda_py3.5_cpu - python_version: '3.5' - - binary_conda_upload: - context: org-member - filters: - branches: - only: nightly - name: nightly_binary_macos_conda_py3.5_cpu_upload - requires: - - nightly_binary_macos_conda_py3.5_cpu - - binary_macos_conda: - cu_version: cpu - filters: - branches: - only: nightly - name: nightly_binary_macos_conda_py3.6_cpu - python_version: '3.6' + name: nightly_binary_linux_conda_py3.8_cu101 + python_version: '3.8' - binary_conda_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_macos_conda_py3.6_cpu_upload + name: nightly_binary_linux_conda_py3.8_cu101_upload requires: - - nightly_binary_macos_conda_py3.6_cpu + - nightly_binary_linux_conda_py3.8_cu101 - binary_macos_conda: cu_version: cpu filters: branches: only: nightly - name: nightly_binary_macos_conda_py3.7_cpu - python_version: '3.7' + name: nightly_binary_macos_conda_py3.8_cpu + python_version: '3.8' - binary_conda_upload: context: org-member filters: branches: only: nightly - name: nightly_binary_macos_conda_py3.7_cpu_upload + name: nightly_binary_macos_conda_py3.8_cpu_upload requires: - - nightly_binary_macos_conda_py3.7_cpu \ No newline at end of file + - nightly_binary_macos_conda_py3.8_cpu \ No newline at end of file diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index e3747134c6f..0d725d44145 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.5.0" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string - default: "" + default: "1.4.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.7)" @@ -296,7 +296,7 @@ workflows: {%- if True %} jobs: - circleci_consistency - {{ workflows() }} + {{ workflows(upload=True) }} - binary_linux_conda_cuda: name: torchvision_linux_py3.7_cu100 python_version: "3.7" diff --git a/.circleci/foo b/.circleci/foo new file mode 100644 index 00000000000..e69de29bb2d diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 6925ffa6d45..a3da4380552 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -23,7 +23,7 @@ def workflows(prefix='', filter_branch=None, upload=False, indentation=6): w = [] for btype in ["wheel", "conda"]: for os_type in ["linux", "macos"]: - for python_version in ["2.7", "3.5", "3.6", "3.7"]: + for python_version in ["3.8"]: for cu_version in (["cpu", "cu92", "cu100", "cu101"] if os_type == "linux" else ["cpu"]): for unicode in ([False, True] if btype == "wheel" and python_version == "2.7" else [False]): w += workflow_pair( diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash index 5d7109efe93..555027e7367 100644 --- a/packaging/pkg_helpers.bash +++ b/packaging/pkg_helpers.bash @@ -136,7 +136,7 @@ retry () { # Outputs: # PATH modified to put correct Python version in PATH # -# Precondition: If Linux, you are in a soumith/manylinux-cuda* Docker image +# Precondition: If Linux, you are in a pytorch/manylinux-cuda* Docker image setup_wheel_python() { if [[ "$(uname)" == Darwin ]]; then eval "$(conda shell.bash hook)" @@ -155,6 +155,7 @@ setup_wheel_python() { 3.5) python_abi=cp35-cp35m ;; 3.6) python_abi=cp36-cp36m ;; 3.7) python_abi=cp37-cp37m ;; + 3.8) python_abi=cp38-cp38 ;; *) echo "Unrecognized PYTHON_VERSION=$PYTHON_VERSION" exit 1 @@ -184,7 +185,7 @@ setup_pip_pytorch_version() { export PYTORCH_VERSION="$(pip show torch | grep ^Version: | sed 's/Version: *//')" fi else - pip_install "torch==$PYTORCH_VERSION$CUDA_SUFFIX" \ + pip_install "torch==$PYTORCH_VERSION$PYTORCH_VERSION_SUFFIX" \ -f https://download.pytorch.org/whl/torch_stable.html \ -f https://download.pytorch.org/whl/nightly/torch_nightly.html fi @@ -193,7 +194,7 @@ setup_pip_pytorch_version() { # Fill PYTORCH_VERSION with the latest conda nightly version, and # CONDA_CHANNEL_FLAGS with appropriate flags to retrieve these versions # -# You MUST have populated CUDA_SUFFIX before hand. +# You MUST have populated PYTORCH_VERSION_SUFFIX before hand. setup_conda_pytorch_constraint() { if [[ -z "$PYTORCH_VERSION" ]]; then export CONDA_CHANNEL_FLAGS="-c pytorch-nightly" diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index da075ff03cb..02384e46a57 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -46,8 +46,7 @@ test: - scipy - mock - av - - ca-certificates - - typing + - typing # [py2k] commands: pytest . diff --git a/setup.py b/setup.py index 8ece63ce739..91f05dc0827 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def get_dist(pkgname): return None -version = '0.5.0a0' +version = '0.5.0' sha = 'Unknown' package_name = 'torchvision' @@ -43,8 +43,8 @@ def get_dist(pkgname): if os.getenv('BUILD_VERSION'): version = os.getenv('BUILD_VERSION') -elif sha != 'Unknown': - version += '+' + sha[:7] +# elif sha != 'Unknown': +# version += '+' + sha[:7] print("Building wheel {}-{}".format(package_name, version))