Merge branch 'v0.6.0' into cherrypick-0.6.0

cmake/paddlepaddle.cmake

@@ -31,16 +31,16 @@ message( "WITH_GPU = ${WITH_GPU}")
 # Paddle Version should be one of:
 # latest: latest develop build
 # version number like 1.5.2
-SET(PADDLE_VERSION "2.0.1")
+SET(PADDLE_VERSION "2.1.0")
 if (WITH_GPU)
     if(CUDA_VERSION EQUAL 11.0)
-        set(CUDA_SUFFIX "cuda11-cudnn8-avx-mkl")
+        set(CUDA_SUFFIX "cuda11.0-cudnn8-mkl-gcc8.2")
         set(WITH_TRT ON)
     elseif(CUDA_VERSION EQUAL 10.2)
-        set(CUDA_SUFFIX "cuda10.2-cudnn8-avx-mkl")
+        set(CUDA_SUFFIX "cuda10.2-cudnn8-mkl-gcc8.2")
         set(WITH_TRT ON)
     elseif(CUDA_VERSION EQUAL 10.1)
-        set(CUDA_SUFFIX "cuda10.1-cudnn7-avx-mkl")
+        set(CUDA_SUFFIX "cuda10.1-cudnn7-mkl-gcc8.2")
         set(WITH_TRT ON)
     elseif(CUDA_VERSION EQUAL 10.0)
         set(CUDA_SUFFIX "cuda10-cudnn7-avx-mkl")

python/examples/pipeline/simple_web_service/web_service_java.py

@@ -36,7 +36,7 @@ class UciOp(Op):
         _LOGGER.error("UciOp::preprocess >>> log_id:{}, input:{}".format(
             log_id, input_dict))
         proc_dict = {}
-        x_value = input_dict["x"]
+        x_value = eval(input_dict["x"])
         input_dict["x"] = x_value.reshape(1, 13)
 
         return input_dict, False, None, ""

python/requirements.txt

@@ -9,6 +9,11 @@ grpcio>=1.28.1
 func-timeout>=4.3.5
 pyyaml>=1.3.0
 flask>=1.1.2
+click==7.1.2
+itsdangerous==1.1.0
+Jinja2==2.11.3
+MarkupSafe==1.1.1
+Werkzeug==1.0.1
 ujson>=2.0.3
 sentencepiece==0.1.92; platform_machine !=  "aarch64"
 sentencepiece; platform_machine ==  "aarch64"

python/requirements_mac.txt

@@ -8,6 +8,11 @@ protobuf>=3.12.2
 func-timeout>=4.3.5
 pyyaml>=1.3.0
 flask>=1.1.2
+click==7.1.2
+itsdangerous==1.1.0
+Jinja2==2.11.3
+MarkupSafe==1.1.1
+Werkzeug==1.0.1
 ujson>=2.0.3
 grpcio-tools>=1.33.2
 grpcio>=1.33.2

python/setup.py.server.in

@@ -33,7 +33,8 @@ util.gen_pipeline_code("paddle_serving_server")
 
 REQUIRED_PACKAGES = [
     'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio <= 1.33.2', 'grpcio-tools <= 1.33.2',
-    'flask >= 1.1.1', 'func_timeout', 'pyyaml'
+    'flask >= 1.1.1', 'click==7.1.2', 'itsdangerous==1.1.0', 'Jinja2==2.11.3',
+    'MarkupSafe==1.1.1', 'Werkzeug==1.0.1', 'func_timeout', 'pyyaml'
 ]
 
 packages=['paddle_serving_server',

tools/scripts/ipipe_py3.sh

@@ -162,7 +162,7 @@ function run_env() {
     python3.6 -m pip install --upgrade nltk==3.4
     python3.6 -m pip install --upgrade scipy==1.2.1
     python3.6 -m pip install --upgrade setuptools==41.0.0
-    python3.6 -m pip install paddlehub ujson paddlepaddle==2.0.0
+    python3.6 -m pip install paddlehub ujson paddlepaddle==2.0.2
     echo "run env configuration is successful.... "
 }
 
@@ -245,7 +245,7 @@ function build_client() {
 function build_app() {
     setproxy
     python3.6 -m pip install paddlehub ujson Pillow
-    python3.6 -m pip install paddlepaddle==2.0.0
+    python3.6 -m pip install paddlepaddle==2.0.2
     cd ${build_path}
     if [ -d build ];then
         rm -rf build