Stop using my channel for 3.11 builds (#96973)

As `numpy` for Python 3.11 is now available from the default anaconda channel

Pull Request resolved: https://github.com/pytorch/pytorch/pull/96973
Approved by: https://github.com/kit1980, https://github.com/atalman
This commit is contained in:
Nikita Shulga
2023-03-17 00:55:38 +00:00
committed by PyTorch MergeBot
parent e4e761b277
commit c9135e4408
2 changed files with 1 additions and 6 deletions

View File

@ -53,8 +53,7 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
# Install PyTorch conda deps, as per https://github.com/pytorch/pytorch README # Install PyTorch conda deps, as per https://github.com/pytorch/pytorch README
CONDA_COMMON_DEPS="astunparse pyyaml mkl=2021.4.0 mkl-include=2021.4.0 setuptools" CONDA_COMMON_DEPS="astunparse pyyaml mkl=2021.4.0 mkl-include=2021.4.0 setuptools"
if [ "$ANACONDA_PYTHON_VERSION" = "3.11" ]; then if [ "$ANACONDA_PYTHON_VERSION" = "3.11" ]; then
# TODO: Stop using `-c malfet` conda_install numpy=1.23.5 ${CONDA_COMMON_DEPS}
conda_install numpy=1.23.5 ${CONDA_COMMON_DEPS} -c malfet
elif [ "$ANACONDA_PYTHON_VERSION" = "3.10" ]; then elif [ "$ANACONDA_PYTHON_VERSION" = "3.10" ]; then
conda_install numpy=1.21.2 ${CONDA_COMMON_DEPS} conda_install numpy=1.21.2 ${CONDA_COMMON_DEPS}
elif [ "$ANACONDA_PYTHON_VERSION" = "3.9" ]; then elif [ "$ANACONDA_PYTHON_VERSION" = "3.9" ]; then

View File

@ -38,10 +38,6 @@ fi
EXTRA_CONDA_FLAGS="" EXTRA_CONDA_FLAGS=""
NUMPY_PIN="" NUMPY_PIN=""
PROTOBUF_PACKAGE="defaults::protobuf" PROTOBUF_PACKAGE="defaults::protobuf"
if [[ "\$python_nodot" = *311* ]]; then
# Numpy is yet not avaiable on default conda channel
EXTRA_CONDA_FLAGS="-c=malfet"
fi
if [[ "\$python_nodot" = *310* ]]; then if [[ "\$python_nodot" = *310* ]]; then
# There's an issue with conda channel priority where it'll randomly pick 1.19 over 1.20 # There's an issue with conda channel priority where it'll randomly pick 1.19 over 1.20