Skip to content

GitLab

Unverified Commit 5ff802b1 authored by Andrey Talman's avatar Andrey Talman Committed by GitHub
Browse files

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
parent 3bd6ce92
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 23 deletions
.circleci/config.yml
View file @ 5ff802b1
...@@ -39,11 +39,7 @@ commands: ...@@ -39,11 +39,7 @@ commands:
- run: - run:
name: adding UPLOAD_CHANNEL to BASH_ENV name: adding UPLOAD_CHANNEL to BASH_ENV
command: | command: |
our_upload_channel=nightly our_upload_channel=test
# On tags upload to test instead
if [[ -n "${CIRCLE_TAG}" ]]; then
our_upload_channel=test
fi
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV} echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
brew_update: brew_update:
...@@ -146,7 +142,7 @@ commands: ...@@ -146,7 +142,7 @@ commands:
default: true default: true
steps: steps:
- pip_install: - pip_install:
args: --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/cpu args: --pre torch -f https://download.pytorch.org/whl/test/cpu/torch_test.html
descr: Install PyTorch from nightly releases descr: Install PyTorch from nightly releases
- pip_install: - pip_install:
args: --no-build-isolation <<# parameters.editable >> --editable <</ parameters.editable >> . args: --no-build-isolation <<# parameters.editable >> --editable <</ parameters.editable >> .
...@@ -194,11 +190,11 @@ binary_common: &binary_common ...@@ -194,11 +190,11 @@ binary_common: &binary_common
build_version: build_version:
description: "version number of release binary; by default, build a nightly" description: "version number of release binary; by default, build a nightly"
type: string type: string
default: "" default: "0.14.0"
pytorch_version: pytorch_version:
description: "PyTorch version to build against; by default, use a nightly" description: "PyTorch version to build against; by default, use a nightly"
type: string type: string
default: "" default: "1.13.0"
# Don't edit these # Don't edit these
python_version: python_version:
description: "Python version to build against (e.g., 3.7)" description: "Python version to build against (e.g., 3.7)"
...@@ -634,7 +630,7 @@ jobs: ...@@ -634,7 +630,7 @@ jobs:
set -x set -x
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION} source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
- pip_install: - pip_install:
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
- run: - run:
name: smoke test name: smoke test
command: | command: |
...@@ -703,7 +699,7 @@ jobs: ...@@ -703,7 +699,7 @@ jobs:
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION} conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION} conda activate python${PYTHON_VERSION}
- pip_install: - pip_install:
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
- run: - run:
name: smoke test name: smoke test
command: | command: |
......
.circleci/config.yml.in
View file @ 5ff802b1
...@@ -39,11 +39,7 @@ commands: ...@@ -39,11 +39,7 @@ commands:
- run: - run:
name: adding UPLOAD_CHANNEL to BASH_ENV name: adding UPLOAD_CHANNEL to BASH_ENV
command: | command: |
our_upload_channel=nightly our_upload_channel=test
# On tags upload to test instead
if [[ -n "${CIRCLE_TAG}" ]]; then
our_upload_channel=test
fi
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV} echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
brew_update: brew_update:
...@@ -146,7 +142,7 @@ commands: ...@@ -146,7 +142,7 @@ commands:
default: true default: true
steps: steps:
- pip_install: - pip_install:
args: --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/cpu args: --pre torch -f https://download.pytorch.org/whl/test/cpu/torch_test.html
descr: Install PyTorch from nightly releases descr: Install PyTorch from nightly releases
- pip_install: - pip_install:
args: --no-build-isolation <<# parameters.editable >> --editable <</ parameters.editable >> . args: --no-build-isolation <<# parameters.editable >> --editable <</ parameters.editable >> .
...@@ -194,11 +190,11 @@ binary_common: &binary_common ...@@ -194,11 +190,11 @@ binary_common: &binary_common
build_version: build_version:
description: "version number of release binary; by default, build a nightly" description: "version number of release binary; by default, build a nightly"
type: string type: string
default: "" default: "0.14.0"
pytorch_version: pytorch_version:
description: "PyTorch version to build against; by default, use a nightly" description: "PyTorch version to build against; by default, use a nightly"
type: string type: string
default: "" default: "1.13.0"
# Don't edit these # Don't edit these
python_version: python_version:
description: "Python version to build against (e.g., 3.7)" description: "Python version to build against (e.g., 3.7)"
...@@ -634,7 +630,7 @@ jobs: ...@@ -634,7 +630,7 @@ jobs:
set -x set -x
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION} source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
- pip_install: - pip_install:
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
- run: - run:
name: smoke test name: smoke test
command: | command: |
...@@ -703,7 +699,7 @@ jobs: ...@@ -703,7 +699,7 @@ jobs:
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION} conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION} conda activate python${PYTHON_VERSION}
- pip_install: - pip_install:
args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html args: $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/test/torch_test.html
- run: - run:
name: smoke test name: smoke test
command: | command: |
......
packaging/pkg_helpers.bash
View file @ 5ff802b1
...@@ -191,7 +191,7 @@ setup_pip_pytorch_version() { ...@@ -191,7 +191,7 @@ setup_pip_pytorch_version() {
if [[ -z "$PYTORCH_VERSION" ]]; then if [[ -z "$PYTORCH_VERSION" ]]; then
# Install latest prerelease version of torch, per our nightlies, consistent # Install latest prerelease version of torch, per our nightlies, consistent
# with the requested cuda version # with the requested cuda version
pip_install --pre torch -f "https://download.pytorch.org/whl/nightly/${WHEEL_DIR}torch_nightly.html" pip_install --pre torch -f "https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/${WHEEL_DIR}torch_${UPLOAD_CHANNEL}.html"
if [[ "$CUDA_VERSION" == "cpu" ]]; then if [[ "$CUDA_VERSION" == "cpu" ]]; then
# CUDA and CPU are ABI compatible on the CPU-only parts, so strip # CUDA and CPU are ABI compatible on the CPU-only parts, so strip
# in this case # in this case
...@@ -212,13 +212,13 @@ setup_pip_pytorch_version() { ...@@ -212,13 +212,13 @@ setup_pip_pytorch_version() {
# You MUST have populated PYTORCH_VERSION_SUFFIX before hand. # You MUST have populated PYTORCH_VERSION_SUFFIX before hand.
setup_conda_pytorch_constraint() { setup_conda_pytorch_constraint() {
if [[ -z "$PYTORCH_VERSION" ]]; then if [[ -z "$PYTORCH_VERSION" ]]; then
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-nightly -c pytorch" export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-${UPLOAD_CHANNEL} -c pytorch"
PYTHON="python" PYTHON="python"
# Check if we have python 3 instead and prefer that # Check if we have python 3 instead and prefer that
if python3 --version >/dev/null 2>/dev/null; then if python3 --version >/dev/null 2>/dev/null; then
PYTHON="python3" PYTHON="python3"
fi fi
export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | \ export PYTORCH_VERSION="$(conda search --json pytorch[channel=pytorch-${UPLOAD_CHANNEL}] | \
${PYTHON} -c "import os, sys, json, re; cuver = os.environ.get('CU_VERSION'); \ ${PYTHON} -c "import os, sys, json, re; cuver = os.environ.get('CU_VERSION'); \
cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \ cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
cuver_2 = (cuver[:-1] + '.' + cuver[-1]).replace('cu', 'cuda') if cuver != 'cpu' else cuver; \ cuver_2 = (cuver[:-1] + '.' + cuver[-1]).replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment