Skip to content

Commit bf33f8a

Browse files
authored
[install doc] update 2.4.0rc0 install doc (#5312)
* update Tables * change 2.3 to 2.4 * add cuda117 * add ubuntu22.04
1 parent 76498bc commit bf33f8a

27 files changed

+632
-556
lines changed

docs/install/Tables.md

Lines changed: 187 additions & 167 deletions
Large diffs are not rendered by default.

docs/install/Tables_en.md

Lines changed: 188 additions & 168 deletions
Large diffs are not rendered by default.

docs/install/compile/linux-compile.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
* **Linux 版本 (64 bit)**
66
* **CentOS 6 (不推荐,不提供编译出现问题时的官方支持)**
7-
* **CentOS 7 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6)**
7+
* **CentOS 7 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6/11.7)**
88
* **Ubuntu 14.04 (不推荐,不提供编译出现问题时的官方支持)**
9-
* **Ubuntu 16.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6)**
10-
* **Ubuntu 18.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6)**
9+
* **Ubuntu 16.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6/11.7)**
10+
* **Ubuntu 18.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6/11.7)**
1111
* **Python 版本 3.6/3.7/3.8/3.9/3.10 (64 bit)**
1212

1313
## 选择 CPU/GPU
@@ -20,6 +20,7 @@
2020
* **CUDA 工具包 11.1 配合 cuDNN v8.1.1(如需多卡支持,需配合 NCCL2.7 及更高)**
2121
* **CUDA 工具包 11.2 配合 cuDNN v8.1.1(如需多卡支持,需配合 NCCL2.7 及更高)**
2222
* **CUDA 工具包 11.6 配合 cuDNN v8.4.0(如需多卡支持,需配合 NCCL2.7 及更高)**
23+
* **CUDA 工具包 11.7 配合 cuDNN v8.4.1(如需多卡支持,需配合 NCCL2.7 及更高)**
2324
* **GPU 运算能力超过 3.5 的硬件设备**
2425

2526
您可参考 NVIDIA 官方文档了解 CUDA 和 CUDNN 的安装流程和配置方法,请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)
@@ -138,7 +139,7 @@ git checkout [分支名]
138139
例如:
139140
140141
```
141-
git checkout release/2.3
142+
git checkout release/2.4
142143
```
143144
144145
注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持
@@ -487,7 +488,7 @@ git checkout [分支名]
487488
例如:
488489
489490
```
490-
git checkout release/2.3
491+
git checkout release/2.4
491492
```
492493
493494
#### 10. 并且请创建并进入一个叫 build 的目录下:
@@ -512,7 +513,7 @@ mkdir build && cd build
512513
> 请注意 PY_VERSION 参数更换为您需要的 python 版本
513514
514515
515-
* 对于需要编译**GPU 版本 PaddlePaddle**的用户:(**仅支持 CentOS7(CUDA11.6/CUDA11.2/CUDA11.1/CUDA10.2/CUDA10.1)**)
516+
* 对于需要编译**GPU 版本 PaddlePaddle**的用户:(**仅支持 CentOS7(CUDA11.7/CUDA11.6/CUDA11.2/CUDA11.1/CUDA10.2/CUDA10.1)**)
516517
517518
1. 请确保您已经正确安装 nccl2,或者按照以下指令安装 nccl2(这里提供的是 CUDA10.2,cuDNN7 下 nccl2 的安装指令,更多版本的安装信息请参考 NVIDIA[官方网站](https://developer.nvidia.com/nccl)):
518519

docs/install/compile/linux-compile_en.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
* **Linux version (64 bit)**
66
* **CentOS 6 (not recommended, no official support for compilation problems)**
7-
* **CentOS 7 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6**
7+
* **CentOS 7 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6/11.7**
88
* **Ubuntu 14.04 (not recommended, no official support for compilation problems)**
9-
* **Ubuntu 16.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6)**
10-
* **Ubuntu 18.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6)**
9+
* **Ubuntu 16.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6/11.7)**
10+
* **Ubuntu 18.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6/11.7)**
1111
* **Python version 3.6/3.7/3.8/3.9/3.10 (64 bit)**
1212

1313
## Choose CPU/GPU
@@ -20,6 +20,7 @@
2020
* **CUDA toolkit 11.1 with cuDNN v8.1.1(for multi card support, NCCL2.7 or higher)**
2121
* **CUDA toolkit 11.2 with cuDNN v8.1.1(for multi card support, NCCL2.7 or higher)**
2222
* **CUDA toolkit 11.6 with cuDNN v8.4.0(for multi card support, NCCL2.7 or higher)**
23+
* **CUDA toolkit 11.7 with cuDNN v8.4.1(for multi card support, NCCL2.7 or higher)**
2324
* **Hardware devices with GPU computing power over 3.5**
2425

2526
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/)
@@ -144,7 +145,7 @@ git checkout [name of the branch]
144145
For example:
145146
146147
```
147-
git checkout release/2.3
148+
git checkout release/2.4
148149
```
149150
150151
Note: python3.6、python3.7 version started supporting from release/1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch, python3.10 version started supporting from release/2.3 branch
@@ -474,7 +475,7 @@ git checkout [name of target branch]
474475
For example:
475476
476477
```
477-
git checkout release/2.3
478+
git checkout release/2.4
478479
```
479480
480481
#### 10. And please create and enter a directory called build:

docs/install/compile/macos-compile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ git checkout [分支名]
9494
例如:
9595
9696
```
97-
git checkout release/2.3
97+
git checkout release/2.4
9898
```
9999
100100
注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持
@@ -253,7 +253,7 @@ git checkout [分支名]
253253
例如:
254254
255255
```
256-
git checkout release/2.3
256+
git checkout release/2.4
257257
```
258258
259259
注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持

docs/install/compile/macos-compile_en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ git checkout [name of the branch]
9595
For example:
9696

9797
```
98-
git checkout release/2.3
98+
git checkout release/2.4
9999
```
100100

101101
Note: python3.6、python3.7 version started supporting from release/1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch, python3.10 version started supporting from release/2.3 branch
@@ -257,7 +257,7 @@ git checkout [name of the branch]
257257
For example:
258258
259259
```
260-
git checkout release/2.3
260+
git checkout release/2.4
261261
```
262262
263263
#### 7. And please create and enter a directory called build:

docs/install/compile/windows-compile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
* 如果你的计算机硬件没有 NVIDIA® GPU,请编译 CPU 版本的 PaddlePaddle
1717

18-
* 如果你的计算机硬件有 NVIDIA® GPU,推荐编译 GPU 版本的 PaddlePaddle,建议安装 **CUDA 10.1/10.2//11.1/11.2/11.6**
18+
* 如果你的计算机硬件有 NVIDIA® GPU,推荐编译 GPU 版本的 PaddlePaddle,建议安装 **CUDA 10.1/10.2/11.1/11.2/11.6/11.7**
1919

2020
## 本机编译过程
2121

@@ -51,7 +51,7 @@
5151
5. 切换到 2.2 分支下进行编译:
5252
5353
```
54-
git checkout release/2.3
54+
git checkout release/2.4
5555
```
5656
5757
6. 创建名为 build 的目录并进入:

docs/install/compile/windows-compile_en.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Environment preparation
44

55
* **Windows 7/8/10 Pro/Enterprise(64bit)**
6-
* **GPU Version support CUDA 10.1/10.2/11.1/11.2/11.6, and only support single GPU**
6+
* **GPU Version support CUDA 10.1/10.2/11.1/11.2/11.6/11.7, and only support single GPU**
77
* **Python version 3.6+/3.7+/3.8+/3.9+/3.10+(64bit)**
88
* **pip version 20.2.2 or above (64bit)**
99
* **Visual Studio 2017**
@@ -17,6 +17,7 @@
1717
* **CUDA toolkit 11.1 with cuDNN v8.1.1**
1818
* **CUDA toolkit 11.2 with cuDNN v8.2.1**
1919
* **CUDA toolkit 11.6 with cuDNN v8.4.0**
20+
* **CUDA toolkit 11.7 with cuDNN v8.4.1**
2021
* **GPU's computing capability exceeds 3.5**
2122

2223
## Installation steps
@@ -73,7 +74,7 @@ There is one compilation methods in Windows system:
7374
7475
For example:
7576
```
76-
git checkout release/2.3
77+
git checkout release/2.4
7778
```
7879
7980
Note: python3.6、python3.7 version started supporting from release/1.2, python3.8 version started supporting from release/1.8, python3.9 version started supporting from release/2.1, python3.10 version started supporting from release/2.3

docs/install/conda/linux-conda.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
在进行 PaddlePaddle 安装之前请确保您的 Anaconda 软件环境已经正确安装。软件下载和安装参见 Anaconda 官网(https://www.anaconda.com/)。在您已经正确安装 Anaconda 的情况下请按照下列步骤安装 PaddlePaddle。
99

10-
* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 (64bit)
10+
* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 / Ubuntu22.04 (64bit)
1111
* GPU 版本支持 CUDA 10.1/10.2/11.2/11.6
1212
* conda 版本 4.8.3+ (64 bit)
1313

@@ -116,7 +116,7 @@ python -c "import platform;print(platform.architecture()[0]);print(platform.mach
116116
如果您的计算机没有 NVIDIA® GPU,请安装 CPU 版的 PaddlePaddle
117117

118118
```
119-
conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
119+
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
120120
```
121121

122122

@@ -127,26 +127,26 @@ conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn
127127
* 对于 `CUDA 10.1`,需要搭配 cuDNN 7 (cuDNN>=7.6.5, 多卡环境下 NCCL>=2.7),安装命令为:
128128

129129
```
130-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
130+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
131131
```
132132

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

135135
```
136-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
136+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
137137
```
138138

139139

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

142142
```
143-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
143+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
144144
```
145145

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

148148
```
149-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
149+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
150150
```
151151

152152
您可参考 NVIDIA 官方文档了解 CUDA 和 CUDNN 的安装流程和配置方法,请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)

docs/install/conda/linux-conda_en.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Before performing PaddlePaddle installation, please make sure that your Anaconda software environment is properly installed. For software download and installation, see Anaconda's official website (https://www.anaconda.com/). If you have installed Anaconda correctly, follow these steps to install PaddlePaddle.
99

10-
* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 (64bit)
10+
* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 / Ubuntu22.04 (64bit)
1111
* GPU Version support CUDA 10.1/10.2/11.2/11.6
1212
* conda version 4.8.3+ (64 bit)
1313

@@ -120,7 +120,7 @@ You can choose the following version of PaddlePaddle to start installation:
120120
If your computer doesn't have NVIDIA® GPU, please install `the CPU Version of PaddlePaddle`
121121

122122
```
123-
conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
123+
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
124124
```
125125

126126

@@ -131,25 +131,25 @@ conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn
131131
* If you are using CUDA 10.1,cuDNN 7 (cuDNN>=7.6.5, for multi card support, NCCL>=2.7):
132132

133133
```
134-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
134+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
135135
```
136136

137137
* If you are usingCUDA 10.2,cuDNN 7 (cuDNN>=7.6.5, for multi card support, NCCL>=2.7):
138138

139139
```
140-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
140+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
141141
```
142142

143143
* If you are using CUDA 11.2,cuDNN 8.1.1(for multi card support, NCCL>=2.7):
144144

145145
```
146-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
146+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
147147
```
148148

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

151151
```
152-
conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
152+
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
153153
```
154154

155155
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/)

0 commit comments

Comments
 (0)