Skip to content

Commit 3423532

Browse files
committed
Merge pull request #1069 from wangjiawei04/develop
fix docker readme
1 parent a614c07 commit 3423532

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

doc/DOCKER_IMAGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,5 @@ Running Images:
9797
| | <=0.4.0 | Nan | Nan | Nan |
9898
| Cuda11.0 | 0.5.0 | 0.5.0-cuda11.0-cudnn8 | Ubuntu 18 | 8.2.0 |
9999
| | <=0.4.0 | Nan | Nan | Nan |
100+
101+
**Tips:** If you want to use CPU server and GPU server (version>=0.5.0) at the same time, you should check the gcc version, only Cuda10.1/10.2/11 can run with CPU server owing to the same gcc version(8.2).

doc/DOCKER_IMAGES_CN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,4 @@ registry.baidubce.com/paddlepaddle/serving:xpu-beta
102102
| Cuda11.0 | 0.5.0 | 0.5.0-cuda11.0-cudnn8 | Ubuntu 18 | 8.2.0 |
103103
| | <=0.4.0 | Nan | Nan | Nan |
104104

105+
**注意事项:** 如果您在0.5.0及以上版本需要在一个容器当中同时运行CPU server和GPU server,需要选择Cuda10.1/10.2/11的镜像,因为他们和CPU环境有着相同版本的gcc。

doc/LATEST_PACKAGES.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,44 @@
33
## CPU server
44
### Python 3
55
```
6+
# Compile by gcc8.2
67
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.0.0-py3-none-any.whl
78
```
89

910
### Python 2
1011
```
12+
# Compile by gcc8.2
1113
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.0.0-py2-none-any.whl
1214
```
1315

1416
## GPU server
1517
### Python 3
1618
```
17-
#cuda 9.0
19+
#cuda 9.0, Compile by gcc4.8
1820
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post9-py3-none-any.whl
19-
#cuda 10.0
21+
#cuda 10.0, Compile by gcc4.8
2022
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-py3-none-any.whl
21-
#cuda10.1 with TensorRT 6
23+
#cuda10.1 with TensorRT 6, Compile by gcc8.2
2224
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py3-none-any.whl
23-
#cuda10.2 with TensorRT 7
25+
#cuda10.2 with TensorRT 7, Compile by gcc8.2
2426
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py3-none-any.whl
25-
#cuda11.0 with TensorRT 7 (beta)
27+
#cuda11.0 with TensorRT 7 (beta), Compile by gcc8.2
2628
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post11-py3-none-any.whl
2729
```
2830
### Python 2
2931
```
30-
#cuda 9.0
32+
#cuda 9.0, Compile by gcc4.8
3133
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post9-py2-none-any.whl
32-
#cuda 10.0
34+
#cuda 10.0, Compile by gcc4.8
3335
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post10-py2-none-any.whl
34-
#cuda10.1 with TensorRT 6
36+
#cuda10.1 with TensorRT 6, Compile by gcc8.2
3537
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post101-py2-none-any.whl
36-
#cuda10.2 with TensorRT 7
38+
#cuda10.2 with TensorRT 7, Compile by gcc8.2
3739
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post102-py2-none-any.whl
38-
#cuda11.0 with TensorRT 7 (beta)
40+
#cuda11.0 with TensorRT 7 (beta), Compile by gcc8.2
3941
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.0.0.post11-py2-none-any.whl
4042
```
43+
**Tips:** If you want to use CPU server and GPU server at the same time, you should check the gcc version, only Cuda10.1/10.2/11 can run with CPU server owing to the same gcc version(8.2).
4144

4245
## Client
4346

doc/RUN_IN_DOCKER.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,5 @@ If you need to change the version, please refer to the instructions on the homep
7373

7474
## Precautious
7575

76-
Runtime images cannot be used for compilation. If you want to compile from source, refer to [COMPILE](COMPILE.md).
76+
- Runtime images cannot be used for compilation. If you want to compile from source, refer to [COMPILE](COMPILE.md).
77+
- If you use Cuda9 and Cuda10 docker images, you cannot use `paddle_serving_server` CPU version at the same time, due to the limitation of gcc version. If you want to use both in one docker image, please choose images of Cuda10.1, Cuda10.2 and Cuda11.

doc/RUN_IN_DOCKER_CN.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,5 @@ docker exec -it test bash
6565

6666
## 注意事项
6767

68-
运行时镜像不能用于开发编译。如果想要从源码编译,请查看[如何编译PaddleServing](COMPILE.md)
68+
- 运行时镜像不能用于开发编译。如果想要从源码编译,请查看[如何编译PaddleServing](COMPILE.md)
69+
- 由于Cuda10和Cuda9的环境受限于GCC版本,无法同时运行CPU版本的`paddle_serving_server`,因此如果想要在GPU环境中同时使用CPU版本的`paddle_serving_server`,请选择Cuda10.1,Cuda10.2和Cuda11版本的镜像。

0 commit comments

Comments
 (0)