From df1e8b5320b904ff0f83869acc3a7195de1e4ecb Mon Sep 17 00:00:00 2001 From: bjjwwang Date: Thu, 20 May 2021 10:41:15 +0000 Subject: [PATCH] support serving 0.6.0 --- deploy/pdserving/README.md | 14 ++++++-------- deploy/pdserving/README_CN.md | 14 ++++++-------- deploy/pdserving/web_service.py | 5 +---- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/deploy/pdserving/README.md b/deploy/pdserving/README.md index fc079ed6..3aae4781 100644 --- a/deploy/pdserving/README.md +++ b/deploy/pdserving/README.md @@ -37,13 +37,11 @@ PaddleOCR operating environment and Paddle Serving operating environment are nee Install serving which used to start the service ``` - pip3 install paddle-serving-server==0.5.0 # for CPU - pip3 install paddle-serving-server-gpu==0.5.0 # for GPU + pip3 install paddle-serving-server==0.6.0 # for CPU + pip3 install paddle-serving-server-gpu==0.6.0 # for GPU # Other GPU environments need to confirm the environment and then choose to execute the following commands - pip3 install paddle-serving-server-gpu==0.5.0.post9 # GPU with CUDA9.0 - pip3 install paddle-serving-server-gpu==0.5.0.post10 # GPU with CUDA10.0 - pip3 install paddle-serving-server-gpu==0.5.0.post101 # GPU with CUDA10.1 + TensorRT6 - pip3 install paddle-serving-server-gpu==0.5.0.post11 # GPU with CUDA10.1 + TensorRT7 + pip3 install paddle-serving-server-gpu==0.6.0.post101 # GPU with CUDA10.1 + TensorRT6 + pip3 install paddle-serving-server-gpu==0.6.0.post11 # GPU with CUDA11 + TensorRT7 ``` 3. Install the client to send requests to the service @@ -51,13 +49,13 @@ PaddleOCR operating environment and Paddle Serving operating environment are nee The python3.7 version is recommended here: ``` - wget https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.0.0-cp37-none-any.whl + wget https://paddle-serving.bj.bcebos.com/test-dev/whl/paddle_serving_client-0.0.0-cp37-none-any.whl pip3 install paddle_serving_client-0.0.0-cp37-none-any.whl ``` 4. Install serving-app ``` - pip3 install paddle-serving-app==0.3.1 + pip3 install paddle-serving-app==0.6.0 ``` **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). diff --git a/deploy/pdserving/README_CN.md b/deploy/pdserving/README_CN.md index 23776017..66165ab0 100644 --- a/deploy/pdserving/README_CN.md +++ b/deploy/pdserving/README_CN.md @@ -36,26 +36,24 @@ PaddleOCR提供2种服务部署方式： 1. 安装serving，用于启动服务 ``` - pip3 install paddle-serving-server==0.5.0 # for CPU - pip3 install paddle-serving-server-gpu==0.5.0 # for GPU + pip3 install paddle-serving-server==0.6.0 # for CPU + pip3 install paddle-serving-server-gpu==0.6.0 # for GPU # 其他GPU环境需要确认环境再选择执行如下命令 - pip3 install paddle-serving-server-gpu==0.5.0.post9 # GPU with CUDA9.0 - pip3 install paddle-serving-server-gpu==0.5.0.post10 # GPU with CUDA10.0 - pip3 install paddle-serving-server-gpu==0.5.0.post101 # GPU with CUDA10.1 + TensorRT6 - pip3 install paddle-serving-server-gpu==0.5.0.post11 # GPU with CUDA10.1 + TensorRT7 + pip3 install paddle-serving-server-gpu==0.6.0.post101 # GPU with CUDA10.1 + TensorRT6 + pip3 install paddle-serving-server-gpu==0.6.0.post11 # GPU with CUDA11 + TensorRT7 ``` 2. 安装client，用于向服务发送请求 在[下载链接](https://github.com/PaddlePaddle/Serving/blob/develop/doc/LATEST_PACKAGES.md)中找到对应python版本的client安装包，这里推荐python3.7版本： ``` - wget https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.0.0-cp37-none-any.whl + wget https://paddle-serving.bj.bcebos.com/test-dev/whl/paddle_serving_client-0.0.0-cp37-none-any.whl pip3 install paddle_serving_client-0.0.0-cp37-none-any.whl ``` 3. 安装serving-app ``` - pip3 install paddle-serving-app==0.3.1 + pip3 install paddle-serving-app==0.6.0 ``` **Note:** 如果要安装最新版本的PaddleServing参考[链接](https://github.com/PaddlePaddle/Serving/blob/develop/doc/LATEST_PACKAGES.md)。 diff --git a/deploy/pdserving/web_service.py b/deploy/pdserving/web_service.py index 3f77f035..21db1e14 100644 --- a/deploy/pdserving/web_service.py +++ b/deploy/pdserving/web_service.py @@ -11,10 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -try: - from paddle_serving_server_gpu.web_service import WebService, Op -except ImportError: - from paddle_serving_server.web_service import WebService, Op +from paddle_serving_server.web_service import WebService, Op import logging import numpy as np -- GitLab