File tree Expand file tree Collapse file tree 6 files changed +5
-8
lines changed
verbatim-sources/job-specs Expand file tree Collapse file tree 6 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -1579,7 +1579,7 @@ jobs:
15791579 $* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
15801580 }
15811581
1582- retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
1582+ retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
15831583
15841584 # sync submodules
15851585 cd ${PROJ_ROOT}
Original file line number Diff line number Diff line change @@ -72,14 +72,13 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
7272 # DO NOT install cmake here as it would install a version newer than 3.5, but
7373 # we want to pin to version 3.5.
7474 if [ " $ANACONDA_PYTHON_VERSION " = " 3.8" ]; then
75- # DO NOT install typing if installing python-3.8, since its part of python-3.8 core packages
7675 # Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
7776 conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six llvmdev=8.0.0
7877 elif [ " $ANACONDA_PYTHON_VERSION " = " 3.7" ]; then
7978 # DO NOT install dataclasses if installing python-3.7, since its part of python-3.7 core packages
80- conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six
79+ conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six
8180 else
82- conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi typing future six dataclasses
81+ conda_install numpy=1.18.5 pyyaml mkl mkl-include setuptools cffi future six dataclasses
8382 fi
8483 if [[ " $CUDA_VERSION " == 9.2* ]]; then
8584 conda_install magma-cuda92 -c pytorch
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ export PATH="~/anaconda/bin:${PATH}"
1515source ~ /anaconda/bin/activate
1616
1717# Install dependencies
18- conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
18+ conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
1919conda install -c conda-forge valgrind --yes
2020export CMAKE_PREFIX_PATH=${CONDA_PREFIX:- " $( dirname $( which conda) ) /../" }
2121
Original file line number Diff line number Diff line change 425425 $* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
426426 }
427427
428- retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi typing requests --yes
428+ retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests --yes
429429
430430 # sync submodules
431431 cd ${PROJ_ROOT}
Original file line number Diff line number Diff line change 22enum34
33pyyaml
44requests
5- typing
Original file line number Diff line number Diff line change @@ -308,7 +308,6 @@ def check_file(f):
308308 'benchmark' , 'CMakeLists.txt' ))
309309
310310 check_pydep ('yaml' , 'pyyaml' )
311- check_pydep ('typing' , 'typing' )
312311
313312 build_caffe2 (version = version ,
314313 cmake_python_library = cmake_python_library ,
You can’t perform that action at this time.
0 commit comments