From 16121c3d30ab1b4a2fb684e61223a610dabfa028 Mon Sep 17 00:00:00 2001 From: Vincent Quenneville-Belair Date: Tue, 24 Mar 2020 14:23:29 -0400 Subject: [PATCH 1/2] test against pytorch-test with version 0.5.0. --- .circleci/config.yml | 4 ++-- .circleci/config.yml.in | 4 ++-- packaging/pkg_helpers.bash | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b4fd761c00..b62bb37c12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,11 +15,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.5.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.8)" diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index f5f985c982..fb3316969a 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -15,11 +15,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.5.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.8)" diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash index bc8ec997df..dafa1b9da9 100644 --- a/packaging/pkg_helpers.bash +++ b/packaging/pkg_helpers.bash @@ -170,6 +170,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 @@ -181,10 +182,10 @@ setup_pip_pytorch_version() { # 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" - export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | python -c "import sys, json, re; print(re.sub(r'\\+.*$', '', json.load(sys.stdin)['pytorch'][-1]['version']))")" + export CONDA_CHANNEL_FLAGS="-c pytorch-test" + export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-test]' | python -c "import sys, json, re; print(re.sub(r'\\+.*$', '', json.load(sys.stdin)['pytorch'][-1]['version']))")" 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 bc8bd5a5d425b3d210e0ea4ba039c0acdc579e87 Mon Sep 17 00:00:00 2001 From: Vincent QB Date: Mon, 30 Mar 2020 15:00:31 -0400 Subject: [PATCH 2/2] whl/test/torch_test not whl/torch_test Co-Authored-By: Eli Uriegas --- 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 dafa1b9da9..f1799cef81 100644 --- a/packaging/pkg_helpers.bash +++ b/packaging/pkg_helpers.bash @@ -170,7 +170,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