Merge branch 'PaddlePaddle:develop' into develop

python/requirements.txt

 numpy>=1.12, <=1.16.4 ; python_version<"3.5"
-shapely==1.7.0
+shapely==1.8.0
 wheel>=0.34.0, <0.35.0
 setuptools>=44.1.0
 google>=2.0.3
@@ -16,8 +16,8 @@ pyclipper==1.2.1
 MarkupSafe==1.1.1
 Werkzeug==1.0.1
 ujson>=2.0.3
-sentencepiece==0.1.92; platform_machine !=  "aarch64"
+sentencepiece==0.1.96; platform_machine !=  "aarch64"
 sentencepiece; platform_machine ==  "aarch64"
-opencv-python==4.2.0.32; platform_machine !=  "aarch64"
+opencv-python==4.3.0.38; platform_machine !=  "aarch64"
 opencv-python; platform_machine == "aarch64"
 pytest 

tools/Dockerfile.cuda10.1-cudnn7-gcc54.devel

@@ -66,6 +66,12 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
     CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
     make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.8.0*
 
+# Install Python3.9
+RUN wget -q https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz && \
+    tar -xzf Python-3.9.0.tgz && cd Python-3.9.0 && \
+    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
+    make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.9.0*
+
 ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
 RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3 && ln -sf /usr/local/bin/python3.6 /usr/bin/python3 && ln -sf /usr/local/bin/pip3.6 /usr/local/bin/pip3 && ln -sf /usr/local/bin/pip3.6 /usr/bin/pip3
 
@@ -121,10 +127,13 @@ RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \
     make -j8 && make install && \
     ln -s /usr/local/ccache-3.7.9/bin/ccache /usr/local/bin/ccache
 
-RUN python3.8 -m pip install --upgrade pip requests && \
-    python3.7 -m pip install --upgrade pip requests && \
-    python3.6 -m pip install --upgrade pip requests 
+# Update pip version 
+RUN python3.8 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.7 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.6 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.9 -m pip install --upgrade pip==21.3.1 requests
 
+# Wget ssl libs and link thems
 RUN wget https://paddle-serving.bj.bcebos.com/others/centos_ssl.tar && \
     tar xf centos_ssl.tar && rm -rf centos_ssl.tar && \
     mv libcrypto.so.1.0.2k /usr/lib/libcrypto.so.1.0.2k && mv libssl.so.1.0.2k /usr/lib/libssl.so.1.0.2k && \

tools/Dockerfile.cuda10.1-cudnn7.centos

+# A image for building paddle binaries
+# Use cuda devel base image for both cpu and gpu environment
+# When you modify it, please be aware of cudnn-runtime version
+FROM paddlepaddle/paddle_manylinux_devel:cuda10.1-cudnn7-gcc82
+MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
+
+
+# Update golang version to 1.17.2
+RUN wget -qO- https://paddle-ci.cdn.bcebos.com/go1.17.2.linux-amd64.tar.gz | \
+    tar -xz -C /usr/local && \
+    mkdir /root/go && \
+    mkdir /root/go/bin && \
+    mkdir /root/go/src && \
+    echo "GOROOT=/usr/local/go" >> /root/.bashrc && \
+    echo "GOPATH=/root/go" >> /root/.bashrc && \
+    echo "PATH=/usr/local/go/bin:/root/go/bin:$PATH" >> /root/.bashrc
+
+EXPOSE 22

tools/Dockerfile.cuda10.1-cudnn7.devel

@@ -77,6 +77,12 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
     CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
     make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.8.0*
 
+# Install Python3.9
+RUN wget -q https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz && \
+    tar -xzf Python-3.9.0.tgz && cd Python-3.9.0 && \
+    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
+    make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.9.0*
+
 ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
 RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3 && ln -sf /usr/local/bin/python3.6 /usr/bin/python3 && ln -sf /usr/local/bin/pip3.6 /usr/local/bin/pip3 && ln -sf /usr/local/bin/pip3.6 /usr/bin/pip3
 
@@ -132,10 +138,13 @@ RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \
     make -j8 && make install && \
     ln -s /usr/local/ccache-3.7.9/bin/ccache /usr/local/bin/ccache
 
-RUN python3.8 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.7 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.6 -m pip install --upgrade pip==21.1.1 requests 
+# Update pip version 
+RUN python3.8 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.7 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.6 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.9 -m pip install --upgrade pip==21.3.1 requests
 
+# Wget ssl libs and link thems
 RUN wget https://paddle-serving.bj.bcebos.com/others/centos_ssl.tar && \
     tar xf centos_ssl.tar && rm -rf centos_ssl.tar && \
     mv libcrypto.so.1.0.2k /usr/lib/libcrypto.so.1.0.2k && mv libssl.so.1.0.2k /usr/lib/libssl.so.1.0.2k && \

tools/Dockerfile.cuda10.2-cudnn7.centos

+# A image for building paddle binaries
+# Use cuda devel base image for both cpu and gpu environment
+# When you modify it, please be aware of cudnn-runtime version
+FROM paddlepaddle/paddle_manylinux_devel:cuda10.2-cudnn7-gcc82-trt6
+MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
+
+
+# Update golang version to 1.17.2
+RUN wget -qO- https://paddle-ci.cdn.bcebos.com/go1.17.2.linux-amd64.tar.gz | \
+    tar -xz -C /usr/local && \
+    mkdir /root/go && \
+    mkdir /root/go/bin && \
+    mkdir /root/go/src && \
+    echo "GOROOT=/usr/local/go" >> /root/.bashrc && \
+    echo "GOPATH=/root/go" >> /root/.bashrc && \
+    echo "PATH=/usr/local/go/bin:/root/go/bin:$PATH" >> /root/.bashrc
+
+EXPOSE 22

tools/Dockerfile.cuda10.2-cudnn7.devel

@@ -77,6 +77,12 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
     CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
     make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.8.0*
 
+# Install Python3.9
+RUN wget -q https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz && \
+    tar -xzf Python-3.9.0.tgz && cd Python-3.9.0 && \
+    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
+    make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.9.0*
+
 ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
 RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3 && ln -sf /usr/local/bin/python3.6 /usr/bin/python3 && ln -sf /usr/local/bin/pip3.6 /usr/local/bin/pip3 && ln -sf /usr/local/bin/pip3.6 /usr/bin/pip3
 
@@ -132,10 +138,13 @@ RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \
     make -j8 && make install && \
     ln -s /usr/local/ccache-3.7.9/bin/ccache /usr/local/bin/ccache
 
-RUN python3.8 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.7 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.6 -m pip install --upgrade pip==21.1.1 requests 
+# Update pip version 
+RUN python3.8 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.7 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.6 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.9 -m pip install --upgrade pip==21.3.1 requests
 
+# Wget ssl libs and link thems
 RUN wget https://paddle-serving.bj.bcebos.com/others/centos_ssl.tar && \
     tar xf centos_ssl.tar && rm -rf centos_ssl.tar && \
     mv libcrypto.so.1.0.2k /usr/lib/libcrypto.so.1.0.2k && mv libssl.so.1.0.2k /usr/lib/libssl.so.1.0.2k && \

tools/Dockerfile.cuda10.2-cudnn8.centos

+# A image for building paddle binaries
+# Use cuda devel base image for both cpu and gpu environment
+# When you modify it, please be aware of cudnn-runtime version
+FROM paddlepaddle/paddle_manylinux_devel:cuda10.2-cudnn8.1-gcc82-trt7
+MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
+
+
+# Update golang version to 1.17.2
+RUN wget -qO- https://paddle-ci.cdn.bcebos.com/go1.17.2.linux-amd64.tar.gz | \
+    tar -xz -C /usr/local && \
+    mkdir /root/go && \
+    mkdir /root/go/bin && \
+    mkdir /root/go/src && \
+    echo "GOROOT=/usr/local/go" >> /root/.bashrc && \
+    echo "GOPATH=/root/go" >> /root/.bashrc && \
+    echo "PATH=/usr/local/go/bin:/root/go/bin:$PATH" >> /root/.bashrc
+
+EXPOSE 22

tools/Dockerfile.cuda10.2-cudnn8.devel

@@ -77,6 +77,12 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
     CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
     make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.8.0*
 
+# Install Python3.9
+RUN wget -q https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz && \
+    tar -xzf Python-3.9.0.tgz && cd Python-3.9.0 && \
+    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
+    make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.9.0*
+
 ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
 RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3 && ln -sf /usr/local/bin/python3.6 /usr/bin/python3 && ln -sf /usr/local/bin/pip3.6 /usr/local/bin/pip3 && ln -sf /usr/local/bin/pip3.6 /usr/bin/pip3
 
@@ -132,10 +138,13 @@ RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \
     make -j8 && make install && \
     ln -s /usr/local/ccache-3.7.9/bin/ccache /usr/local/bin/ccache
 
-RUN python3.8 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.7 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.6 -m pip install --upgrade pip==21.1.1 requests 
+# Update pip version 
+RUN python3.8 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.7 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.6 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.9 -m pip install --upgrade pip==21.3.1 requests
 
+# Wget ssl libs and link thems
 RUN wget https://paddle-serving.bj.bcebos.com/others/centos_ssl.tar && \
     tar xf centos_ssl.tar && rm -rf centos_ssl.tar && \
     mv libcrypto.so.1.0.2k /usr/lib/libcrypto.so.1.0.2k && mv libssl.so.1.0.2k /usr/lib/libssl.so.1.0.2k && \

tools/Dockerfile.cuda11.2-cudnn8.centos

+# A image for building paddle binaries
+# Use cuda devel base image for both cpu and gpu environment
+# When you modify it, please be aware of cudnn-runtime version
+FROM paddlepaddle/paddle_manylinux_devel:cuda11.2-cudnn8.2.1-trt8.0.3.4-gcc82
+MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
+
+
+# Update golang version to 1.17.2
+RUN wget -qO- https://paddle-ci.cdn.bcebos.com/go1.17.2.linux-amd64.tar.gz | \
+    tar -xz -C /usr/local && \
+    mkdir /root/go && \
+    mkdir /root/go/bin && \
+    mkdir /root/go/src && \
+    echo "GOROOT=/usr/local/go" >> /root/.bashrc && \
+    echo "GOPATH=/root/go" >> /root/.bashrc && \
+    echo "PATH=/usr/local/go/bin:/root/go/bin:$PATH" >> /root/.bashrc
+
+EXPOSE 22

tools/Dockerfile.cuda11.2-cudnn8.devel

@@ -77,6 +77,12 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
     CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
     make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.8.0*
 
+# Install Python3.9
+RUN wget -q https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz && \
+    tar -xzf Python-3.9.0.tgz && cd Python-3.9.0 && \
+    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
+    make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.9.0*
+
 ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
 RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3 && ln -sf /usr/local/bin/python3.6 /usr/bin/python3 && ln -sf /usr/local/bin/pip3.6 /usr/local/bin/pip3 && ln -sf /usr/local/bin/pip3.6 /usr/bin/pip3
 
@@ -132,10 +138,13 @@ RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \
     make -j8 && make install && \
     ln -s /usr/local/ccache-3.7.9/bin/ccache /usr/local/bin/ccache
 
-RUN python3.8 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.7 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.6 -m pip install --upgrade pip==21.1.1 requests 
+# Update pip version 
+RUN python3.8 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.7 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.6 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.9 -m pip install --upgrade pip==21.3.1 requests
 
+# Wget ssl libs and link thems
 RUN wget https://paddle-serving.bj.bcebos.com/others/centos_ssl.tar && \
     tar xf centos_ssl.tar && rm -rf centos_ssl.tar && \
     mv libcrypto.so.1.0.2k /usr/lib/libcrypto.so.1.0.2k && mv libssl.so.1.0.2k /usr/lib/libssl.so.1.0.2k && \

tools/Dockerfile.devel

@@ -77,6 +77,13 @@ RUN wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz && \
     CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
     make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.8.0*
 
+# Install Python3.9
+RUN wget -q https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz && \
+    tar -xzf Python-3.9.0.tgz && cd Python-3.9.0 && \
+    CFLAGS="-Wformat" ./configure --prefix=/usr/local/ --enable-shared > /dev/null && \
+    make -j8 > /dev/null && make altinstall > /dev/null && ldconfig && cd .. && rm -rf Python-3.9.0*
+
+
 ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
 RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3 && ln -sf /usr/local/bin/python3.6 /usr/bin/python3 && ln -sf /usr/local/bin/pip3.6 /usr/local/bin/pip3 && ln -sf /usr/local/bin/pip3.6 /usr/bin/pip3
 
@@ -132,10 +139,13 @@ RUN wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \
     make -j8 && make install && \
     ln -s /usr/local/ccache-3.7.9/bin/ccache /usr/local/bin/ccache
 
-RUN python3.8 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.7 -m pip install --upgrade pip==21.1.1 requests && \
-    python3.6 -m pip install --upgrade pip==21.1.1 requests 
+# Update pip version 
+RUN python3.8 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.7 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.6 -m pip install --upgrade pip==21.3.1 requests && \
+    python3.9 -m pip install --upgrade pip==21.3.1 requests
 
+# Wget ssl libs and link thems
 RUN wget https://paddle-serving.bj.bcebos.com/others/centos_ssl.tar && \
     tar xf centos_ssl.tar && rm -rf centos_ssl.tar && \
     mv libcrypto.so.1.0.2k /usr/lib/libcrypto.so.1.0.2k && mv libssl.so.1.0.2k /usr/lib/libssl.so.1.0.2k && \

tools/Dockerfile.java

+# A image for building paddle binaries
+# # Use cuda devel base image for both cpu and gpu environment
+# # When you modify it, please be aware of cudnn-runtime version
+FROM hub.baidubce.com/paddlepaddle/serving:latest-cuda10.2-cudnn8-devel
+MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
+
+
+# The docker has already installed maven.
+RUN apt update && \
+    apt install -y default-jre && \
+    apt install -y default-jdk && \
+    apt install -y maven
+
+EXPOSE 22