未验证 提交 b7815182 编写于 作者: X xiaoting 提交者: GitHub

Merge pull request #2871 from HexToString/dygraph

update doc and  make gpu_id =0 by default in Dygraph  Branch
...@@ -37,11 +37,11 @@ PaddleOCR operating environment and Paddle Serving operating environment are nee ...@@ -37,11 +37,11 @@ PaddleOCR operating environment and Paddle Serving operating environment are nee
Install serving which used to start the service Install serving which used to start the service
``` ```
pip3 install paddle-serving-server==0.6.0 # for CPU pip3 install paddle-serving-server==0.6.1 # for CPU
pip3 install paddle-serving-server-gpu==0.6.0 # for GPU pip3 install paddle-serving-server-gpu==0.6.1 # for GPU
# Other GPU environments need to confirm the environment and then choose to execute the following commands # Other GPU environments need to confirm the environment and then choose to execute the following commands
pip3 install paddle-serving-server-gpu==0.6.0.post101 # GPU with CUDA10.1 + TensorRT6 pip3 install paddle-serving-server-gpu==0.6.1.post101 # GPU with CUDA10.1 + TensorRT6
pip3 install paddle-serving-server-gpu==0.6.0.post11 # GPU with CUDA11 + TensorRT7 pip3 install paddle-serving-server-gpu==0.6.1.post11 # GPU with CUDA11 + TensorRT7
``` ```
3. Install the client to send requests to the service 3. Install the client to send requests to the service
...@@ -55,7 +55,7 @@ PaddleOCR operating environment and Paddle Serving operating environment are nee ...@@ -55,7 +55,7 @@ PaddleOCR operating environment and Paddle Serving operating environment are nee
4. Install serving-app 4. Install serving-app
``` ```
pip3 install paddle-serving-app==0.6.0 pip3 install paddle-serving-app==0.6.1
``` ```
**note:** If you want to install the latest version of PaddleServing, refer to [link](https://github.com/PaddlePaddle/Serving/blob/develop/doc/LATEST_PACKAGES.md). **note:** If you want to install the latest version of PaddleServing, refer to [link](https://github.com/PaddlePaddle/Serving/blob/develop/doc/LATEST_PACKAGES.md).
...@@ -204,7 +204,9 @@ Windows does not support Pipeline Serving, if we want to lauch paddle serving on ...@@ -204,7 +204,9 @@ Windows does not support Pipeline Serving, if we want to lauch paddle serving on
``` ```
cd win cd win
python3 ocr_web_server.py python3 ocr_web_server.py gpu(for gpu user)
or
python3 ocr_web_server.py cpu(for cpu user)
``` ```
2. Client Send Requests 2. Client Send Requests
......
...@@ -36,11 +36,11 @@ PaddleOCR提供2种服务部署方式: ...@@ -36,11 +36,11 @@ PaddleOCR提供2种服务部署方式:
1. 安装serving,用于启动服务 1. 安装serving,用于启动服务
``` ```
pip3 install paddle-serving-server==0.6.0 # for CPU pip3 install paddle-serving-server==0.6.1 # for CPU
pip3 install paddle-serving-server-gpu==0.6.0 # for GPU pip3 install paddle-serving-server-gpu==0.6.1 # for GPU
# 其他GPU环境需要确认环境再选择执行如下命令 # 其他GPU环境需要确认环境再选择执行如下命令
pip3 install paddle-serving-server-gpu==0.6.0.post101 # GPU with CUDA10.1 + TensorRT6 pip3 install paddle-serving-server-gpu==0.6.1.post101 # GPU with CUDA10.1 + TensorRT6
pip3 install paddle-serving-server-gpu==0.6.0.post11 # GPU with CUDA11 + TensorRT7 pip3 install paddle-serving-server-gpu==0.6.1.post11 # GPU with CUDA11 + TensorRT7
``` ```
2. 安装client,用于向服务发送请求 2. 安装client,用于向服务发送请求
...@@ -53,7 +53,7 @@ PaddleOCR提供2种服务部署方式: ...@@ -53,7 +53,7 @@ PaddleOCR提供2种服务部署方式:
3. 安装serving-app 3. 安装serving-app
``` ```
pip3 install paddle-serving-app==0.6.0 pip3 install paddle-serving-app==0.6.1
``` ```
**Note:** 如果要安装最新版本的PaddleServing参考[链接](https://github.com/PaddlePaddle/Serving/blob/develop/doc/LATEST_PACKAGES.md)。 **Note:** 如果要安装最新版本的PaddleServing参考[链接](https://github.com/PaddlePaddle/Serving/blob/develop/doc/LATEST_PACKAGES.md)。
...@@ -200,7 +200,9 @@ Windows用户不能使用上述的启动方式,需要使用Web Service,详 ...@@ -200,7 +200,9 @@ Windows用户不能使用上述的启动方式,需要使用Web Service,详
``` ```
cd win cd win
python3 ocr_web_server.py python3 ocr_web_server.py gpu(使用gpu方式)
或者
python3 ocr_web_server.py cpu(使用cpu方式)
``` ```
2. 发送服务请求 2. 发送服务请求
......
...@@ -42,7 +42,7 @@ class OCRService(WebService): ...@@ -42,7 +42,7 @@ class OCRService(WebService):
self.det_client = LocalPredictor() self.det_client = LocalPredictor()
if sys.argv[1] == 'gpu': if sys.argv[1] == 'gpu':
self.det_client.load_model_config( self.det_client.load_model_config(
det_model_config, use_gpu=True, gpu_id=1) det_model_config, use_gpu=True, gpu_id=0)
elif sys.argv[1] == 'cpu': elif sys.argv[1] == 'cpu':
self.det_client.load_model_config(det_model_config) self.det_client.load_model_config(det_model_config)
self.ocr_reader = OCRReader( self.ocr_reader = OCRReader(
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册