Pin scipy to 1.4.1.
Fixes segfaults caused by scipy/scipy#11237 before 1.4.1 (observed at scipy==1.4.0 and any version of TF and scipy==1.1.0 and TF==2.1.0rc1 on a specific VM setup) PiperOrigin-RevId: 286416747 Change-Id: I9f66f9145517d3b9279883a9292ae050b0dfa555
This commit is contained in:
parent
3de6967d05
commit
54daf3c570
@ -273,7 +273,7 @@ PYTHON_BIN_PATH_INIT=${PYTHON_BIN_PATH}
|
||||
PIP_BIN_PATH="$(which pip${PY_MAJOR_MINOR_VER})"
|
||||
|
||||
# PIP packages
|
||||
INSTALL_EXTRA_PIP_PACKAGES="h5py portpicker scipy scikit-learn ${TF_BUILD_INSTALL_EXTRA_PIP_PACKAGES}"
|
||||
INSTALL_EXTRA_PIP_PACKAGES="h5py portpicker scipy==1.4.1 scikit-learn ${TF_BUILD_INSTALL_EXTRA_PIP_PACKAGES}"
|
||||
|
||||
###########################################################################
|
||||
# Build TF PIP Package
|
||||
|
@ -57,8 +57,8 @@ pip3 install --upgrade protobuf==3.6.1
|
||||
pip2 install --upgrade numpy==1.14.5
|
||||
pip3 install --upgrade numpy==1.14.5
|
||||
|
||||
pip2 install scipy==1.1.0
|
||||
pip3 install scipy==1.1.0
|
||||
pip2 install scipy==1.2.2
|
||||
pip3 install scipy==1.4.1
|
||||
|
||||
pip2 install scikit-learn==0.18.1
|
||||
pip3 install scikit-learn==0.18.1
|
||||
|
@ -78,8 +78,8 @@ else
|
||||
pip3 install --upgrade numpy==1.14.5
|
||||
fi
|
||||
|
||||
pip2 install scipy==1.1.0
|
||||
pip3 install scipy==1.1.0
|
||||
pip2 install scipy==1.2.2
|
||||
pip3 install scipy==1.4.1
|
||||
|
||||
pip2 install scikit-learn==0.18.1
|
||||
pip3 install scikit-learn==0.18.1
|
||||
|
@ -64,7 +64,7 @@ rm -rf /usr/lib/python3/dist-packages/six*
|
||||
# This workaround isn't needed for Ubuntu 16.04 or later.
|
||||
pip3.5 install --no-binary=:all: --upgrade numpy==1.14.5
|
||||
|
||||
pip3.5 install scipy==0.18.1
|
||||
pip3.5 install scipy==1.4.1
|
||||
|
||||
pip3.5 install scikit-learn==0.19.1
|
||||
|
||||
|
@ -76,7 +76,7 @@ rm -rf /usr/lib/python3/dist-packages/six*
|
||||
# This workaround isn't needed for Ubuntu 16.04 or later.
|
||||
pip3 install --no-binary=:all: --upgrade numpy==1.14.5
|
||||
|
||||
pip3 install scipy==0.18.1
|
||||
pip3 install scipy==1.4.1
|
||||
|
||||
pip3 install scikit-learn==0.19.1
|
||||
|
||||
|
@ -204,7 +204,7 @@ function install_macos_pip_deps {
|
||||
# TODO(aselle): Change all these to be --user instead of sudo.
|
||||
${SUDO_CMD} ${PIP_CMD} install --upgrade setuptools==39.1.0
|
||||
${SUDO_CMD} ${PIP_CMD} install keras_preprocessing==1.1.0 --no-deps
|
||||
${SUDO_CMD} ${PIP_CMD} install --upgrade mock portpicker scipy grpcio
|
||||
${SUDO_CMD} ${PIP_CMD} install --upgrade mock portpicker scipy==1.4.1 grpcio
|
||||
${SUDO_CMD} ${PIP_CMD} install six==1.12.0
|
||||
${SUDO_CMD} ${PIP_CMD} install scikit-learn==0.20.3
|
||||
${SUDO_CMD} ${PIP_CMD} install numpy==1.14.5
|
||||
|
@ -73,6 +73,8 @@ REQUIRED_PACKAGES = [
|
||||
# functools comes with python3, need to install the backport for python2
|
||||
'functools32 >= 3.2.3;python_version<"3"',
|
||||
'six >= 1.12.0',
|
||||
# scipy < 1.4.1 causes segfaults due to pybind11
|
||||
'scipy == 1.4.1',
|
||||
]
|
||||
|
||||
if sys.byteorder == 'little':
|
||||
|
Loading…
x
Reference in New Issue
Block a user