Fix scipy (#25387)

e917352b · tianshuo78520a · GitHub · 23a958cd · e917352b · e917352b
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

python/requirements.txt python/requirements.txt +2 -1

tools/manylinux1/Dockerfile.cuda9_cudnn7_gcc48_py35_centos6 tools/manylinux1/Dockerfile.cuda9_cudnn7_gcc48_py35_centos6 +3 -0

未找到文件。
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -7,7 +7,8 @@ matplotlib<=2.2.4 ; python_version<"3.6"
 scipy>=0.19.0, <=1.2.1 ; python_version<"3.5"
 nltk>=3.2.2, <=3.4 ; python_version<"3.5"
 matplotlib ; python_version>="3.6"
-scipy ; python_version>="3.5"
+scipy<=1.3.1 ; python_version=="3.5"
+scipy ; python_version>"3.5"
 nltk ; python_version>="3.5"
 rarfile
 Pillow

--- a/tools/manylinux1/Dockerfile.cuda9_cudnn7_gcc48_py35_centos6
+++ b/tools/manylinux1/Dockerfile.cuda9_cudnn7_gcc48_py35_centos6
@@ -65,4 +65,7 @@ RUN LD_LIBRARY_PATH=/opt/_internal/cpython-2.7.11-ucs4/lib:${LD_LIBRARY_PATH} /o
 RUN wget -O /opt/swig-2.0.12.tar.gz https://sourceforge.net/projects/swig/files/swig/swig-2.0.12/swig-2.0.12.tar.gz/download && \
    cd /opt && tar xzf swig-2.0.12.tar.gz && cd /opt/swig-2.0.12 && ./configure && make && make install && cd /opt && rm swig-2.0.12.tar.gz

+RUN wget --no-check-certificate  -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz && \
+     tar -xzf  hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/
+
 CMD ["bash", "/paddle/paddle/scripts/docker/build.sh"]