From 096a90ddd88e6448083572dc68cdf2983510f3d7 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Tue, 24 Mar 2020 19:11:33 +0100 Subject: [PATCH 1/4] Preparing binary builds --- .circleci/config.yml | 4 ++-- .circleci/config.yml.in | 4 ++-- packaging/build_conda.sh | 2 +- packaging/build_wheel.sh | 2 +- packaging/pkg_helpers.bash | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02a24180bc4..54d0d3edec4 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.1" 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)" diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 62d411ce4b8..aedaee44f94 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.1" 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)" diff --git a/packaging/build_conda.sh b/packaging/build_conda.sh index 9ec011d7d75..3713537112a 100755 --- a/packaging/build_conda.sh +++ b/packaging/build_conda.sh @@ -5,7 +5,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" . "$script_dir/pkg_helpers.bash" export BUILD_TYPE=conda -setup_env 0.6.0 +setup_env 0.5.1 export SOURCE_ROOT_DIR="$PWD" setup_conda_pytorch_constraint setup_conda_cudatoolkit_constraint diff --git a/packaging/build_wheel.sh b/packaging/build_wheel.sh index 5d073d9c104..f4add7cd4d7 100755 --- a/packaging/build_wheel.sh +++ b/packaging/build_wheel.sh @@ -5,7 +5,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" . "$script_dir/pkg_helpers.bash" export BUILD_TYPE=wheel -setup_env 0.6.0 +setup_env 0.5.1 setup_wheel_python pip_install numpy pyyaml future ninja setup_pip_pytorch_version diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash index 9e87fcfe8a1..d9c0ad0f6df 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/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}" From 65b6ed1250fec9a0af732866032416ca00dc4485 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 30 Mar 2020 21:39:09 -0700 Subject: [PATCH 2/4] Switch to use `whl/test` --- packaging/pkg_helpers.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash index d9c0ad0f6df..f118480b7b9 100644 --- a/packaging/pkg_helpers.bash +++ b/packaging/pkg_helpers.bash @@ -207,7 +207,7 @@ setup_pip_pytorch_version() { fi else pip_install "torch==$PYTORCH_VERSION$PYTORCH_VERSION_SUFFIX" \ - -f https://download.pytorch.org/whl/torch_test.html \ + -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 From d3e91a056df173bc54468f98638dbd851910f884 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Mon, 6 Apr 2020 14:49:53 +0200 Subject: [PATCH 3/4] Bump version to 0.6.0 --- .circleci/config.yml | 2 +- .circleci/config.yml.in | 2 +- packaging/build_conda.sh | 2 +- packaging/build_wheel.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0def66e6236..6e35d587ded 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ binary_common: &binary_common build_version: description: "version number of release binary; by default, build a nightly" type: string - default: "0.5.1" + default: "0.6.0" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 3199ff7284e..a8722450e01 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -37,7 +37,7 @@ binary_common: &binary_common build_version: description: "version number of release binary; by default, build a nightly" type: string - default: "0.5.1" + default: "0.6.0" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string diff --git a/packaging/build_conda.sh b/packaging/build_conda.sh index 3713537112a..9ec011d7d75 100755 --- a/packaging/build_conda.sh +++ b/packaging/build_conda.sh @@ -5,7 +5,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" . "$script_dir/pkg_helpers.bash" export BUILD_TYPE=conda -setup_env 0.5.1 +setup_env 0.6.0 export SOURCE_ROOT_DIR="$PWD" setup_conda_pytorch_constraint setup_conda_cudatoolkit_constraint diff --git a/packaging/build_wheel.sh b/packaging/build_wheel.sh index f4add7cd4d7..5d073d9c104 100755 --- a/packaging/build_wheel.sh +++ b/packaging/build_wheel.sh @@ -5,7 +5,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" . "$script_dir/pkg_helpers.bash" export BUILD_TYPE=wheel -setup_env 0.5.1 +setup_env 0.6.0 setup_wheel_python pip_install numpy pyyaml future ninja setup_pip_pytorch_version From efa3cc5f213b0187aa4d7b30766c3c3b4df05fad Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Fri, 10 Apr 2020 18:27:41 +0200 Subject: [PATCH 4/4] Add upload jobs --- .circleci/config.yml | 220 ++++++++++++++++++++++++++++++++++++++++ .circleci/config.yml.in | 2 +- 2 files changed, 221 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e35d587ded..16bc991d863 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 a8722450e01..9de67294470 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -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"