Skip to content

Commit 5ff802b

Browse files
authored
Test against torch RC instead of nightly. Bump build version (#6717)
* Test against torch RC instead of nightly Fix prev commit * Bump version to build against Use UPLOAD_CHANNEL instead of hardcoding
1 parent 3bd6ce9 commit 5ff802b

File tree

3 files changed

+15
-23
lines changed

3 files changed

+15
-23
lines changed

.circleci/config.yml

Lines changed: 6 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.circleci/config.yml.in

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ commands:
3939
- run:
4040
name: adding UPLOAD_CHANNEL to BASH_ENV
4141
command: |
42-
our_upload_channel=nightly
43-
# On tags upload to test instead
44-
if [[ -n "${CIRCLE_TAG}" ]]; then
45-
our_upload_channel=test
46-
fi
42+
our_upload_channel=test
4743
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
4844

4945
brew_update:
@@ -146,7 +142,7 @@ commands:
146142
default: true
147143
steps:
148144
- pip_install:
149-
args: --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/cpu
145+
args: --pre torch -f https://download.pytorch.org/whl/test/cpu/torch_test.html
150146
descr: Install PyTorch from nightly releases
151147
- pip_install:
152148
args: --no-build-isolation <<# parameters.editable >> --editable <</ parameters.editable >> .
@@ -194,11 +190,11 @@ binary_common: &binary_common
194190
build_version:
195191
description: "version number of release binary; by default, build a nightly"
196192
type: string
197-
default: ""
193+
default: "0.14.0"
198194
pytorch_version:
199195
description: "PyTorch version to build against; by default, use a nightly"
200196
type: string
201-
default: ""
197+
default: "1.13.0"
202198
# Don't edit these
203199
python_version:
204200
description: "Python version to build against (e.g., 3.7)"
@@ -634,7 +630,7 @@ jobs:
634630
set -x
635631
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
636632
- pip_install:
637-
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
633+
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
638634
- run:
639635
name: smoke test
640636
command: |
@@ -703,7 +699,7 @@ jobs:
703699
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
704700
conda activate python${PYTHON_VERSION}
705701
- pip_install:
706-
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
702+
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
707703
- run:
708704
name: smoke test
709705
command: |

packaging/pkg_helpers.bash

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ setup_pip_pytorch_version() {
191191
if [[ -z "$PYTORCH_VERSION" ]]; then
192192
# Install latest prerelease version of torch, per our nightlies, consistent
193193
# with the requested cuda version
194-
pip_install --pre torch -f "https://download.pytorch.org/whl/nightly/${WHEEL_DIR}torch_nightly.html"
194+
pip_install --pre torch -f "https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/${WHEEL_DIR}torch_${UPLOAD_CHANNEL}.html"
195195
if [[ "$CUDA_VERSION" == "cpu" ]]; then
196196
# CUDA and CPU are ABI compatible on the CPU-only parts, so strip
197197
# in this case
@@ -212,13 +212,13 @@ setup_pip_pytorch_version() {
212212
# You MUST have populated PYTORCH_VERSION_SUFFIX before hand.
213213
setup_conda_pytorch_constraint() {
214214
if [[ -z "$PYTORCH_VERSION" ]]; then
215-
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-nightly -c pytorch"
215+
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-${UPLOAD_CHANNEL} -c pytorch"
216216
PYTHON="python"
217217
# Check if we have python 3 instead and prefer that
218218
if python3 --version >/dev/null 2>/dev/null; then
219219
PYTHON="python3"
220220
fi
221-
export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | \
221+
export PYTORCH_VERSION="$(conda search --json pytorch[channel=pytorch-${UPLOAD_CHANNEL}] | \
222222
${PYTHON} -c "import os, sys, json, re; cuver = os.environ.get('CU_VERSION'); \
223223
cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
224224
cuver_2 = (cuver[:-1] + '.' + cuver[-1]).replace('cu', 'cuda') if cuver != 'cpu' else cuver; \

0 commit comments

Comments
 (0)