Skip to content

Commit 1a969c6

Browse files
authored
Switch testing to torch_test rather than torch_nightly (#4496)
* Switch testing to torch_test rather than torch_nightly * And change upload channel to test
1 parent 0429471 commit 1a969c6

File tree

3 files changed

+19
-27
lines changed

3 files changed

+19
-27
lines changed

.circleci/config.yml

Lines changed: 8 additions & 12 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: 8 additions & 12 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:
@@ -199,7 +195,7 @@ jobs:
199195
sudo apt install -y libturbojpeg-dev
200196
pip install --user --progress-bar off mypy
201197
pip install --user --progress-bar off types-requests
202-
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
198+
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/test/cpu/torch_test.html
203199
pip install --user --progress-bar off --editable .
204200
mypy --config-file mypy.ini
205201

@@ -232,7 +228,7 @@ jobs:
232228
- checkout
233229
- run:
234230
command: |
235-
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
231+
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/test/cpu/torch_test.html
236232
# need to install torchvision dependencies due to transitive imports
237233
pip install --user --progress-bar off .
238234
pip install pytest
@@ -245,7 +241,7 @@ jobs:
245241
- checkout
246242
- run:
247243
command: |
248-
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
244+
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/test/cpu/torch_test.html
249245
# need to install torchvision dependencies due to transitive imports
250246
pip install --user --progress-bar off .
251247
pip install --user onnx
@@ -511,7 +507,7 @@ jobs:
511507
command: |
512508
set -x
513509
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
514-
conda install -v -y -c pytorch-nightly pytorch
510+
conda install -v -y -c pytorch-test pytorch
515511
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
516512
- run:
517513
name: smoke test
@@ -530,7 +526,7 @@ jobs:
530526
command: |
531527
set -x
532528
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
533-
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
529+
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
534530
- run:
535531
name: smoke test
536532
command: |
@@ -575,7 +571,7 @@ jobs:
575571
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
576572
conda activate python${PYTHON_VERSION}
577573
conda install Pillow>=5.3.0
578-
conda install -v -y -c pytorch-nightly pytorch
574+
conda install -v -y -c pytorch-test pytorch
579575
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
580576
- run:
581577
name: smoke test
@@ -599,7 +595,7 @@ jobs:
599595
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
600596
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
601597
conda activate python${PYTHON_VERSION}
602-
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
598+
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
603599
- run:
604600
name: smoke test
605601
command: |

packaging/pkg_helpers.bash

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ setup_pip_pytorch_version() {
235235
if [[ -z "$PYTORCH_VERSION" ]]; then
236236
# Install latest prerelease version of torch, per our nightlies, consistent
237237
# with the requested cuda version
238-
pip_install --pre torch -f "https://download.pytorch.org/whl/nightly/${WHEEL_DIR}torch_nightly.html"
238+
pip_install --pre torch -f "https://download.pytorch.org/whl/test/${WHEEL_DIR}torch_test.html"
239239
if [[ "$CUDA_VERSION" == "cpu" ]]; then
240240
# CUDA and CPU are ABI compatible on the CPU-only parts, so strip
241241
# in this case
@@ -256,8 +256,8 @@ setup_pip_pytorch_version() {
256256
# You MUST have populated PYTORCH_VERSION_SUFFIX before hand.
257257
setup_conda_pytorch_constraint() {
258258
if [[ -z "$PYTORCH_VERSION" ]]; then
259-
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-nightly -c pytorch"
260-
export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | \
259+
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-test -c pytorch"
260+
export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-test]' | \
261261
python -c "import os, sys, json, re; cuver = os.environ.get('CU_VERSION'); \
262262
cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
263263
cuver_2 = (cuver[:-1] + '.' + cuver[-1]).replace('cu', 'cuda') if cuver != 'cpu' else cuver; \

0 commit comments

Comments
 (0)