提交 2e68c982 编写于 作者: M MRXLT

fix conflict

上级 58e7dda4
...@@ -35,6 +35,18 @@ We consider deploying deep learning inference service online to be a user-facing ...@@ -35,6 +35,18 @@ We consider deploying deep learning inference service online to be a user-facing
<h2 align="center">Installation</h2> <h2 align="center">Installation</h2>
We highly recommend you to run Paddle Serving in Docker, please visit [Run in Docker](https://github.com/PaddlePaddle/Serving/blob/develop/doc/RUN_IN_DOCKER.md) We highly recommend you to run Paddle Serving in Docker, please visit [Run in Docker](https://github.com/PaddlePaddle/Serving/blob/develop/doc/RUN_IN_DOCKER.md)
```
# Run CPU Docker
docker pull hub.baidubce.com/paddlepaddle/serving:0.2.0
docker run -p 9292:9292 --name test -dit hub.baidubce.com/paddlepaddle/serving:0.2.0
docker exec -it test bash
```
```
# Run GPU Docker
nvidia-docker pull hub.baidubce.com/paddlepaddle/serving:0.2.0-gpu
nvidia-docker run -p 9292:9292 --name test -dit hub.baidubce.com/paddlepaddle/serving:0.2.0-gpu
nvidia-docker exec -it test bash
```
```shell ```shell
pip install paddle-serving-client pip install paddle-serving-client
...@@ -42,7 +54,10 @@ pip install paddle-serving-server # CPU ...@@ -42,7 +54,10 @@ pip install paddle-serving-server # CPU
pip install paddle-serving-server-gpu # GPU pip install paddle-serving-server-gpu # GPU
``` ```
You may need to use a domestic mirror source (in China, you can use the Tsinghua mirror source, add "-i https://pypi.tuna.tsinghua.edu.cn/simple" to pip command) to speed up the download. You may need to use a domestic mirror source (in China, you can use the Tsinghua mirror source, add "-i https://pypi.tuna.tsinghua.edu.cn/simple" to pip command) to speed up the download.
Client package support Centos 7 and Ubuntu 18, or you can use HTTP service without install client.
<h2 align="center">Quick Start Example</h2> <h2 align="center">Quick Start Example</h2>
### Boston House Price Prediction model ### Boston House Price Prediction model
......
...@@ -37,6 +37,18 @@ Paddle Serving 旨在帮助深度学习开发者轻易部署在线预测服务 ...@@ -37,6 +37,18 @@ Paddle Serving 旨在帮助深度学习开发者轻易部署在线预测服务
强烈建议您在Docker内构建Paddle Serving,请查看[如何在Docker中运行PaddleServing](doc/RUN_IN_DOCKER_CN.md) 强烈建议您在Docker内构建Paddle Serving,请查看[如何在Docker中运行PaddleServing](doc/RUN_IN_DOCKER_CN.md)
```
# 启动 CPU Docker
docker pull hub.baidubce.com/paddlepaddle/serving:0.2.0
docker run -p 9292:9292 --name test -dit hub.baidubce.com/paddlepaddle/serving:0.2.0
docker exec -it test bash
```
```
# 启动 GPU Docker
nvidia-docker pull hub.baidubce.com/paddlepaddle/serving:0.2.0-gpu
nvidia-docker run -p 9292:9292 --name test -dit hub.baidubce.com/paddlepaddle/serving:0.2.0-gpu
nvidia-docker exec -it test bash
```
```shell ```shell
pip install paddle-serving-client pip install paddle-serving-client
pip install paddle-serving-server # CPU pip install paddle-serving-server # CPU
...@@ -45,6 +57,8 @@ pip install paddle-serving-server-gpu # GPU ...@@ -45,6 +57,8 @@ pip install paddle-serving-server-gpu # GPU
您可能需要使用国内镜像源(例如清华源, 在pip命令中添加"-i https://pypi.tuna.tsinghua.edu.cn/simple")来加速下载。 您可能需要使用国内镜像源(例如清华源, 在pip命令中添加"-i https://pypi.tuna.tsinghua.edu.cn/simple")来加速下载。
客户端安装包支持Centos 7和Ubuntu 18,或者您可以使用HTTP服务,这种情况下不需要安装客户端。
<h2 align="center">快速启动示例</h2> <h2 align="center">快速启动示例</h2>
<h3 align="center">波士顿房价预测</h3> <h3 align="center">波士顿房价预测</h3>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册