Skip to content

Commit 6e72416

Browse files
seemethereseemethere
committed
ci: Remove mentions of conda-forge (#4082)
(cherry picked from commit d391a0e) Signed-off-by: Eli Uriegas <[email protected]>
1 parent ae9963f commit 6e72416

File tree

10 files changed

+18
-38
lines changed

10 files changed

+18
-38
lines changed

‎.circleci/config.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ jobs:
309309
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
310310
conda activate base
311311
conda install -yq conda-build "conda-package-handling!=1.5.0"
312+
# cudatoolkit >= 11 isn't available for windows in the nvidia channel
313+
if [[ "${CU_VERSION}" =~ cu11.* ]]; then
314+
export CONDA_CHANNEL_FLAGS="-c conda-forge"
315+
fi
312316
packaging/build_conda.sh
313317
rm /C/tools/miniconda3/conda-bld/win-64/vs${VC_YEAR}*.tar.bz2
314318
- store_artifacts:
@@ -580,11 +584,7 @@ jobs:
580584
set -x
581585
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
582586
conda env remove -n python${PYTHON_VERSION} || true
583-
CONDA_CHANNEL_FLAGS=""
584-
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
585-
CONDA_CHANNEL_FLAGS="-c=conda-forge"
586-
fi
587-
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
587+
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
588588
conda activate python${PYTHON_VERSION}
589589
conda install Pillow>=5.3.0
590590
conda install -v -y -c pytorch-nightly pytorch
@@ -609,11 +609,6 @@ jobs:
609609
command: |
610610
set -x
611611
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
612-
CONDA_CHANNEL_FLAGS=""
613-
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
614-
CONDA_CHANNEL_FLAGS="-c=conda-forge"
615-
fi
616-
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
617612
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
618613
conda activate python${PYTHON_VERSION}
619614
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html

‎.circleci/config.yml.in

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ jobs:
309309
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
310310
conda activate base
311311
conda install -yq conda-build "conda-package-handling!=1.5.0"
312+
# cudatoolkit >= 11 isn't available for windows in the nvidia channel
313+
if [[ "${CU_VERSION}" =~ cu11.* ]]; then
314+
export CONDA_CHANNEL_FLAGS="-c conda-forge"
315+
fi
312316
packaging/build_conda.sh
313317
rm /C/tools/miniconda3/conda-bld/win-64/vs${VC_YEAR}*.tar.bz2
314318
- store_artifacts:
@@ -580,11 +584,7 @@ jobs:
580584
set -x
581585
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
582586
conda env remove -n python${PYTHON_VERSION} || true
583-
CONDA_CHANNEL_FLAGS=""
584-
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
585-
CONDA_CHANNEL_FLAGS="-c=conda-forge"
586-
fi
587-
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
587+
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
588588
conda activate python${PYTHON_VERSION}
589589
conda install Pillow>=5.3.0
590590
conda install -v -y -c pytorch-nightly pytorch
@@ -609,11 +609,6 @@ jobs:
609609
command: |
610610
set -x
611611
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
612-
CONDA_CHANNEL_FLAGS=""
613-
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
614-
CONDA_CHANNEL_FLAGS="-c=conda-forge"
615-
fi
616-
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
617612
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
618613
conda activate python${PYTHON_VERSION}
619614
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html

‎.circleci/unittest/linux/scripts/environment.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
channels:
22
- pytorch
33
- defaults
4-
# using conda-forge for python v3.9
5-
- conda-forge
64
dependencies:
75
- pytest
86
- pytest-cov

‎.circleci/unittest/linux/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ else
2424
fi
2525

2626
printf "Installing PyTorch with %s\n" "${cudatoolkit}"
27-
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD_CHANNEL}"::pytorch "${cudatoolkit}" pytest
27+
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" "pytorch-${UPLOAD_CHANNEL}"::pytorch "${cudatoolkit}" pytest
2828

2929
if [ $PYTHON_VERSION == "3.6" ]; then
3030
printf "Installing minimal PILLOW version\n"

‎.circleci/unittest/windows/scripts/environment.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
channels:
22
- pytorch
33
- defaults
4-
# use conda-forge for python v3.9+
5-
- conda-forge
64
dependencies:
75
- pytest
86
- pytest-cov

‎.circleci/unittest/windows/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ else
2626
fi
2727

2828
printf "Installing PyTorch with %s\n" "${cudatoolkit}"
29-
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD_CHANNEL}"::pytorch "${cudatoolkit}" pytest
29+
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" "pytorch-${UPLOAD_CHANNEL}"::pytorch "${cudatoolkit}" pytest
3030

3131
if [ $PYTHON_VERSION == "3.6" ]; then
3232
printf "Installing minimal PILLOW version\n"

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ clear and has sufficient instructions to be able to reproduce the issue.
3333
### Install PyTorch Nightly
3434

3535
```bash
36-
conda install pytorch -c pytorch-nightly -c conda-forge
36+
conda install pytorch -c pytorch-nightly
3737
# or with pip (see https://pytorch.org/get-started/locally/)
3838
# pip install numpy
3939
# pip install --pre torch -f https://download.pytorch.org/whl/nightly/cu102/torch_nightly.html

‎packaging/build_conda.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ setup_conda_pytorch_constraint
1111
setup_conda_cudatoolkit_constraint
1212
setup_visual_studio_constraint
1313
setup_junit_results_folder
14-
conda build $CONDA_CHANNEL_FLAGS -c defaults -c conda-forge --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchvision
14+
# nvidia channel included for cudatoolkit >= 11
15+
conda build -c defaults -c nvidia $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchvision

‎packaging/pkg_helpers.bash

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,10 @@ setup_wheel_python() {
180180
if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
181181
eval "$(conda shell.bash hook)"
182182
conda env remove -n "env$PYTHON_VERSION" || true
183-
if [[ "$PYTHON_VERSION" == 3.9 ]]; then
184-
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c=conda-forge"
185-
fi
186183
conda create ${CONDA_CHANNEL_FLAGS} -yn "env$PYTHON_VERSION" python="$PYTHON_VERSION"
187184
conda activate "env$PYTHON_VERSION"
188185
# Install libpng from Anaconda (defaults)
189-
conda install ${CONDA_CHANNEL_FLAGS} -c conda-forge libpng "jpeg<=9b" -y
186+
conda install ${CONDA_CHANNEL_FLAGS} libpng "jpeg<=9b" -y
190187
else
191188
# Install native CentOS libJPEG, LAME, freetype and GnuTLS
192189
yum install -y libjpeg-turbo-devel lame freetype gnutls
@@ -250,7 +247,7 @@ setup_pip_pytorch_version() {
250247
# You MUST have populated PYTORCH_VERSION_SUFFIX before hand.
251248
setup_conda_pytorch_constraint() {
252249
if [[ -z "$PYTORCH_VERSION" ]]; then
253-
export CONDA_CHANNEL_FLAGS="-c pytorch-nightly -c pytorch"
250+
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-nightly -c pytorch"
254251
export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | \
255252
python -c "import os, sys, json, re; cuver = os.environ.get('CU_VERSION'); \
256253
cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
@@ -265,7 +262,7 @@ setup_conda_pytorch_constraint() {
265262
exit 1
266263
fi
267264
else
268-
export CONDA_CHANNEL_FLAGS="-c pytorch -c pytorch-${UPLOAD_CHANNEL}"
265+
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch -c pytorch-${UPLOAD_CHANNEL}"
269266
fi
270267
if [[ "$CU_VERSION" == cpu ]]; then
271268
export CONDA_PYTORCH_BUILD_CONSTRAINT="- pytorch==$PYTORCH_VERSION${PYTORCH_VERSION_SUFFIX}"
@@ -277,9 +274,6 @@ setup_conda_pytorch_constraint() {
277274
if [[ "$OSTYPE" == msys && "$CU_VERSION" == cu92 ]]; then
278275
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c defaults -c numba/label/dev"
279276
fi
280-
if [[ "$PYTHON_VERSION" == 3.9 ]]; then
281-
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c=conda-forge"
282-
fi
283277
}
284278

285279
# Translate CUDA_VERSION into CUDA_CUDATOOLKIT_CONSTRAINT

‎packaging/torchvision/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ test:
5252
requires:
5353
- pytest
5454
- scipy
55-
- av
5655
# NOTE: Pinned to fix issues with size_t on Windows
5756
- jpeg <=9b
5857
- ca-certificates

0 commit comments

Comments
 (0)