From e917352bc6e021d6d5aebee636222641542d3d25 Mon Sep 17 00:00:00 2001 From: tianshuo78520a <707759223@qq.com> Date: Mon, 6 Jul 2020 19:52:53 +0800 Subject: [PATCH] Fix scipy (#25387) --- python/requirements.txt | 3 ++- tools/manylinux1/Dockerfile.cuda9_cudnn7_gcc48_py35_centos6 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/python/requirements.txt b/python/requirements.txt index 407a0dc5e20..5e081f5e85b 100644 --- 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 diff --git a/tools/manylinux1/Dockerfile.cuda9_cudnn7_gcc48_py35_centos6 b/tools/manylinux1/Dockerfile.cuda9_cudnn7_gcc48_py35_centos6 index a5afee246e3..1f972c583cb 100644 --- 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"] -- GitLab