From 88e5bcad4999f1022cb4e527ab95a751b5327e58 Mon Sep 17 00:00:00 2001 From: TeslaZhao Date: Fri, 25 Feb 2022 19:48:31 +0800 Subject: [PATCH] Update Doc --- doc/Compile_CN.md | 14 ++++++-------- doc/Compile_EN.md | 17 ++++++++++++----- doc/Install_CN.md | 16 ++++++++-------- doc/Install_EN.md | 16 ++++++++-------- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/doc/Compile_CN.md b/doc/Compile_CN.md index a72f3365..8eb314df 100644 --- a/doc/Compile_CN.md +++ b/doc/Compile_CN.md @@ -40,8 +40,6 @@ 我们提供了五个环境的开发镜像，分别是CPU， CUDA10.1+CUDNN7， CUDA10.2+CUDNN7，CUDA10.2+CUDNN8， CUDA11.2+CUDNN8。我们提供了Serving开发镜像涵盖以上环境。与此同时，我们也支持Paddle开发镜像。 -其中Serving镜像名是 **paddlepaddle/serving:${Serving开发镜像Tag}**(如果网络不佳可以访问**registry.baidubce.com/paddlepaddle/serving:${Serving开发镜像Tag}**)， Paddle开发镜像名是 **paddlepaddle/paddle:${Paddle开发镜像Tag}**。为了防止用户对两套镜像出现混淆，我们分别解释一下两套镜像的由来。 - Serving开发镜像是Serving套件为了支持各个预测环境提供的用于编译、调试预测服务的镜像，Paddle开发镜像是Paddle在官网发布的用于编译、开发、训练模型使用镜像。为了让Paddle开发者能够在同一个容器内直接使用Serving。对于上个版本就已经使用Serving用户的开发者来说，Serving开发镜像应该不会感到陌生。但对于熟悉Paddle训练框架生态的开发者，目前应该更熟悉已有的Paddle开发镜像。为了适应所有用户的不同习惯，我们对这两套镜像都做了充分的支持。 @@ -56,24 +54,24 @@ Serving开发镜像是Serving套件为了支持各个预测环境提供的用于 我们首先要针对自己所需的环境拉取相关镜像。上表**环境**一列下，除了CPU，其余（Cuda**+Cudnn**）都属于GPU环境。 您可以使用Serving开发镜像。 ``` -docker pull paddlepaddle/serving:${Serving开发镜像Tag} +docker pull registry.baidubce.com/paddlepaddle/serving:${Serving开发镜像Tag} # 如果是GPU镜像 -nvidia-docker run --rm -it paddlepaddle/serving:${Serving开发镜像Tag} bash +nvidia-docker run --rm -it registry.baidubce.com/paddlepaddle/serving:${Serving开发镜像Tag} bash # 如果是CPU镜像 -docker run --rm -it paddlepaddle/serving:${Serving开发镜像Tag} bash +docker run --rm -it registry.baidubce.com/paddlepaddle/serving:${Serving开发镜像Tag} bash ``` 也可以使用Paddle开发镜像。 ``` -docker pull paddlepaddle/paddle:${Paddle开发镜像Tag} +docker pull registry.baidubce.com/paddlepaddle/paddle:${Paddle开发镜像Tag} # 如果是GPU镜像，需要使用nvidia-docker -nvidia-docker run --rm -it paddlepaddle/paddle:${Paddle开发镜像Tag} bash +nvidia-docker run --rm -it registry.baidubce.com/paddlepaddle/paddle:${Paddle开发镜像Tag} bash # 如果是CPU镜像 -docker run --rm -it paddlepaddle/paddle:${Paddle开发镜像Tag} bash +docker run --rm -it registry.baidubce.com/paddlepaddle/paddle:${Paddle开发镜像Tag} bash ``` diff --git a/doc/Compile_EN.md b/doc/Compile_EN.md index 64ca2423..47c62a82 100644 --- a/doc/Compile_EN.md +++ b/doc/Compile_EN.md @@ -39,8 +39,6 @@ Docker compilation is recommended. We have prepared the Paddle Serving compilati We provide five environment development images, namely CPU, CUDA10.1 + CUDNN7, CUDA10.2 + CUDNN7, CUDA10.2 + CUDNN8, CUDA11.2 + CUDNN8. We provide a Serving development image to cover the above environment. At the same time, we also support Paddle development mirroring. -The Serving image name is **paddlepaddle/serving:${Serving development image Tag}** (If the network is not good, you can visit **registry.baidubce.com/paddlepaddle/serving:${Serving development image Tag}**), The name of the Paddle development image is **paddlepaddle/paddle:${Paddle Development Image Tag}**. In order to prevent users from confusing the two sets of mirroring, we explain the origin of the two sets of mirroring separately. - Serving development mirror is the mirror used to compile and debug prediction services provided by Serving suite in order to support various prediction environments. Paddle development mirror is the mirror used for compilation, development, and training models released by Paddle on the official website. In order to allow Paddle developers to use Serving directly in the same container. For developers who have already used Serving users in the previous version, Serving development image should not be unfamiliar. But for developers who are familiar with the Paddle training framework ecology, they should be more familiar with the existing Paddle development mirrors. In order to adapt to the different habits of all users, we have fully supported both sets of mirrors. | Environment | Serving Dev Image Tag | OS | Paddle Dev Image Tag | OS | @@ -55,16 +53,25 @@ We first need to pull related images for the environment we need. Under the **En You can use Serving Dev Images. ``` -docker pull paddlepaddle/serving:${Serving Dev Image Tag} +docker pull registry.baidubce.com/paddlepaddle/serving:${Serving Dev Image Tag} # For GPU Image -nvidia-docker run --rm -it paddlepaddle/serving:${Serving Dev Image Tag} bash +nvidia-docker run --rm -it registry.baidubce.com/paddlepaddle/serving:${Serving Dev Image Tag} bash # For CPU Image -docker run --rm -it paddlepaddle/serving:${Serving Dev Image Tag} bash +docker run --rm -it registry.baidubce.com/paddlepaddle/serving:${Serving Dev Image Tag} bash ``` You can also use Paddle Dev Images. +``` +docker pull registry.baidubce.com/paddlepaddle/paddle:${Paddle Dev Image Tag} + +# For GPU Image +nvidia-docker run --rm -it registry.baidubce.com/paddlepaddle/paddle:${Paddle Dev Image Tag} bash + +# For CPU Image +docker run --rm -it registry.baidubce.com/paddlepaddle/paddle:${Paddle Dev Image Tag} bash +``` ## Download the Serving Code Repo **Note: If you are using Paddle to develop the image, you need to manually run `bash env_install.sh` after downloading the code base (as shown in the third line of the code box)** diff --git a/doc/Install_CN.md b/doc/Install_CN.md index 1c49a725..da1201b6 100644 --- a/doc/Install_CN.md +++ b/doc/Install_CN.md @@ -15,16 +15,16 @@ **CPU：** ``` # 启动 CPU Docker -docker pull paddlepaddle/serving:0.8.0-devel -docker run -p 9292:9292 --name test -dit paddlepaddle/serving:0.8.0-devel bash +docker pull registry.baidubce.com/paddlepaddle/serving:0.8.0-devel +docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/serving:0.8.0-devel bash docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving ``` **GPU：** ``` # 启动 GPU Docker -docker pull paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel -nvidia-docker run -p 9292:9292 --name test -dit paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel bash +docker pull registry.baidubce.com/paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel +nvidia-docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel bash nvidia-docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving ``` @@ -32,8 +32,8 @@ git clone https://github.com/PaddlePaddle/Serving **CPU：** ``` # 启动 CPU Docker -docker pull paddlepaddle/paddle:2.2.2 -docker run -p 9292:9292 --name test -dit paddlepaddle/paddle:2.2.2 bash +docker pull registry.baidubce.com/paddlepaddle/paddle:2.2.2 +docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/paddle:2.2.2 bash docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving @@ -43,8 +43,8 @@ bash Serving/tools/paddle_env_install.sh **GPU：** ``` # 启动 GPU Docker -docker pull paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 -nvidia-docker run -p 9292:9292 --name test -dit paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 bash +nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 +nvidia-docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 bash nvidia-docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving diff --git a/doc/Install_EN.md b/doc/Install_EN.md index d757e1d2..07d963ae 100644 --- a/doc/Install_EN.md +++ b/doc/Install_EN.md @@ -15,16 +15,16 @@ **CPU:** ``` # Start CPU Docker Container -docker pull paddlepaddle/serving:0.8.0-devel -docker run -p 9292:9292 --name test -dit paddlepaddle/serving:0.8.0-devel bash +docker pull registry.baidubce.com/paddlepaddle/serving:0.8.0-devel +docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/serving:0.8.0-devel bash docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving ``` **GPU:** ``` # Start GPU Docker Container -docker pull paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel -nvidia-docker run -p 9292:9292 --name test -dit paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel bash +docker pull registry.baidubce.com/paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel +nvidia-docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/serving:0.8.0-cuda10.2-cudnn7-devel bash nvidia-docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving ``` @@ -32,8 +32,8 @@ git clone https://github.com/PaddlePaddle/Serving **CPU:** ``` # Start CPU Docker Container -docker pull paddlepaddle/paddle:2.2.2 -docker run -p 9292:9292 --name test -dit paddlepaddle/paddle:2.2.2 bash +docker pull registry.baidubce.com/paddlepaddle/paddle:2.2.2 +docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/paddle:2.2.2 bash docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving @@ -43,8 +43,8 @@ bash Serving/tools/paddle_env_install.sh **GPU:** ``` # Start GPU Docker -docker pull paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 -nvidia-docker run -p 9292:9292 --name test -dit paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 bash +nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 +nvidia-docker run -p 9292:9292 --name test -dit registry.baidubce.com/paddlepaddle/paddle:2.2.2-gpu-cuda10.2-cudnn7 bash nvidia-docker exec -it test bash git clone https://github.com/PaddlePaddle/Serving -- GitLab