diff --git a/doc/COMPILE.md b/doc/COMPILE.md index 84b1b65cbdbb0dcf6079d30bd7ebc9baf4a8c6e1..1836f4fe089f13e2eb2c9485f40d50ec668e4671 100644 --- a/doc/COMPILE.md +++ b/doc/COMPILE.md @@ -23,7 +23,7 @@ | libXext | 1.3.3 | | libSM | 1.2.2 | | libXrender | 0.9.10 | -| python-whl | numpy>=1.12, <=1.16.4
google>=2.0.3
protobuf>=3.12.2
grpcio-tools>=1.28.1
grpcio>=1.28.1
func-timeout>=4.3.5
pyyaml>=1.3.0
sentencepiece==0.1.92
flask>=1.1.2
ujson>=2.0.3 | +| python-whl | numpy>=1.12, <=1.16.4
wheel>=0.34.0, <0.35.0
setuptools>=44.1.0
opencv-python==4.2.0.32
google>=2.0.3
protobuf>=3.12.2
grpcio-tools>=1.28.1
grpcio>=1.28.1
func-timeout>=4.3.5
pyyaml>=1.3.0
sentencepiece==0.1.92
flask>=1.1.2
ujson>=2.0.3 | It is recommended to use Docker for compilation. We have prepared the Paddle Serving compilation environment for you, see [this document](DOCKER_IMAGES.md). diff --git a/doc/COMPILE_CN.md b/doc/COMPILE_CN.md index a38faff4289a4946d82f8b4a71afd521c7cd48fd..1235653e69161ba8f71d3f8098a1860dca4d357d 100644 --- a/doc/COMPILE_CN.md +++ b/doc/COMPILE_CN.md @@ -23,7 +23,7 @@ | libXext | 1.3.3 | | libSM | 1.2.2 | | libXrender | 0.9.10 | -| python-whl | numpy>=1.12, <=1.16.4
google>=2.0.3
protobuf>=3.12.2
grpcio-tools>=1.28.1
grpcio>=1.28.1
func-timeout>=4.3.5
pyyaml>=1.3.0
sentencepiece==0.1.92
flask>=1.1.2
ujson>=2.0.3 | +| python-whl | numpy>=1.12, <=1.16.4
wheel>=0.34.0, <0.35.0
setuptools>=44.1.0
opencv-python==4.2.0.32
google>=2.0.3
protobuf>=3.12.2
grpcio-tools>=1.28.1
grpcio>=1.28.1
func-timeout>=4.3.5
pyyaml>=1.3.0
sentencepiece==0.1.92
flask>=1.1.2
ujson>=2.0.3 | 推荐使用Docker编译,我们已经为您准备好了Paddle Serving编译环境,详见[该文档](DOCKER_IMAGES_CN.md)。 diff --git a/python/requirements.txt b/python/requirements.txt index 3c5612453a4108bba1ee5ee7736d1769d668a634..23b5289d5109fcb119f143eef4deb65198555d6a 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,4 +1,6 @@ numpy>=1.12, <=1.16.4 ; python_version<"3.5" +wheel>=0.34.0, <0.35.0 +setuptools>=44.1.0 opencv-python==4.2.0.32 google>=2.0.3 opencv-python==4.2.0.32 diff --git a/tools/Dockerfile.centos6.cuda9.0-cudnn7.devel b/tools/Dockerfile.centos6.cuda9.0-cudnn7.devel index 24a5d189b709e3ff92e0b0c16776b82a84eca3e6..b4af571c19cec131800dd871b558c00d601b2f5e 100644 --- a/tools/Dockerfile.centos6.cuda9.0-cudnn7.devel +++ b/tools/Dockerfile.centos6.cuda9.0-cudnn7.devel @@ -31,7 +31,6 @@ RUN yum -y install wget && \ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ python get-pip.py && \ rm get-pip.py && \ - pip install google protobuf setuptools wheel flask numpy==1.16.4 && \ wget https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tgz && \ tar -zxf Python-3.6.8.tgz && \ cd Python-3.6.8 && \ @@ -42,7 +41,6 @@ RUN yum -y install wget && \ echo 'export LD_LIBRARY_PATH=/usr/local/python3.6/lib:$LD_LIBRARY_PATH' >> /root/.bashrc && \ source /root/.bashrc && \ cd .. && rm -rf Python-3.6.8* && \ - pip3 install google protobuf setuptools wheel flask numpy==1.16.4 && \ yum -y install epel-release && yum -y install patchelf libXext libSM libXrender && \ yum clean all && \ echo "export LANG=en_US.utf8" >> /root/.bashrc && \ diff --git a/tools/Dockerfile.centos6.devel b/tools/Dockerfile.centos6.devel index 53d46d9dd5c5cb060d773cca2e9cb8c98cdefee1..6dfc304cb281f5bb7c7d60a0b38354118c893f39 100644 --- a/tools/Dockerfile.centos6.devel +++ b/tools/Dockerfile.centos6.devel @@ -31,7 +31,6 @@ RUN yum -y install wget && \ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ python get-pip.py && \ rm get-pip.py && \ - pip install google protobuf setuptools wheel flask numpy==1.16.4 && \ wget https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tgz && \ tar -zxf Python-3.6.8.tgz && \ cd Python-3.6.8 && \ @@ -42,7 +41,6 @@ RUN yum -y install wget && \ echo 'export LD_LIBRARY_PATH=/usr/local/python3.6/lib:$LD_LIBRARY_PATH' >> /root/.bashrc && \ source /root/.bashrc && \ cd .. && rm -rf Python-3.6.8* && \ - pip3 install google protobuf setuptools wheel flask numpy==1.16.4 && \ yum -y install epel-release && yum -y install patchelf libXext libSM libXrender && \ yum clean all && \ localedef -c -i en_US -f UTF-8 en_US.UTF-8 && \ diff --git a/tools/Dockerfile.ci b/tools/Dockerfile.ci index 92aee9e777387374397682b3a22dafe1294ccde4..0eb695d301f6b45c73d3f3b4af018bd2c83860ac 100644 --- a/tools/Dockerfile.ci +++ b/tools/Dockerfile.ci @@ -23,7 +23,6 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \ RUN yum -y install python-devel sqlite-devel >/dev/null \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \ && python get-pip.py >/dev/null \ - && pip install google protobuf setuptools wheel flask >/dev/null \ && rm get-pip.py RUN wget http://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2 \ @@ -35,8 +34,7 @@ RUN wget http://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2 && cd .. \ && rm -rf patchelf-0.10* -RUN yum install -y python3 python3-devel \ - && pip3 install google protobuf setuptools wheel flask +RUN yum install -y python3 python3-devel RUN yum -y update >/dev/null \ && yum -y install dnf >/dev/null \ diff --git a/tools/Dockerfile.cuda10.0-cudnn7.devel b/tools/Dockerfile.cuda10.0-cudnn7.devel index 015412995e2152beaebd760b05d4989891b87c14..d65e1e256c8772101a51fcc58ab525aff9f182a1 100644 --- a/tools/Dockerfile.cuda10.0-cudnn7.devel +++ b/tools/Dockerfile.cuda10.0-cudnn7.devel @@ -23,11 +23,9 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \ RUN yum -y install python-devel sqlite-devel \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \ && python get-pip.py >/dev/null \ - && pip install google protobuf setuptools wheel flask >/dev/null \ && rm get-pip.py RUN yum install -y python3 python3-devel \ - && pip3 install google protobuf setuptools wheel flask \ && yum -y install epel-release && yum -y install patchelf libXext libSM libXrender\ && yum clean all diff --git a/tools/Dockerfile.cuda9.0-cudnn7.devel b/tools/Dockerfile.cuda9.0-cudnn7.devel index 4ca886a2309b2e643e68fb36f150e0393489e98f..b33ed58a2a97a6bea7a8f408c2e6a7f6ccc7d448 100644 --- a/tools/Dockerfile.cuda9.0-cudnn7.devel +++ b/tools/Dockerfile.cuda9.0-cudnn7.devel @@ -22,11 +22,9 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \ RUN yum -y install python-devel sqlite-devel \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \ && python get-pip.py >/dev/null \ - && pip install google protobuf setuptools wheel flask >/dev/null \ && rm get-pip.py RUN yum install -y python3 python3-devel \ - && pip3 install google protobuf setuptools wheel flask \ && yum -y install epel-release && yum -y install patchelf libXext libSM libXrender\ && yum clean all diff --git a/tools/Dockerfile.devel b/tools/Dockerfile.devel index a0ef073e798c49d3d419450b2430e8656b3afdfc..83e3b491c30fe99eaa615e836efeef6aad0c0cc4 100644 --- a/tools/Dockerfile.devel +++ b/tools/Dockerfile.devel @@ -19,11 +19,9 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \ RUN yum -y install python-devel sqlite-devel \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \ && python get-pip.py >/dev/null \ - && pip install google protobuf setuptools wheel flask >/dev/null \ && rm get-pip.py RUN yum install -y python3 python3-devel \ - && pip3 install google protobuf setuptools wheel flask \ && yum -y install epel-release && yum -y install patchelf libXext libSM libXrender\ && yum clean all