Merge branch 'develop' into dev_2

README.md

@@ -56,8 +56,8 @@ This chapter guides you through the installation and deployment steps. It is str
 
 - [Install Paddle Serving using docker](doc/Install_EN.md)
 - [Build Paddle Serving from Source with Docker](doc/Compile_EN.md)
-- [Deploy Paddle Serving on Kubernetes](doc/Run_On_Kubernetes_EN.md)
-- [Deploy Paddle Serving with Security gateway](doc/Serving_Auth_Docker.md)
+- [Deploy Paddle Serving on Kubernetes](doc/Run_On_Kubernetes_CN.md)
+- [Deploy Paddle Serving with Security gateway](doc/Serving_Auth_Docker_CN.md)
 - [Deploy Paddle Serving on more hardwares](doc/Run_On_XPU_EN.md)
 - [Latest Wheel packages](doc/Latest_Packages_CN.md)(Update everyday on branch develop)
 
@@ -68,10 +68,10 @@ The first step is to call the model save interface to generate a model parameter
 - [Quick Start](doc/Quick_Start_EN.md)
 - [Save a servable model](doc/Save_EN.md)
 - [Description of configuration and startup parameters](doc/Serving_Configure_EN.md)
-- [Guide for RESTful/gRPC/bRPC APIs](doc/C++_Serving/Http_Service_EN.md)
+- [Guide for RESTful/gRPC/bRPC APIs](doc/C++_Serving/Introduction_CN.md)
 - [Infer on quantizative models](doc/Low_Precision_CN.md)
-- [Data format of classic models](doc/Process_Data_CN.md)
-- [C++ Serving](doc/C++_Serving/Introduction_EN.md) 
+- [Data format of classic models](doc/Process_data_CN.md)
+- [C++ Serving](doc/C++_Serving/Introduction_CN.md) 
   - [protocols](doc/C++_Serving/Inference_Protocols_CN.md)
   - [Hot loading models](doc/C++_Serving/Hot_Loading_EN.md)
   - [A/B Test](doc/C++_Serving/ABTest_EN.md)
@@ -101,20 +101,20 @@ For Paddle Serving developers, we provide extended documents such as custom OP,
 
 Paddle Serving works closely with the Paddle model suite, and implements a large number of service deployment examples, including image classification, object detection, language and text recognition, Chinese part of speech, sentiment analysis, content recommendation and other types of examples,  for a total of 42 models.
 
-<center class="half">
+<p align="center">
 
 | PaddleOCR | PaddleDetection | PaddleClas | PaddleSeg | PaddleRec | Paddle NLP | 
 | :----:  | :----: | :----: | :----: | :----: | :----: | 
 | 8 | 12 | 13 | 2 | 3 | 4 | 
 
-</center>
+</p>
 
 For more model examples, read [Model zoo](doc/Model_Zoo_EN.md)
 
-<center class="half">
-  <img src="https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.3/doc/imgs_results/PP-OCRv2/PP-OCRv2-pic003.jpg?raw=true" width="280"/> <img src="https://github.com/PaddlePaddle/PaddleDetection/raw/release/2.3/docs/images/road554.png" width="160"/>
-  <img src="https://github.com/PaddlePaddle/PaddleClas/raw/release/2.3/docs/images/recognition.gif" width="213"/>
-</center>
+<p align="center">
+  <img src="https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.3/doc/imgs_results/PP-OCRv2/PP-OCRv2-pic003.jpg?raw=true" width="345"/> 
+  <img src="doc/images/detection.png" width="350">
+</p>
 
 
 <h2 align="center">Community</h2>
@@ -122,10 +122,19 @@ For more model examples, read [Model zoo](doc/Model_Zoo_EN.md)
 If you want to communicate with developers and other users? Welcome to join us, join the community through the following methods below.
 
 ### Wechat
-- 微信用户请扫码
+- WeChat scavenging
+
+
+<p align="center">
+  <img src="doc/images/wechat_group_1.jpeg" width="250">
+</p>
 
 ### QQ
-- 飞桨推理部署交流群(Group No.：696965088)
+- 飞桨推理部署交流群(Group No.：697765514)
+
+<p align="center">
+  <img src="doc/images/qq_group_1.png" width="200">
+</p>
 
 ### Slack
 
@@ -134,11 +143,12 @@ If you want to communicate with developers and other users? Welcome to join us,
 > Contribution
 
 If you want to contribute code to Paddle Serving, please reference [Contribution Guidelines](doc/Contribute_EN.md)
-
-- Special Thanks to [@BeyondYourself](https://github.com/BeyondYourself) in complementing the gRPC tutorial, updating the FAQ doc and modifying the mdkir command
-- Special Thanks to [@mcl-stone](https://github.com/mcl-stone) in updating faster_rcnn benchmark
-- Special Thanks to [@cg82616424](https://github.com/cg82616424) in updating the unet benchmark and modifying resize comment error
-- Special Thanks to [@cuicheng01](https://github.com/cuicheng01) for providing 11 PaddleClas models
+- Thanks to [@loveululu](https://github.com/loveululu) for providing python API of Cube.
+- Thanks to [@EtachGu](https://github.com/EtachGu) in updating run docker codes.
+- Thanks to [@BeyondYourself](https://github.com/BeyondYourself) in complementing the gRPC tutorial, updating the FAQ doc and modifying the mdkir command
+- Thanks to [@mcl-stone](https://github.com/mcl-stone) in updating faster_rcnn benchmark
+- Thanks to [@cg82616424](https://github.com/cg82616424) in updating the unet benchmark  modifying resize comment error
+- Thanks to [@cuicheng01](https://github.com/cuicheng01) for providing 11 PaddleClas models
 
 > Feedback
 

README_CN.md

@@ -55,8 +55,8 @@ Paddle Serving依托深度学习框架PaddlePaddle旨在帮助深度学习开发
 此章节引导您完成安装和部署步骤，强烈推荐使用Docker部署Paddle Serving，如您不使用docker，省略docker相关步骤。在云服务器上可以使用Kubernetes部署Paddle Serving。在异构硬件如ARM CPU、昆仑XPU上编译或使用Paddle Serving可以下面的文档。每天编译生成develop分支的最新开发包供开发者使用。
 - [使用docker安装Paddle Serving](doc/Install_CN.md)
 - [源码编译安装Paddle Serving](doc/Compile_CN.md)
-- [在Kuberntes集群上部署Paddle Serving](doc/Run_On_Kubernetes.md)
-- [部署Paddle Serving安全网关](doc/Serving_Auth_Docker.md)
+- [在Kuberntes集群上部署Paddle Serving](doc/Run_On_Kubernetes_CN.md)
+- [部署Paddle Serving安全网关](doc/Serving_Auth_Docker_CN.md)
 - [在异构硬件部署Paddle Serving](doc/Run_On_XPU_CN.md)
 - [最新Wheel开发包](doc/Latest_Packages_CN.md)(develop分支每日更新)
 
@@ -64,9 +64,9 @@ Paddle Serving依托深度学习框架PaddlePaddle旨在帮助深度学习开发
 
 安装Paddle Serving后，使用快速开始将引导您运行Serving。第一步，调用模型保存接口，生成模型参数配置文件(.prototxt)用以在客户端和服务端使用；第二步，阅读配置和启动参数并启动服务；第三步，根据API和您的使用场景，基于SDK编写客户端请求，并测试推理服务。您想了解跟多特性的使用场景和方法，请详细阅读以下文档。
 - [快速开始](doc/Quick_Start_CN.md)
-- [保存用于Paddle Serving的模型和配置](doc/SAVE_CN.md)
+- [保存用于Paddle Serving的模型和配置](doc/Save_CN.md)
 - [配置和启动参数的说明](doc/Serving_Configure_CN.md)
-- [RESTful/gRPC/bRPC API指南](doc/C++_Serving/Http_Service_CN.md)
+- [RESTful/gRPC/bRPC API指南](doc/C++_Serving/Introduction_CN.md#4.Client端特性)
 - [低精度推理](doc/Low_Precision_CN.md)
 - [常见模型数据处理](doc/Process_data_CN.md)
 - [C++ Serving简介](doc/C++_Serving/Introduction_CN.md) 
@@ -95,21 +95,21 @@ Paddle Serving依托深度学习框架PaddlePaddle旨在帮助深度学习开发
 <h2 align="center">模型库</h2>
 
 Paddle Serving与Paddle模型套件紧密配合，实现大量服务化部署，包括图像分类、物体检测、语言文本识别、中文词性、情感分析、内容推荐等多种类型示例，以及Paddle全链条项目，共计42个模型。
-<center class="half">
+
+<p align="center">
 
 | PaddleOCR | PaddleDetection | PaddleClas | PaddleSeg | PaddleRec | Paddle NLP | 
 | :----:  | :----: | :----: | :----: | :----: | :----: | 
 | 8 | 12 | 13 | 2 | 3 | 4 | 
 
-</center>
+</p>
+
 更多模型示例参考Repo，可进入[模型库](doc/Model_Zoo_CN.md)
 
-<center class="half">
-  <img src="https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.3/doc/imgs_results/PP-OCRv2/PP-OCRv2-pic003.jpg?raw=true" width="280"/>
-  <img src="https://github.com/PaddlePaddle/PaddleDetection/raw/release/2.3/docs/images/road554.png" width="160"/>
-  <img src="doc/images/detection.png" width="160"/>
-  <img src="https://github.com/PaddlePaddle/PaddleClas/raw/release/2.3/docs/images/recognition.gif" width="213"/>
-</center>
+<p align="center">
+  <img src="https://github.com/PaddlePaddle/PaddleOCR/blob/release/2.3/doc/imgs_results/PP-OCRv2/PP-OCRv2-pic003.jpg?raw=true" width="345"/>
+  <img src="doc/images/detection.png" width="350">
+</p>
 
 <h2 align="center">社区</h2>
 
@@ -119,8 +119,16 @@ Paddle Serving与Paddle模型套件紧密配合，实现大量服务化部署，
 ### 微信
 - 微信用户请扫码
 
+<p align="center">
+  <img src="doc/images/wechat_group_1.jpeg" width="250">
+</p>
+
 ### QQ
-- 飞桨推理部署交流群(群号：696965088)
+- 飞桨推理部署交流群(Group No.：697765514)
+
+<p align="center">
+  <img src="doc/images/qq_group_1.png" width="200">
+</p>
 
 ### Slack
 - [Slack channel](https://paddleserving.slack.com/archives/CUBPKHKMJ)
@@ -128,12 +136,13 @@ Paddle Serving与Paddle模型套件紧密配合，实现大量服务化部署，
 
 > 贡献代码
 
-如果您想为Paddle Serving贡献代码，请参考 [Contribution Guidelines](doc/Contribute.md)
-
-- 特别感谢 [@BeyondYourself](https://github.com/BeyondYourself) 提供grpc教程，更新FAQ教程，整理文件目录。
-- 特别感谢 [@mcl-stone](https://github.com/mcl-stone) 提供faster rcnn benchmark脚本
-- 特别感谢 [@cg82616424](https://github.com/cg82616424) 提供unet benchmark脚本和修改部分注释错误
-- 特别感谢 [@cuicheng01](https://github.com/cuicheng01) 提供PaddleClas的11个模型
+如果您想为Paddle Serving贡献代码，请参考 [Contribution Guidelines](doc/Contribute_EN.md)
+- 感谢 [@loveululu](https://github.com/loveululu) 提供 Cube python API
+- 感谢 [@EtachGu](https://github.com/EtachGu) 更新 docker 使用命令
+- 感谢 [@BeyondYourself](https://github.com/BeyondYourself) 提供grpc教程，更新FAQ教程，整理文件目录。
+- 感谢 [@mcl-stone](https://github.com/mcl-stone) 提供faster rcnn benchmark脚本
+- 感谢 [@cg82616424](https://github.com/cg82616424) 提供unet benchmark脚本和修改部分注释错误
+- 感谢 [@cuicheng01](https://github.com/cuicheng01) 提供PaddleClas的11个模型
 
 > 反馈
 

core/preprocess/hwvideoframe/README.md

@@ -54,7 +54,7 @@ Hwvideoframe provides a variety of data preprocessing methods for photo preproce
 
 ## Quick start
 
-[After compiling from code](https://github.com/PaddlePaddle/Serving/blob/develop/doc/COMPILE.md)，this project will be stored in reader。
+[After compiling from code](../../../doc/Compile_EN.md)，this project will be stored in reader。
 
 ## How to Test
 

doc/Compile_CN.md

@@ -23,7 +23,7 @@
 |            libSM             |               1.2.2               |
 |          libXrender          |              0.9.10               |
 
-推荐使用Docker编译，我们已经为您准备好了Paddle Serving编译环境并配置好了上述编译依赖，详见[该文档](DOCKER_IMAGES_CN.md)。
+推荐使用Docker编译，我们已经为您准备好了Paddle Serving编译环境并配置好了上述编译依赖，详见[该文档](Docker_Images_CN.md)。
 
 ## 获取代码
 
@@ -158,7 +158,7 @@ cmake -DPYTHON_INCLUDE_DIR=$PYTHON_INCLUDE_DIR/ \
 make -j10
 ```
 
-**注意：** 编译成功后，需要设置`SERVING_BIN`路径，详见后面的[注意事项](https://github.com/PaddlePaddle/Serving/blob/develop/doc/COMPILE_CN.md#注意事项)。
+**注意：** 编译成功后，需要设置`SERVING_BIN`路径，详见后面的[注意事项](#注意事项)。
 
 
 ## 编译Client部分

doc/Docker_Images_EN.md

@@ -78,6 +78,7 @@ Running Images:
 
 Running Images is lighter than Develop Images, and Running Images are made up with serving whl and bin, but without develop tools like cmake because of lower image size. If you want to know about it, plese check the document [Paddle Serving on Kubernetes.](./Run_On_Kubernetes_CN.md).
 
+
 | ENV                                      | Python Version | Tag                         |
 |------------------------------------------|----------------|-----------------------------|
 | cpu                                      | 3.6            | 0.6.2-py36-runtime          |

doc/Latest_Packages_CN.md

@@ -41,7 +41,7 @@ https://paddle-serving.bj.bcebos.com/test-dev/whl/paddle_serving_app-0.0.0-py3-n
 ```
 
 ## Baidu Kunlun user
-for kunlun user who uses arm-xpu or x86-xpu can download the wheel packages as follows. Users should use the xpu-beta docker [DOCKER IMAGES](./DOCKER_IMAGES.md) 
+for kunlun user who uses arm-xpu or x86-xpu can download the wheel packages as follows. Users should use the xpu-beta docker [DOCKER IMAGES](./Docker_Images_CN.md) 
 **We only support Python 3.6 for Kunlun Users.**
 
 ### Wheel Package Links

doc/Serving_Configure_CN.md

@@ -13,6 +13,7 @@
 ## 模型配置文件
 
 在开始介绍Server配置之前，先来介绍一下模型配置文件。我们在将模型转换为PaddleServing模型时，会生成对应的serving_client_conf.prototxt以及serving_server_conf.prototxt，两者内容一致，为模型输入输出的参数信息，方便用户拼装参数。该配置文件用于Server以及Client，并不需要用户自行修改。转换方法参考文档《[怎样保存用于Paddle Serving的模型](./Save_CN.md)》。protobuf格式可参考`core/configure/proto/general_model_config.proto`。
+
 样例如下：
 
 ```
@@ -58,7 +59,7 @@ fetch_var {
 
 ## C++ Serving
 
-### 1.快速启动与关闭
+### 1.快速启动
 
 可以通过配置模型及端口号快速启动服务，启动命令如下：
 
@@ -106,11 +107,6 @@ python3 -m paddle_serving_server.serve --model serving_model --thread 10 --port
 ```BASH
 python3 -m paddle_serving_server.serve --model serving_model_1 serving_model_2 --thread 10 --port 9292
 ```
-#### 当您想要关闭Serving服务时.
-```BASH
-python3 -m paddle_serving_server.serve stop
-```
-stop参数发送SIGINT至C++ Serving，若改成kill则发送SIGKILL信号至C++ Serving
 
 ### 2.自定义配置启动
 
@@ -317,20 +313,6 @@ fetch_var {
 
 ## Python Pipeline
 
-### 快速启动与关闭
-Python Pipeline启动命令如下：
-
-```BASH
-python3 web_service.py
-```
-
-当您想要关闭Serving服务时.
-```BASH
-python3 -m paddle_serving_server.serve stop
-```
-stop参数发送SIGINT至Pipeline Serving，若改成kill则发送SIGKILL信号至Pipeline Serving
-
-### 配置文件
 Python Pipeline提供了用户友好的多模型组合服务编程框架，适用于多模型组合应用的场景。
 其配置文件为YAML格式，一般默认为config.yaml。示例如下：
 ```YAML

doc/Serving_Design_EN.md

@@ -128,7 +128,7 @@ Paddle Serving uses a symmetric encryption algorithm to encrypt the model, and d
 
 ### 3.5 A/B Test
 
-After sufficient offline evaluation of the model, online A/B test is usually needed to decide whether to enable the service on a large scale. The following figure shows the basic structure of A/B test with Paddle Serving. After the client is configured with the corresponding configuration, the traffic will be automatically distributed to different servers to achieve A/B test. Please refer to [ABTEST in Paddle Serving](C++_Serving/ABTEST_EN.md) for specific examples.
+After sufficient offline evaluation of the model, online A/B test is usually needed to decide whether to enable the service on a large scale. The following figure shows the basic structure of A/B test with Paddle Serving. After the client is configured with the corresponding configuration, the traffic will be automatically distributed to different servers to achieve A/B test. Please refer to [ABTEST in Paddle Serving](C++_Serving/ABTest_EN.md) for specific examples.
 
 <p align="center">
     <br>

doc/Windows_Tutorial_CN.md

 ## Windows平台使用Paddle Serving指导
 
-([English](./Windows_Turtial_EN.md)|简体中文）
+([English](./Windows_Tutorial_EN.md)|简体中文）
 
 ### 综述
 

java/README.md

@@ -73,7 +73,7 @@ java -cp paddle-serving-sdk-java-examples-0.0.1-jar-with-dependencies.jar Pipeli
 
 1.In the example, all models(not pipeline) need to use `--use_multilang` to start GRPC multi-programming language support, and the port number is 9393. If you need another port, you need to modify it in the java file
 
-2.Currently Serving has launched the Pipeline mode (see [Pipeline Serving](../doc/PIPELINE_SERVING.md) for details). Pipeline Serving Client for Java is released.
+2.Currently Serving has launched the Pipeline mode (see [Pipeline Serving](../doc/Python_Pipeline/Pipeline_Design_EN.md) for details). Pipeline Serving Client for Java is released.
 
 3.The parameters`ip` and`port` in PipelineClientExample.java(path:java/examples/src/main/java/[PipelineClientExample.java](./examples/src/main/java/PipelineClientExample.java)），needs to be connected with the corresponding pipeline server parameters`ip` and`port` which is defined in the config.yaml(Taking IMDB model ensemble as an example，path:python/examples/pipeline/imdb_model_ensemble/[config.yaml](../python/examples/pipeline/imdb_model_ensemble/config.yml)）
 

java/README_CN.md

@@ -100,7 +100,7 @@ java -cp paddle-serving-sdk-java-examples-0.0.1-jar-with-dependencies.jar Pipeli
 
 1.在示例中，端口号都是9393，ip默认设置为了127.0.0.1表示本机，注意ip和port需要与Server端对应。
 
-2.目前Serving已推出Pipeline模式（原理详见[Pipeline Serving](../doc/PIPELINE_SERVING_CN.md)），面向Java的Pipeline Serving Client已发布。
+2.目前Serving已推出Pipeline模式（原理详见[Pipeline Serving](../doc/Python_Pipeline/Pipeline_Design_CN.md)），面向Java的Pipeline Serving Client已发布。
 
 3.注意PipelineClientExample.java中的ip和port（位于java/examples/src/main/java/[PipelineClientExample.java](./examples/src/main/java/PipelineClientExample.java)），需要与对应Pipeline server的config.yaml文件中配置的ip和port相对应。（以IMDB model ensemble模型为例，位于python/examples/pipeline/imdb_model_ensemble/[config.yaml](../python/examples/pipeline/imdb_model_ensemble/config.yml)）
 

python/examples/ocr/README.md

@@ -101,7 +101,7 @@ python3 rec_web_client.py
 
 ## C++ OCR Service
 
-**Notice：** If you need to concatenate det model and rec model, and do pre-processing and post-processing in Paddle Serving C++ framework, you need to use the C++ server compiled with WITH_OPENCV option，see the [COMPILE.md](../../../doc/COMPILE.md)
+**Notice：** If you need to concatenate det model and rec model, and do pre-processing and post-processing in Paddle Serving C++ framework, you need to use the C++ server compiled with WITH_OPENCV option，see the [COMPILE.md](../../../doc/Compile_EN.md)
 
 ### Start Service
 Select a startup mode according to CPU / GPU device

python/examples/ocr/README_CN.md

@@ -100,7 +100,7 @@ python3 rec_web_client.py
 ```
 ## C++ OCR Service服务
 
-**注意：** 若您需要使用Paddle Serving C++框架串联det模型和rec模型，并进行前后处理，您需要使用开启WITH_OPENCV选项编译的C++ Server，详见[COMPILE.md](../../../doc/COMPILE.md)
+**注意：** 若您需要使用Paddle Serving C++框架串联det模型和rec模型，并进行前后处理，您需要使用开启WITH_OPENCV选项编译的C++ Server，详见[COMPILE.md](../../../doc/Compile_CN.md)
 
 ### 启动服务
 根据CPU/GPU设备选择一种启动方式