Skip to content

GitLab

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

Set correct upload channel (#6744)

parent 531a2eaf
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
packaging/pkg_helpers.bash
View file @ f15f4e83
...@@ -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/${UPLOAD_CHANNEL}/${WHEEL_DIR}torch_${UPLOAD_CHANNEL}.html" pip_install --pre torch -f "https://download.pytorch.org/whl/test/${WHEEL_DIR}torch_test.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-${UPLOAD_CHANNEL} -c pytorch" export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-test -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-${UPLOAD_CHANNEL}] | \ export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-test]' | \
${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