diff --git a/core/configure/proto/multi_lang_general_model_service.proto b/core/configure/proto/multi_lang_general_model_service.proto
index c23f4dbb243e8d23b8e4bfef419649b262f0dcd3..18fbcf760647e1694e738c0832fe45f4f7d9934f 100644
--- a/core/configure/proto/multi_lang_general_model_service.proto
+++ b/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";
diff --git a/doc/COMPILE.md b/doc/COMPILE.md
index 1836f4fe089f13e2eb2c9485f40d50ec668e4671..63a4d67c40af77e616e018d1a6dbc289615b4971 100644
--- a/doc/COMPILE.md
+++ b/doc/COMPILE.md
@@ -4,26 +4,25 @@
## Compilation environment requirements
-| module | version |
-| :--------------------------: | :----------------------------------------------------------: |
-| OS | CentOS 7 |
-| gcc | 4.8.5 and later |
-| gcc-c++ | 4.8.5 and later |
-| git | 3.82 and later |
-| cmake | 3.2.0 and later |
-| Python | 2.7.2 and later / 3.6 and later |
-| Go | 1.9.2 and later |
-| git | 2.17.1 and later |
-| glibc-static | 2.17 |
-| openssl-devel | 1.0.2k |
-| bzip2-devel | 1.0.6 and later |
-| python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later |
-| sqlite-devel | 3.7.17 and later |
-| patchelf | 0.9 and later |
-| libXext | 1.3.3 |
-| libSM | 1.2.2 |
-| libXrender | 0.9.10 |
-| 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 |
+| module | version |
+| :--------------------------: | :-------------------------------: |
+| OS | CentOS 7 |
+| gcc | 4.8.5 and later |
+| gcc-c++ | 4.8.5 and later |
+| git | 3.82 and later |
+| cmake | 3.2.0 and later |
+| Python | 2.7.2 and later / 3.6 and later |
+| Go | 1.9.2 and later |
+| git | 2.17.1 and later |
+| glibc-static | 2.17 |
+| openssl-devel | 1.0.2k |
+| bzip2-devel | 1.0.6 and later |
+| python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later |
+| sqlite-devel | 3.7.17 and later |
+| patchelf | 0.9 and later |
+| libXext | 1.3.3 |
+| libSM | 1.2.2 |
+| libXrender | 0.9.10 |
It is recommended to use Docker for compilation. We have prepared the Paddle Serving compilation environment for you, see [this document](DOCKER_IMAGES.md).
@@ -114,7 +113,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.
@@ -124,6 +123,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 |
diff --git a/doc/COMPILE_CN.md b/doc/COMPILE_CN.md
index 1235653e69161ba8f71d3f8098a1860dca4d357d..29b0645cc4ea90c56cd5d691f4766a3e3ad39ba1 100644
--- a/doc/COMPILE_CN.md
+++ b/doc/COMPILE_CN.md
@@ -4,26 +4,25 @@
## 编译环境设置
-| 组件 | 版本要求 |
-| :--------------------------: | :----------------------------------------------------------: |
-| OS | CentOS 7 |
-| gcc | 4.8.5 and later |
-| gcc-c++ | 4.8.5 and later |
-| git | 3.82 and later |
-| cmake | 3.2.0 and later |
-| Python | 2.7.2 and later / 3.6 and later |
-| Go | 1.9.2 and later |
-| git | 2.17.1 and later |
-| glibc-static | 2.17 |
-| openssl-devel | 1.0.2k |
-| bzip2-devel | 1.0.6 and later |
-| python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later |
-| sqlite-devel | 3.7.17 and later |
-| patchelf | 0.9 |
-| libXext | 1.3.3 |
-| libSM | 1.2.2 |
-| libXrender | 0.9.10 |
-| 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 |
+| 组件 | 版本要求 |
+| :--------------------------: | :-------------------------------: |
+| OS | CentOS 7 |
+| gcc | 4.8.5 and later |
+| gcc-c++ | 4.8.5 and later |
+| git | 3.82 and later |
+| cmake | 3.2.0 and later |
+| Python | 2.7.2 and later / 3.6 and later |
+| Go | 1.9.2 and later |
+| git | 2.17.1 and later |
+| glibc-static | 2.17 |
+| openssl-devel | 1.0.2k |
+| bzip2-devel | 1.0.6 and later |
+| python-devel / python3-devel | 2.7.5 and later / 3.6.8 and later |
+| sqlite-devel | 3.7.17 and later |
+| patchelf | 0.9 |
+| libXext | 1.3.3 |
+| libSM | 1.2.2 |
+| libXrender | 0.9.10 |
推荐使用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选项说明
| 编译选项 | 说明 | 默认 |
diff --git a/java/src/main/proto/multi_lang_general_model_service.proto b/java/src/main/proto/multi_lang_general_model_service.proto
index c23f4dbb243e8d23b8e4bfef419649b262f0dcd3..18fbcf760647e1694e738c0832fe45f4f7d9934f 100644
--- a/java/src/main/proto/multi_lang_general_model_service.proto
+++ b/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";
diff --git a/python/requirements.txt b/python/requirements.txt
index 8823175121b0d98f4defdcc58332e039b46bff7b..4bf024d1fa46a310d9d183c9e82ec386db3f5f85 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,4 +1,5 @@
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