Merge branch 'develop' into 0.3.2-qa

core/configure/proto/multi_lang_general_model_service.proto

@@ -14,6 +14,8 @@
 
 syntax = "proto2";
 
+package baidu.paddle_serving.multi_lang;
+
 option java_multiple_files = true;
 option java_package = "io.paddle.serving.grpc";
 option java_outer_classname = "ServingProto";

doc/COMPILE.md

@@ -5,7 +5,7 @@
 ## Compilation environment requirements
 
 |            module            |              version              |
-| :--------------------------: | :----------------------------------------------------------: |
+| :--------------------------: | :-------------------------------: |
 |              OS              |             CentOS 7              |
 |             gcc              |          4.8.5 and later          |
 |           gcc-c++            |          4.8.5 and later          |
@@ -23,7 +23,6 @@
 |           libXext            |               1.3.3               |
 |            libSM             |               1.2.2               |
 |          libXrender          |              0.9.10               |
-|          python-whl          | numpy>=1.12, <=1.16.4<br/>wheel>=0.34.0, <0.35.0<br/>setuptools>=44.1.0<br/>opencv-python==4.2.0.32<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br>flask>=1.1.2<br>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).
 
@@ -127,7 +126,7 @@ make
 
 ## Install wheel package
 
-Regardless of the client, server or App part, after compiling, install the whl package under `python/dist/`.
+Regardless of the client, server or App part, after compiling, install the whl package in `python/dist/` in the temporary directory(`server-build-cpu`, `server-build-gpu`, `client-build`,`app-build`) of the compilation process.
 
 
 
@@ -137,6 +136,12 @@ When running the python server, it will check the `SERVING_BIN` environment vari
 
 
 
+## Verify
+
+Please use the example under `python/examples` to verify.
+
+
+
 ## CMake Option Description
 
 | Compile Options  |                    Description             | Default |

doc/COMPILE_CN.md

@@ -5,7 +5,7 @@
 ## 编译环境设置
 
 |             组件             |             版本要求              |
-| :--------------------------: | :----------------------------------------------------------: |
+| :--------------------------: | :-------------------------------: |
 |              OS              |             CentOS 7              |
 |             gcc              |          4.8.5 and later          |
 |           gcc-c++            |          4.8.5 and later          |
@@ -23,7 +23,6 @@
 |           libXext            |               1.3.3               |
 |            libSM             |               1.2.2               |
 |          libXrender          |              0.9.10               |
-|          python-whl          | numpy>=1.12, <=1.16.4<br/>wheel>=0.34.0, <0.35.0<br/>setuptools>=44.1.0<br/>opencv-python==4.2.0.32<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br/>flask>=1.1.2<br/>ujson>=2.0.3 |
 
 推荐使用Docker编译，我们已经为您准备好了Paddle Serving编译环境，详见[该文档](DOCKER_IMAGES_CN.md)。
 
@@ -114,7 +113,7 @@ make
 
 ## 安装wheel包
 
-无论是Client端，Server端还是App部分，编译完成后，安装`python/dist/`下的whl包即可。
+无论是Client端，Server端还是App部分，编译完成后，安装编译过程临时目录（`server-build-cpu`、`server-build-gpu`、`client-build`、`app-build`）下的`python/dist/` 中的whl包即可。
 
 
 
@@ -124,6 +123,12 @@ make
 
 
 
+## 如何验证
+
+请使用 `python/examples` 下的例子进行验证。
+
+
+
 ## CMake选项说明
 
 |     编译选项     |                    说明                    | 默认 |

java/src/main/proto/multi_lang_general_model_service.proto

@@ -14,6 +14,8 @@
 
 syntax = "proto2";
 
+package baidu.paddle_serving.multi_lang;
+
 option java_multiple_files = true;
 option java_package = "io.paddle.serving.grpc";
 option java_outer_classname = "ServingProto";

python/requirements.txt

 numpy>=1.12, <=1.16.4 ; python_version<"3.5"
+shapely==1.7.0
 wheel>=0.34.0, <0.35.0
 setuptools>=44.1.0
 opencv-python==4.2.0.32