Skip to content

2.5 install docs and add cuda12.0 to pip-linux #5974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
2.5.0rc1 -> 2.5.0
  • Loading branch information
zhengqiwen1997 committed Jun 27, 2023
commit 250732fcccb3706e8112dfebdefa26d74e9628ce
10 changes: 5 additions & 5 deletions docs/install/conda/linux-conda.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ python3 -c "import platform;print(platform.architecture()[0]);print(platform.mac
如果您的计算机没有 NVIDIA® GPU,请安装 CPU 版的 PaddlePaddle

```
conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle==2.5.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```


Expand All @@ -100,26 +100,26 @@ conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu
* 对于 `CUDA 10.2`,需要搭配 cuDNN 7.6.5(多卡环境下 NCCL>=2.7),安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```


* 对于 `CUDA 11.2`,需要搭配 cuDNN 8.2.1(多卡环境下 NCCL>=2.7),安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* 对于 `CUDA 11.6`,需要搭配 cuDNN 8.4.0(多卡环境下 NCCL>=2.7),安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* 对于 `CUDA 11.7`,需要搭配 cuDNN 8.4.1(多卡环境下 NCCL>=2.7),安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

您可参考 NVIDIA 官方文档了解 CUDA 和 CUDNN 的安装流程和配置方法,请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)
Expand Down
8 changes: 4 additions & 4 deletions docs/install/conda/linux-conda_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ You can choose the following version of PaddlePaddle to start installation:
If your computer doesn't have NVIDIA® GPU, please install `the CPU Version of PaddlePaddle`

```
conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle==2.5.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```


Expand All @@ -111,19 +111,19 @@ conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu
* If you are using CUDA 11.2,cuDNN 8.2.1(for multi card support, NCCL>=2.7):

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* If you are using CUDA 11.6,cuDNN 8.4.0(for multi card support, NCCL>=2.7):

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* If you are using CUDA 11.7,cuDNN 8.4.1(for multi card support, NCCL>=2.7):

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

You can refer to NVIDIA official documents for installation process and configuration method of CUDA and cudnn. Please refer to [CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)
Expand Down
2 changes: 1 addition & 1 deletion docs/install/conda/macos-conda.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ python3 -c "import platform;print(platform.architecture()[0]);print(platform.mac
* 目前在 MacOS 环境仅支持 CPU 版 PaddlePaddle,请参考如下命令安装 Paddle:

```
conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle==2.5.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```

## **三、验证安装**
Expand Down
2 changes: 1 addition & 1 deletion docs/install/conda/macos-conda_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ conda config --set show_channel_urls yes
* Currently, only the CPU version of PaddlePaddle is supported in the MacOS environment. Please use the following command to install PaddlePaddle:

```
conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle==2.5.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```


Expand Down
10 changes: 5 additions & 5 deletions docs/install/conda/windows-conda.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ python -c "import platform;print(platform.architecture()[0]);print(platform.mach
如果您的计算机没有 NVIDIA® GPU,请安装 CPU 版的 PaddlePaddle

```
conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle==2.5.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```


Expand All @@ -102,25 +102,25 @@ conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu
* 对于 `CUDA 10.2`,需要搭配 cuDNN 7.6.5,安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```

* 对于 `CUDA 11.2`,需要搭配 cuDNN 8.2.1,安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* 对于 `CUDA 11.6`,需要搭配 cuDNN 8.4.0,安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* 对于 `CUDA 11.7`,需要搭配 cuDNN 8.4.1,安装命令为:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

您可参考 NVIDIA 官方文档了解 CUDA 和 CUDNN 的安装流程和配置方法,请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)
Expand Down
10 changes: 5 additions & 5 deletions docs/install/conda/windows-conda_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ You can choose the following version of PaddlePaddle to start installation:
If your computer doesn't have NVIDIA® GPU, please install `the CPU Version of PaddlePaddle`

```
conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle==2.5.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```


Expand All @@ -108,25 +108,25 @@ conda install paddlepaddle==2.5.0rc1 --channel https://mirrors.tuna.tsinghua.edu
* If you are usingCUDA 10.2,cuDNN 7.6.5:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
```

* If you are using CUDA 11.2,cuDNN 8.2.1:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* If you are using CUDA 11.6,cuDNN 8.4.0:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

* If you are using CUDA 11.7,cuDNN 8.4.1:

```
conda install paddlepaddle-gpu==2.5.0rc1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
conda install paddlepaddle-gpu==2.5.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
```

You can refer to NVIDIA official documents for installation process and configuration method of CUDA and cudnn. Please refer to [CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)
Expand Down
52 changes: 26 additions & 26 deletions docs/install/docker/linux-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,46 +21,46 @@

* CPU 版的 PaddlePaddle:
```
docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1
docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0
```

* CPU 版的 PaddlePaddle,且镜像中预装好了 jupyter:
```
docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-jupyter
docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0-jupyter
```

* GPU 版的 PaddlePaddle:
```
nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda10.2-cudnn7.6-trt7.0
nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda10.2-cudnn7.6-trt7.0
```
```
nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.2-cudnn8.2-trt8.0
nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda11.2-cudnn8.2-trt8.0
```
```
nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.7-cudnn8.4-trt8.4
nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda11.7-cudnn8.4-trt8.4
```

如果您的机器不在中国大陆地区,可以直接从 DockerHub 拉取镜像:

* CPU 版的 PaddlePaddle:
```
docker pull paddlepaddle/paddle:2.5.0rc1
docker pull paddlepaddle/paddle:2.5.0
```

* CPU 版的 PaddlePaddle,且镜像中预装好了 jupyter:
```
docker pull paddlepaddle/paddle:2.5.0rc1-jupyter
docker pull paddlepaddle/paddle:2.5.0-jupyter
```

* GPU 版的 PaddlePaddle:
```
nvidia-docker pull paddlepaddle/paddle:2.5.0rc1-gpu-cuda10.2-cudnn7.6-trt7.0
nvidia-docker pull paddlepaddle/paddle:2.5.0-gpu-cuda10.2-cudnn7.6-trt7.0
```
```
nvidia-docker pull paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.2-cudnn8.2-trt8.0
nvidia-docker pull paddlepaddle/paddle:2.5.0-gpu-cuda11.2-cudnn8.2-trt8.0
```
```
nvidia-docker pull paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.7-cudnn8.4-trt8.4
nvidia-docker pull paddlepaddle/paddle:2.5.0-gpu-cuda11.7-cudnn8.4-trt8.4
```

您还可以访问[DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/)获取更多镜像。
Expand All @@ -72,7 +72,7 @@


```
docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1 /bin/bash
docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.5.0 /bin/bash
```

- `--name paddle_docker`:设定 Docker 的名称,`paddle_docker` 是自己设置的名称;
Expand All @@ -83,7 +83,7 @@

- `-v $PWD:/paddle`:指定将当前路径(PWD 变量会展开为当前路径的绝对路径)挂载到容器内部的 /paddle 目录;

- `registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1`:指定需要使用的 image 名称,您可以通过`docker images`命令查看;/bin/bash 是在 Docker 中要执行的命令
- `registry.baidubce.com/paddlepaddle/paddle:2.5.0`:指定需要使用的 image 名称,您可以通过`docker images`命令查看;/bin/bash 是在 Docker 中要执行的命令


* 使用 CPU 版本的 PaddlePaddle,且镜像中预装好了 jupyter:
Expand All @@ -98,7 +98,7 @@
cd ./jupyter_docker
```
```
docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-jupyter
docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.5.0-jupyter
```

- `--rm`:关闭容器后删除容器;
Expand All @@ -109,13 +109,13 @@

- `-v $PWD:/home/paddle`:指定将当前路径(PWD 变量会展开为当前路径的绝对路径)挂载到容器内部的 /home/paddle 目录;

- `registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-jupyter`:指定需要使用的 image 名称,您可以通过`docker images`命令查看
- `registry.baidubce.com/paddlepaddle/paddle:2.5.0-jupyter`:指定需要使用的 image 名称,您可以通过`docker images`命令查看


* 使用 GPU 版本的 PaddlePaddle:

```
nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda10.2-cudnn7.6-trt7.0 /bin/bash
nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda10.2-cudnn7.6-trt7.0 /bin/bash
```

- `--name paddle_docker`:设定 Docker 的名称,`paddle_docker` 是自己设置的名称;
Expand All @@ -126,7 +126,7 @@

- `-v $PWD:/paddle`:指定将当前路径(PWD 变量会展开为当前路径的绝对路径)挂载到容器内部的 /paddle 目录;

- `registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda10.2-cudnn7.6-trt7.0`:指定需要使用的 image 名称,如果您希望使用 CUDA 11.2 或 CUDA 11.7 的镜像,也可以将其替换成`registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.2-cudnn8.2-trt8.0` 或 `registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.7-cudnn8.4-trt8.4`。您可以通过`docker images`命令查看镜像。/bin/bash 是在 Docker 中要执行的命令
- `registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda10.2-cudnn7.6-trt7.0`:指定需要使用的 image 名称,如果您希望使用 CUDA 11.2 或 CUDA 11.7 的镜像,也可以将其替换成`registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda11.2-cudnn8.2-trt8.0` 或 `registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda11.7-cudnn8.4-trt8.4`。您可以通过`docker images`命令查看镜像。/bin/bash 是在 Docker 中要执行的命令



Expand All @@ -145,24 +145,24 @@
</thead>
<tbody>
<tr>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1 </td>
<td> 安装了 2.5.0rc1 版本 paddle 的 CPU 镜像 </td>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0 </td>
<td> 安装了 2.5.0 版本 paddle 的 CPU 镜像 </td>
</tr>
<tr>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-jupyter </td>
<td> 安装了 2.5.0rc1 版本 paddle 的 CPU 镜像,且镜像中预装好了 jupyter,启动 docker 即运行 jupyter 服务 </td>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0-jupyter </td>
<td> 安装了 2.5.0 版本 paddle 的 CPU 镜像,且镜像中预装好了 jupyter,启动 docker 即运行 jupyter 服务 </td>
</tr>
<tr>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.7-cudnn8.4-trt8.4 </td>
<td> 安装了 2.5.0rc1 版本 paddle 的 GPU 镜像,cuda 版本为 11.7,cudnn 版本为 8.4,trt 版本为 8.4 </td>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda11.7-cudnn8.4-trt8.4 </td>
<td> 安装了 2.5.0 版本 paddle 的 GPU 镜像,cuda 版本为 11.7,cudnn 版本为 8.4,trt 版本为 8.4 </td>
</tr>
<tr>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda11.2-cudnn8.2-trt8.0 </td>
<td> 安装了 2.5.0rc1 版本 paddle 的 GPU 镜像,cuda 版本为 11.2,cudnn 版本为 8.2,trt 版本为 8.0 </td>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda11.2-cudnn8.2-trt8.0 </td>
<td> 安装了 2.5.0 版本 paddle 的 GPU 镜像,cuda 版本为 11.2,cudnn 版本为 8.2,trt 版本为 8.0 </td>
</tr>
<tr>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0rc1-gpu-cuda10.2-cudnn7.6-trt7.0 </td>
<td> 安装了 2.5.0rc1 版本 paddle 的 GPU 镜像,cuda 版本为 10.2,cudnn 版本为 7.6,trt 版本为 7.0 </td>
<td> registry.baidubce.com/paddlepaddle/paddle:2.5.0-gpu-cuda10.2-cudnn7.6-trt7.0 </td>
<td> 安装了 2.5.0 版本 paddle 的 GPU 镜像,cuda 版本为 10.2,cudnn 版本为 7.6,trt 版本为 7.0 </td>
</tr>
</tbody>
</table>
Expand Down
Loading