"tests/nn/git@developer.sourcefind.cn:OpenDAS/fairscale.git" did not exist on "ab71efb370b1e3bf2c2549227cd633e6b537ed6e"
Unverified Commit fbc8ea47 authored by Nikita Shulga's avatar Nikita Shulga Committed by GitHub
Browse files

Prefer nvidia channel for conda builds (#5648)

To mitigate missing `libcupti.so` dependency
parent 90dace8d
...@@ -21,7 +21,7 @@ else ...@@ -21,7 +21,7 @@ else
fi fi
echo "Using CUDA $CUDA_VERSION as determined by CU_VERSION" echo "Using CUDA $CUDA_VERSION as determined by CU_VERSION"
version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")" version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")"
cudatoolkit="cudatoolkit=${version}" cudatoolkit="nvidia::cudatoolkit=${version}"
fi fi
case "$(uname -s)" in case "$(uname -s)" in
...@@ -33,7 +33,7 @@ printf "Installing PyTorch with %s\n" "${cudatoolkit}" ...@@ -33,7 +33,7 @@ printf "Installing PyTorch with %s\n" "${cudatoolkit}"
if [ "${os}" == "MacOSX" ]; then if [ "${os}" == "MacOSX" ]; then
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" "pytorch-${UPLOAD_CHANNEL}"::pytorch "${cudatoolkit}" pytest conda install -y -c "pytorch-${UPLOAD_CHANNEL}" "pytorch-${UPLOAD_CHANNEL}"::pytorch "${cudatoolkit}" pytest
else else
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}" pytest conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c nvidia "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}" pytest
fi fi
printf "* Installing torchvision\n" printf "* Installing torchvision\n"
......
...@@ -42,7 +42,7 @@ else ...@@ -42,7 +42,7 @@ else
PYTORCH_MUTEX_CONSTRAINT='' PYTORCH_MUTEX_CONSTRAINT=''
fi fi
conda install -yq \pytorch=$PYTORCH_VERSION $CONDA_CUDATOOLKIT_CONSTRAINT $PYTORCH_MUTEX_CONSTRAINT $MKL_CONSTRAINT numpy -c "pytorch-${UPLOAD_CHANNEL}" conda install -yq \pytorch=$PYTORCH_VERSION $CONDA_CUDATOOLKIT_CONSTRAINT $PYTORCH_MUTEX_CONSTRAINT $MKL_CONSTRAINT numpy -c nvidia -c "pytorch-${UPLOAD_CHANNEL}"
TORCH_PATH=$(dirname $(python -c "import torch; print(torch.__file__)")) TORCH_PATH=$(dirname $(python -c "import torch; print(torch.__file__)"))
if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
......
...@@ -18,4 +18,4 @@ if [[ "$CU_VERSION" == cu115 ]]; then ...@@ -18,4 +18,4 @@ if [[ "$CU_VERSION" == cu115 ]]; then
export CUDATOOLKIT_CHANNEL="conda-forge" export CUDATOOLKIT_CHANNEL="conda-forge"
fi fi
conda build -c defaults -c $CUDATOOLKIT_CHANNEL $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchvision conda build -c $CUDATOOLKIT_CHANNEL -c defaults $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchvision
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