Merge branch 'develop' into update-compile-doc

README.md

@@ -172,6 +172,11 @@ Here, `client.predict` function has two arguments. `feed` is a `python dict` wit
 - [An End-to-end tutorial from training to inference service deployment](doc/TRAIN_TO_SERVICE.md)
 - [Write Bert-as-Service in 10 minutes](doc/BERT_10_MINS.md)
 
+### Tutorial at AIStudio
+- [Introduction to PaddleServing](https://aistudio.baidu.com/aistudio/projectdetail/605819)
+- [Image Segmentation on Paddle Serving](https://aistudio.baidu.com/aistudio/projectdetail/457715)
+- [Sentimental Analysis](https://aistudio.baidu.com/aistudio/projectdetail/509014)
+
 ### Developers
 - [How to config Serving native operators on server side?](doc/SERVER_DAG.md)
 - [How to develop a new Serving operator?](doc/NEW_OPERATOR.md)

README_CN.md

@@ -169,6 +169,11 @@ print(fetch_map)
 - [端到端完成从训练到部署全流程](doc/TRAIN_TO_SERVICE_CN.md)
 - [十分钟构建Bert-As-Service](doc/BERT_10_MINS_CN.md)
 
+### AIStudio教程
+- [PaddleServing作业](https://aistudio.baidu.com/aistudio/projectdetail/605819)
+- [PaddleServing图像分割](https://aistudio.baidu.com/aistudio/projectdetail/457715)
+- [PaddleServing情感分析](https://aistudio.baidu.com/aistudio/projectdetail/509014)
+
 ### 开发者教程
 - [如何配置Server端的计算图?](doc/SERVER_DAG_CN.md)
 - [如何开发一个新的General Op?](doc/NEW_OPERATOR_CN.md)

doc/INFERENCE_TO_SERVING.md

@@ -2,6 +2,20 @@
 
 ([简体中文](./INFERENCE_TO_SERVING_CN.md)|English)
 
+We should know something before converting to serving model
+
+**inference_model_dir**：the directory of Paddle inference model
+
+**serving_client_dir**: the directory of server side configuration
+
+**serving_client_dir**: the directory of client side configuration
+
+**model_filename**: this is model description file whose default value is `__model__`, if it's not default name, set `model_filename` explicitly
+
+**params_filename**: during `save_inference_model` every Variable will be save as a single file. If we have the inference model whose params are compressed into one file, please set `params_filename` explicitly
+
+
+
 ## Example
 
 ``` python
@@ -12,3 +26,11 @@ serving_server_dir = "serving_server_dir"
 feed_var_names, fetch_var_names = inference_model_to_serving(
 		inference_model_dir, serving_client_dir, serving_server_dir)
 ```
+
+if your model file and params file are both standalone, please use the following api.
+
+```
+feed_var_names, fetch_var_names = inference_model_to_serving(
+		inference_model_dir, serving_client_dir, serving_server_dir,
+		model_filename="model", params_filename="params")
+```

doc/INFERENCE_TO_SERVING_CN.md

@@ -4,6 +4,19 @@
 
 ## 示例
 
+在下列代码中，我们需要知道以下信息。
+
+**模型文件夹**：这个文件夹就是Paddle的inference_model所在的文件夹
+
+**serving_client_dir**: 这个文件夹是inference_model转换成Serving模型后，服务端配置的保存路径
+
+**serving_client_dir**: 这个文件夹是inference_model转换成Serving模型后，客户端配置的保存路径
+
+**模型描述文件**: 模型描述文件也就是`model_filename`默认值为`__model__`,是一个pb2文本文件，如果是别的文件名需要显式指定
+
+**模型参数文件**: 在`save_inference_model`阶段，默认方式是每一个Variable保存一个二进制文件，如果是这种情况就不需要做指定。如果所有参数用压缩成一个文件的形式保存，则需要显式指定`params_filename`
+
+
 ``` python
 from paddle_serving_client.io import inference_model_to_serving
 inference_model_dir = "your_inference_model"
@@ -12,3 +25,9 @@ serving_server_dir = "serving_server_dir"
 feed_var_names, fetch_var_names = inference_model_to_serving(
 		inference_model_dir, serving_client_dir, serving_server_dir)
 ```
+如果模型中有模型描述文件`model_filename` 和 模型参数文件`params_filename`，那么请用
+```
+feed_var_names, fetch_var_names = inference_model_to_serving(
+		inference_model_dir, serving_client_dir, serving_server_dir,
+		 model_filename="model", params_filename="params")
+```

python/examples/blazeface/README.md

@@ -3,7 +3,7 @@
 ## Get Model
 ```
 python -m paddle_serving_app.package --get_model blazeface
-tar -xzvf blazeface.tar.gz
+tar -xf blazeface.tar.gz
 ```
 
 ## RPC Service