Merge pull request #992 from wangjiawei04/fit_a_line

Fit a line - Auto shape

doc/INFERENCE_TO_SERVING.md

@@ -2,35 +2,15 @@
 
 ([简体中文](./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
-from paddle_serving_client.io import inference_model_to_serving
-inference_model_dir = "your_inference_model"
-serving_client_dir = "serving_client_dir"
-serving_server_dir = "serving_server_dir"
-feed_var_names, fetch_var_names = inference_model_to_serving(
-		inference_model_dir, serving_server_dir, serving_client_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_server_dir, serving_client_dir,
-		model_filename="model", params_filename="params")
+you can use a build-in python module called `paddle_serving_client.convert` to convert it.
+```python
+python -m paddle_serving_client.convert --dirname ./your_inference_model_dir
 ```
+Arguments are the same as `inference_model_to_serving` API.
+| Argument | Type | Default | Description |
+|--------------|------|-----------|--------------------------------|
+| `dirname` | str | - | Path of saved model files. Program file and parameter files are saved in this directory. |
+| `serving_server` | str | `"serving_server"` | The path of model files and configuration files for server. |
+| `serving_client` | str | `"serving_client"` | The path of configuration files for client. |
+| `model_filename` | str | None | The name of file to load the inference program. If it is None, the default filename `__model__` will be used. |
+| `params_filename` | str | None | The name of file to load all parameters. It is only used for the case that all parameters were saved in a single binary file. If parameters were saved in separate files, set it as None. |

doc/INFERENCE_TO_SERVING_CN.md

@@ -2,32 +2,15 @@
 
 ([English](./INFERENCE_TO_SERVING.md)|简体中文)
 
-## 示例
-
-在下列代码中，我们需要知道以下信息。
-
-**模型文件夹**：这个文件夹就是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"
-serving_client_dir = "serving_client_dir"
-serving_server_dir = "serving_server_dir"
-feed_var_names, fetch_var_names = inference_model_to_serving(
-		inference_model_dir, serving_server_dir, serving_client_dir)
-```
-如果模型中有模型描述文件`model_filename` 和 模型参数文件`params_filename`，那么请用
-```
-feed_var_names, fetch_var_names = inference_model_to_serving(
-		inference_model_dir, serving_server_dir, serving_client_dir,
-		 model_filename="model", params_filename="params")
+你可以使用Paddle Serving提供的名为`paddle_serving_client.convert`的内置模块进行转换。
+```python
+python -m paddle_serving_client.convert --dirname ./your_inference_model_dir
 ```
+模块参数与`inference_model_to_serving`接口参数相同。
+| 参数 | 类型 | 默认值 | 描述 |
+|--------------|------|-----------|--------------------------------|
+| `dirname` | str | - | 需要转换的模型文件存储路径，Program结构文件和参数文件均保存在此目录。|
+| `serving_server` | str | `"serving_server"` | 转换后的模型文件和配置文件的存储路径。默认值为serving_server |
+| `serving_client` | str | `"serving_client"` | 转换后的客户端配置文件存储路径。默认值为serving_client |
+| `model_filename` | str | None | 存储需要转换的模型Inference Program结构的文件名称。如果设置为None，则使用 `__model__` 作为默认的文件名 |
+| `params_filename` | str | None | 存储需要转换的模型所有参数的文件名称。当且仅当所有模型参数被保存在一个单独的>二进制文件中，它才需要被指定。如果模型参数是存储在各自分离的文件中，设置它的值为None |

doc/LATEST_PACKAGES.md

@@ -29,9 +29,10 @@ https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post9-py2-none-any.whl
 #cuda 10.0
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-py2-none-any.whl
-##cuda10.1 with TensorRT 6
+#cuda10.1 with TensorRT 6
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py2-none-any.whl
 #cuda10.2 with TensorRT 7
+>>>>>>> fit_a_line
 https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py2-none-any.whl
 ```
 

python/examples/fit_a_line/README.md

@@ -34,7 +34,7 @@ python test_client.py uci_housing_client/serving_client_conf.prototxt
 
 Start a web service with default web service hosting modules:
 ``` shell
-python test_server.py
+python -m paddle_serving_server.serve --model uci_housing_model --thread 10 --port 9393 --name uci
 ```
 
 ### Client prediction

python/examples/fit_a_line/README_CN.md

@@ -41,7 +41,7 @@ python test_client.py uci_housing_client/serving_client_conf.prototxt
 通过下面的一行代码开启默认web服务：
 
 ``` shell
-python test_server.py
+python -m paddle_serving_server.serve --model uci_housing_model --thread 10 --port 9393 --name uci
 ```
 
 ### 客户端预测

python/paddle_serving_client/io/__init__.py

@@ -202,6 +202,7 @@ def inference_model_to_serving(dirname,
                                serving_client="serving_client",
                                model_filename=None,
                                params_filename=None):
+    paddle.enable_static()
     place = fluid.CPUPlace()
     exe = fluid.Executor(place)
     inference_program, feed_target_names, fetch_targets = \