mirror of
https://github.com/saymrwulf/pytorch.git
synced 2026-05-14 20:57:59 +00:00
Remove references to typing module from setup.py (#47677)
Summary: It is part of core Python-3.6.2+ Fixes https://github.com/pytorch/pytorch/issues/47596 Pull Request resolved: https://github.com/pytorch/pytorch/pull/47677 Reviewed By: walterddr Differential Revision: D24860188 Pulled By: malfet fbshipit-source-id: ad72b433a4493ebe5caca97c2e8a9d4b3c8172d4
This commit is contained in:
parent
809660ffa4
commit
d7c8d3cccb
6 changed files with 5 additions and 8 deletions
|
|
@ -1579,7 +1579,7 @@ jobs:
|
|||
$* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
|
||||
}
|
||||
|
||||
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
|
||||
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
|
||||
|
||||
# sync submodules
|
||||
cd ${PROJ_ROOT}
|
||||
|
|
|
|||
|
|
@ -72,14 +72,13 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
|
|||
# DO NOT install cmake here as it would install a version newer than 3.5, but
|
||||
# we want to pin to version 3.5.
|
||||
if [ "$ANACONDA_PYTHON_VERSION" = "3.8" ]; then
|
||||
# DO NOT install typing if installing python-3.8, since its part of python-3.8 core packages
|
||||
# Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
|
||||
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six llvmdev=8.0.0
|
||||
elif [ "$ANACONDA_PYTHON_VERSION" = "3.7" ]; then
|
||||
# DO NOT install dataclasses if installing python-3.7, since its part of python-3.7 core packages
|
||||
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six
|
||||
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six
|
||||
else
|
||||
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six dataclasses
|
||||
conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six dataclasses
|
||||
fi
|
||||
if [[ "$CUDA_VERSION" == 9.2* ]]; then
|
||||
conda_install magma-cuda92 -c pytorch
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ export PATH="~/anaconda/bin:${PATH}"
|
|||
source ~/anaconda/bin/activate
|
||||
|
||||
# Install dependencies
|
||||
conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
|
||||
conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
|
||||
conda install -c conda-forge valgrind --yes
|
||||
export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
|
||||
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@
|
|||
$* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
|
||||
}
|
||||
|
||||
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
|
||||
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
|
||||
|
||||
# sync submodules
|
||||
cd ${PROJ_ROOT}
|
||||
|
|
|
|||
|
|
@ -2,4 +2,3 @@ numpy
|
|||
enum34
|
||||
pyyaml
|
||||
requests
|
||||
typing
|
||||
|
|
|
|||
1
setup.py
1
setup.py
|
|
@ -308,7 +308,6 @@ def build_deps():
|
|||
'benchmark', 'CMakeLists.txt'))
|
||||
|
||||
check_pydep('yaml', 'pyyaml')
|
||||
check_pydep('typing', 'typing')
|
||||
|
||||
build_caffe2(version=version,
|
||||
cmake_python_library=cmake_python_library,
|
||||
|
|
|
|||
Loading…
Reference in a new issue