未验证 提交 1f241acd 编写于 作者: J Jiawei Wang 提交者: GitHub

Merge branch 'develop' into compile_doc

...@@ -20,7 +20,7 @@ Paddle Serving提供了用户友好的多模型组合服务编程框架,Pipeli ...@@ -20,7 +20,7 @@ Paddle Serving提供了用户友好的多模型组合服务编程框架,Pipeli
Server端基于<b>RPC服务层</b><b>图执行引擎</b>构建,两者的关系如下图所示。 Server端基于<b>RPC服务层</b><b>图执行引擎</b>构建,两者的关系如下图所示。
<div align=center> <div align=center>
<img src='images/pipeline_serving-image1.png' height = "250" align="middle"/> <img src='../images/pipeline_serving-image1.png' height = "250" align="middle"/>
</div> </div>
</n> </n>
...@@ -65,7 +65,7 @@ Response中`err_no`和`err_msg`表达处理结果的正确性和错误信息,` ...@@ -65,7 +65,7 @@ Response中`err_no`和`err_msg`表达处理结果的正确性和错误信息,`
- 对于 OP 之间需要传输过大数据的情况,可以考虑 RAM DB 外存进行全局存储,通过在 Channel 中传递索引的 Key 来进行数据传输 - 对于 OP 之间需要传输过大数据的情况,可以考虑 RAM DB 外存进行全局存储,通过在 Channel 中传递索引的 Key 来进行数据传输
<div align=center> <div align=center>
<img src='images/pipeline_serving-image2.png' height = "300" align="middle"/> <img src='../images/pipeline_serving-image2.png' height = "300" align="middle"/>
</div> </div>
...@@ -84,7 +84,7 @@ Response中`err_no`和`err_msg`表达处理结果的正确性和错误信息,` ...@@ -84,7 +84,7 @@ Response中`err_no`和`err_msg`表达处理结果的正确性和错误信息,`
- 下图为图执行引擎中 Channel 的设计,采用 input buffer 和 output buffer 进行多 OP 输入或多 OP 输出的数据对齐,中间采用一个 Queue 进行缓冲 - 下图为图执行引擎中 Channel 的设计,采用 input buffer 和 output buffer 进行多 OP 输入或多 OP 输出的数据对齐,中间采用一个 Queue 进行缓冲
<div align=center> <div align=center>
<img src='images/pipeline_serving-image3.png' height = "500" align="middle"/> <img src='../images/pipeline_serving-image3.png' height = "500" align="middle"/>
</div> </div>
#### <b>1.2.3 预测类型的设计</b> #### <b>1.2.3 预测类型的设计</b>
...@@ -319,7 +319,7 @@ class ResponseOp(Op): ...@@ -319,7 +319,7 @@ class ResponseOp(Op):
所有Pipeline示例在[examples/Pipeline/](../../examples/Pipeline) 目录下,目前有7种类型模型示例: 所有Pipeline示例在[examples/Pipeline/](../../examples/Pipeline) 目录下,目前有7种类型模型示例:
- [PaddleClas](../../examples/Pipeline/PaddleClas) - [PaddleClas](../../examples/Pipeline/PaddleClas)
- [Detection](../../examples/Pipeline/PaddleDetection) - [Detection](../../examples/Pipeline/PaddleDetection)
- [bert](../../examples/Pipeline/bert) - [bert](../../examples/Pipeline/PaddleNLP/bert)
- [imagenet](../../examples/Pipeline/PaddleClas/imagenet) - [imagenet](../../examples/Pipeline/PaddleClas/imagenet)
- [imdb_model_ensemble](../../examples/Pipeline/imdb_model_ensemble) - [imdb_model_ensemble](../../examples/Pipeline/imdb_model_ensemble)
- [ocr](../../examples/Pipeline/PaddleOCR/ocr) - [ocr](../../examples/Pipeline/PaddleOCR/ocr)
...@@ -328,7 +328,7 @@ class ResponseOp(Op): ...@@ -328,7 +328,7 @@ class ResponseOp(Op):
以 imdb_model_ensemble 为例来展示如何使用 Pipeline Serving,相关代码在 `Serving/examples/Pipeline/imdb_model_ensemble` 文件夹下可以找到,例子中的 Server 端结构如下图所示: 以 imdb_model_ensemble 为例来展示如何使用 Pipeline Serving,相关代码在 `Serving/examples/Pipeline/imdb_model_ensemble` 文件夹下可以找到,例子中的 Server 端结构如下图所示:
<div align=center> <div align=center>
<img src='images/pipeline_serving-image4.png' height = "200" align="middle"/> <img src='../images/pipeline_serving-image4.png' height = "200" align="middle"/>
</div> </div>
### 3.1 Pipeline部署需要的文件 ### 3.1 Pipeline部署需要的文件
......
...@@ -18,7 +18,7 @@ Paddle Serving provides a user-friendly programming framework for multi-model co ...@@ -18,7 +18,7 @@ Paddle Serving provides a user-friendly programming framework for multi-model co
The Server side is built based on <b>RPC Service</b> and <b>graph execution engine</b>. The relationship between them is shown in the following figure. The Server side is built based on <b>RPC Service</b> and <b>graph execution engine</b>. The relationship between them is shown in the following figure.
<div align=center> <div align=center>
<img src='images/pipeline_serving-image1.png' height = "250" align="middle"/> <img src='../images/pipeline_serving-image1.png' height = "250" align="middle"/>
</div> </div>
### 1.1 RPC Service ### 1.1 RPC Service
...@@ -61,7 +61,7 @@ The graph execution engine consists of OPs and Channels, and the connected OPs s ...@@ -61,7 +61,7 @@ The graph execution engine consists of OPs and Channels, and the connected OPs s
- For cases where large data needs to be transferred between OPs, consider RAM DB external memory for global storage and data transfer by passing index keys in Channel. - For cases where large data needs to be transferred between OPs, consider RAM DB external memory for global storage and data transfer by passing index keys in Channel.
<div align=center> <div align=center>
<img src='images/pipeline_serving-image2.png' height = "300" align="middle"/> <img src='../images/pipeline_serving-image2.png' height = "300" align="middle"/>
</div> </div>
...@@ -80,7 +80,7 @@ The graph execution engine consists of OPs and Channels, and the connected OPs s ...@@ -80,7 +80,7 @@ The graph execution engine consists of OPs and Channels, and the connected OPs s
- The following illustration shows the design of Channel in the graph execution engine, using input buffer and output buffer to align data between multiple OP inputs and multiple OP outputs, with a queue in the middle to buffer. - The following illustration shows the design of Channel in the graph execution engine, using input buffer and output buffer to align data between multiple OP inputs and multiple OP outputs, with a queue in the middle to buffer.
<div align=center> <div align=center>
<img src='images/pipeline_serving-image3.png' height = "500" align="middle"/> <img src='../images/pipeline_serving-image3.png' height = "500" align="middle"/>
</div> </div>
...@@ -314,7 +314,7 @@ The default implementation of **pack_response_package** is to convert the dictio ...@@ -314,7 +314,7 @@ The default implementation of **pack_response_package** is to convert the dictio
All examples of pipelines are in [examples/pipeline/](../../examples/Pipeline) directory, There are 7 types of model examples currently: All examples of pipelines are in [examples/pipeline/](../../examples/Pipeline) directory, There are 7 types of model examples currently:
- [PaddleClas](../../examples/Pipeline/PaddleClas) - [PaddleClas](../../examples/Pipeline/PaddleClas)
- [Detection](../../examples/Pipeline/PaddleDetection) - [Detection](../../examples/Pipeline/PaddleDetection)
- [bert](../../examples/Pipeline/bert) - [bert](../../examples/Pipeline/PaddleNLP/bert)
- [imagenet](../../examples/Pipeline/PaddleClas/imagenet) - [imagenet](../../examples/Pipeline/PaddleClas/imagenet)
- [imdb_model_ensemble](../../examples/Pipeline/imdb_model_ensemble) - [imdb_model_ensemble](../../examples/Pipeline/imdb_model_ensemble)
- [ocr](../../examples/Pipeline/PaddleOCR/ocr) - [ocr](../../examples/Pipeline/PaddleOCR/ocr)
...@@ -323,7 +323,7 @@ All examples of pipelines are in [examples/pipeline/](../../examples/Pipeline) d ...@@ -323,7 +323,7 @@ All examples of pipelines are in [examples/pipeline/](../../examples/Pipeline) d
Here, we build a simple imdb model enable example to show how to use Pipeline Serving. The relevant code can be found in the `Serving/examples/Pipeline/imdb_model_ensemble` folder. The Server-side structure in the example is shown in the following figure: Here, we build a simple imdb model enable example to show how to use Pipeline Serving. The relevant code can be found in the `Serving/examples/Pipeline/imdb_model_ensemble` folder. The Server-side structure in the example is shown in the following figure:
<div align=center> <div align=center>
<img src='images/pipeline_serving-image4.png' height = "200" align="middle"/> <img src='../images/pipeline_serving-image4.png' height = "200" align="middle"/>
</div> </div>
### 3.1 Files required for pipeline deployment ### 3.1 Files required for pipeline deployment
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册