Skip to content

Commit 87c9ba5

Browse files
2.4.0 docs update: del suffix rc0 and many slight modify. (#5420)
* 2.4.0 docs update: del suffix rc0 and many slight modify, cuda11.2 cudNN 8.1.1 to 8.2.1 * Add conda cuda11.7/cudnn8.4.1, and activate Docs-NEW * CN-[whitespace]-EN and trim trailing whitespace typechecker * resolve for comment
1 parent 084af18 commit 87c9ba5

20 files changed

+418
-808
lines changed

docs/install/Tables.md

Lines changed: 104 additions & 198 deletions
Large diffs are not rendered by default.

docs/install/Tables_en.md

Lines changed: 104 additions & 197 deletions
Large diffs are not rendered by default.

docs/install/conda/linux-conda.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55

66
## 一、环境准备
77

8-
在进行 PaddlePaddle 安装之前请确保您的 Anaconda 软件环境已经正确安装。软件下载和安装参见 Anaconda 官网(https://www.anaconda.com/)。在您已经正确安装 Anaconda 的情况下请按照下列步骤安装 PaddlePaddle。
9-
10-
* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 / Ubuntu22.04 (64bit)
11-
* GPU 版本支持 CUDA 10.1/10.2/11.2/11.6
12-
* conda 版本 4.8.3+ (64 bit)
13-
148
### 1.1 创建虚拟环境
159

1610
#### 1.1.1 安装环境
@@ -122,37 +116,37 @@ python3 -c "import platform;print(platform.architecture()[0]);print(platform.mac
122116
如果您的计算机没有 NVIDIA® GPU,请安装 CPU 版的 PaddlePaddle
123117

124118
```
125-
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
119+
conda install paddlepaddle==2.4.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
126120
```
127121

128122

129123

130124
#### GPU 版的 PaddlePaddle
131125

132126

133-
* 对于 `CUDA 10.1`,需要搭配 cuDNN 7 (cuDNN>=7.6.5, 多卡环境下 NCCL>=2.7),安装命令为:
127+
* 对于 `CUDA 10.2`,需要搭配 cuDNN 7.6.5(多卡环境下 NCCL>=2.7),安装命令为:
134128

135129
```
136-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
130+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
137131
```
138132

139-
* 对于 `CUDA 10.2`,需要搭配 cuDNN 7 (cuDNN>=7.6.5, 多卡环境下 NCCL>=2.7),安装命令为:
133+
134+
* 对于 `CUDA 11.2`,需要搭配 cuDNN 8.2.1(多卡环境下 NCCL>=2.7),安装命令为:
140135

141136
```
142-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
137+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
143138
```
144139

145-
146-
* 对于 `CUDA 11.2`,需要搭配 cuDNN 8.1.1(多卡环境下 NCCL>=2.7),安装命令为:
140+
* 对于 `CUDA 11.6`,需要搭配 cuDNN 8.4.0(多卡环境下 NCCL>=2.7),安装命令为:
147141

148142
```
149-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
143+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
150144
```
151145

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

154148
```
155-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
149+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
156150
```
157151

158152
您可参考 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: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55

66
## Environmental preparation
77

8-
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.
9-
10-
* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 / Ubuntu22.04 (64bit)
11-
* GPU Version support CUDA 10.1/10.2/11.2/11.6
12-
* conda version 4.8.3+ (64 bit)
13-
14-
158
### 1.1 Create Virtual Environment
169

1710
#### 1.1.1 Create the Anaconda Virtual Environment
@@ -126,36 +119,36 @@ You can choose the following version of PaddlePaddle to start installation:
126119
If your computer doesn't have NVIDIA® GPU, please install `the CPU Version of PaddlePaddle`
127120

128121
```
129-
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
122+
conda install paddlepaddle==2.4.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
130123
```
131124

132125

133126

134127
#### GPU Version of PaddlePaddle
135128

136129

137-
* If you are using CUDA 10.1,cuDNN 7 (cuDNN>=7.6.5, for multi card support, NCCL>=2.7):
130+
* If you are usingCUDA 10.2,cuDNN 7.6.5(for multi card support, NCCL>=2.7):
138131

139132
```
140-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
133+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
141134
```
142135

143-
* If you are usingCUDA 10.2,cuDNN 7 (cuDNN>=7.6.5, for multi card support, NCCL>=2.7):
136+
* If you are using CUDA 11.2,cuDNN 8.2.1(for multi card support, NCCL>=2.7):
144137

145138
```
146-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
139+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
147140
```
148141

149-
* If you are using CUDA 11.2,cuDNN 8.1.1(for multi card support, NCCL>=2.7):
142+
* If you are using CUDA 11.6,cuDNN 8.4.0(for multi card support, NCCL>=2.7):
150143

151144
```
152-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
145+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
153146
```
154147

155-
* If you are using CUDA 11.6,cuDNN 8.4.0(for multi card support, NCCL>=2.7):
148+
* If you are using CUDA 11.7,cuDNN 8.4.1(for multi card support, NCCL>=2.7):
156149

157150
```
158-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
151+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
159152
```
160153

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

docs/install/conda/macos-conda.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
## 一、环境准备
66

7-
在进行 PaddlePaddle 安装之前请确保您的 Anaconda 软件环境已经正确安装。软件下载和安装参见 Anaconda 官网(https://www.anaconda.com/)。在您已经正确安装 Anaconda 的情况下请按照下列步骤安装 PaddlePaddle。
8-
9-
* MacOS 版本 10.x/11.x (64 bit) (不支持 GPU 版本)
10-
* conda 版本 4.8.3+ (64 bit)
11-
127
### 1.1 创建虚拟环境
138

149
#### 1.1.1 安装环境
@@ -115,7 +110,7 @@ python3 -c "import platform;print(platform.architecture()[0]);print(platform.mac
115110
* 目前在 MacOS 环境仅支持 CPU 版 PaddlePaddle,请参考如下命令安装 Paddle:
116111

117112
```
118-
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
113+
conda install paddlepaddle==2.4.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
119114
```
120115

121116
## **三、验证安装**

docs/install/conda/macos-conda_en.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66

77
## Environmental preparation
88

9-
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.
10-
11-
* MacOS version 10.x/11.x (64 bit)(not support GPU version)
12-
* conda version 4.8.3+ (64 bit)
13-
14-
15-
169
### 1.1 Create Virtual Environment
1710

1811
#### 1.1.1 Create the Anaconda Virtual Environment
@@ -121,7 +114,7 @@ conda config --set show_channel_urls yes
121114
* Currently, only the CPU version of PaddlePaddle is supported in the MacOS environment. Please use the following command to install PaddlePaddle:
122115

123116
```
124-
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
117+
conda install paddlepaddle==2.4.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
125118
```
126119

127120

docs/install/conda/windows-conda.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
# Windows 下的 Conda 安装
22

3-
[Anaconda](https://www.anaconda.com/)是一个免费开源的 Python 和 R 语言的发行版本,用于计算科学,Anaconda 致力于简化包管理和部署。Anaconda 的包使用软件包管理系统 Conda 进行管理。Conda 是一个开源包管理系统和环境管理系统,可在 Windows、macOS 和 Linux 上运行。本文档为你介绍 Anaconda 安装方式,飞桨提供的 Anaconda 安装包支持分布式训练(多机多卡)、TensorRT 推理功能。
3+
[Anaconda](https://www.anaconda.com/)是一个免费开源的 Python 和 R 语言的发行版本,用于计算科学,Anaconda 致力于简化包管理和部署。Anaconda 的包使用软件包管理系统 Conda 进行管理。Conda 是一个开源包管理系统和环境管理系统,可在 Windows、macOS 和 Linux 上运行。本文档为你介绍 Anaconda 安装方式,飞桨提供的 Anaconda 安装包支持 TensorRT 推理功能。
44

55
## 一、环境准备
66

7-
在进行 PaddlePaddle 安装之前请确保您的 Anaconda 软件环境已经正确安装。软件下载和安装参见 Anaconda 官网(https://www.anaconda.com/)。在您已经正确安装 Anaconda 的情况下请按照下列步骤安装 PaddlePaddle。
8-
9-
* Windows 7/8/10 专业版/企业版 (64bit)
10-
* GPU 版本支持 CUDA 10.1/10.2/11.2/11.6,且仅支持单卡
11-
* conda 版本 4.8.3+ (64 bit)
12-
137

148
### 1.1 创建虚拟环境
159

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

126120
```
127-
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
121+
conda install paddlepaddle==2.4.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
128122
```
129123

130124

131125

132126
#### GPU 版的 PaddlePaddle
133127

134128

135-
* 对于 `CUDA 10.1`,需要搭配 cuDNN 7 (cuDNN>=7.6.5),安装命令为:
129+
* 对于 `CUDA 10.2`,需要搭配 cuDNN 7.6.5,安装命令为:
136130

137131
```
138-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
132+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
139133
```
140134

141-
* 对于 `CUDA 10.2`,需要搭配 cuDNN 7 (cuDNN>=7.6.5),安装命令为:
135+
* 对于 `CUDA 11.2`,需要搭配 cuDNN 8.2.1,安装命令为:
142136

143137
```
144-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
138+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
145139
```
146140

147-
* 对于 `CUDA 11.2`,需要搭配 cuDNN 8.1.1,安装命令为:
141+
* 对于 `CUDA 11.6`,需要搭配 cuDNN 8.4.0,安装命令为:
148142

149143
```
150-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
144+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
151145
```
152146

153-
* 对于 `CUDA 11.6`,需要搭配 cuDNN 8.4.0,安装命令为:
147+
* 对于 `CUDA 11.7`,需要搭配 cuDNN 8.4.1,安装命令为:
154148

155149
```
156-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
150+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
157151
```
158152

159153
您可参考 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/windows-conda_en.md

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66

77
## Environmental preparation
88

9-
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.
10-
11-
* Windows 7/8/10 Pro/Enterprise (64bit)
12-
* GPU Version support CUDA 10.1/10.2/11.2/11.6,and only supports single card
13-
* conda version 4.8.3+ (64 bit)
14-
15-
16-
179
### 1.1 Create Virtual Environment
1810

1911
#### 1.1.1 Create the Anaconda Virtual Environment
@@ -131,7 +123,7 @@ You can choose the following version of PaddlePaddle to start installation:
131123
If your computer doesn't have NVIDIA® GPU, please install `the CPU Version of PaddlePaddle`
132124

133125
```
134-
conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
126+
conda install paddlepaddle==2.4.0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
135127
```
136128

137129

@@ -140,28 +132,28 @@ conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu
140132
#### GPU Version of PaddlePaddle
141133

142134

143-
* If you are using CUDA 10.1,cuDNN 7 (cuDNN>=7.6.5):
135+
* If you are usingCUDA 10.2,cuDNN 7.6.5:
144136

145137
```
146-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
138+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
147139
```
148140

149-
* If you are usingCUDA 10.2,cuDNN 7 (cuDNN>=7.6.5):
141+
* If you are using CUDA 11.2,cuDNN 8.2.1:
150142

151143
```
152-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/
144+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
153145
```
154146

155-
* If you are using CUDA 11.2,cuDNN 8.1.1:
147+
* If you are using CUDA 11.6,cuDNN 8.4.0:
156148

157149
```
158-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
150+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
159151
```
160152

161-
* If you are using CUDA 11.6,cuDNN 8.4.0:
153+
* If you are using CUDA 11.7,cuDNN 8.4.1:
162154

163155
```
164-
conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
156+
conda install paddlepaddle-gpu==2.4.0 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge
165157
```
166158

167159
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)