diff --git a/docs/install/Tables.md b/docs/install/Tables.md index 8600cad40fc..f36c83bacd8 100644 --- a/docs/install/Tables.md +++ b/docs/install/Tables.md @@ -320,11 +320,11 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库
paddlepaddle-gpu==2.3.2 在 windows 环境下,会默认安装支持 CUDA 10.2 和 cuDNN 7 的对应[版本号]的 PaddlePaddle 安装包
+需要注意的是,命令中 paddlepaddle-gpu==2.4.0rc0 在 windows 环境下,会默认安装支持 CUDA 10.2 和 cuDNN 7 的对应[版本号]的 PaddlePaddle 安装包
@@ -356,17 +356,17 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库
paddlepaddle-gpu==2.3.2 will install the installation package of PaddlePaddle that supports CUDA 10.2 and cuDNN 7 by default under Windows environment.
+Please note that: in the commands, paddlepaddle-gpu==2.4.0rc0 will install the installation package of PaddlePaddle that supports CUDA 10.2 and cuDNN 7 by default under Windows environment.
@@ -258,17 +258,17 @@ Please note that: in the commands, paddlepaddle-gpu==2.3.2 will i
paddlepaddle-gpu==2.3.2 will i
paddlepaddle-gpu==2.3.2 will i
paddlepaddle-gpu==2.3.2 will i
paddlepaddle-gpu==2.3.2 will i
| version number | -cp36-cp36m | +版本说明 | cp37-cp37m | cp38-cp38 | cp39-cp39 | +cp310-cp310 | |||
|---|---|---|---|---|---|---|---|---|---|
| cpu-mkl | -paddlepaddle-latest-cp36-cp36m-linux_x86_64.whl | -paddlepaddle-latest-cp37-cp37m-linux_x86_64.whl | -paddlepaddle-latest-cp38-cp38-linux_x86_64.whl | -paddlepaddle-latest-cp39-cp39-linux_x86_64.whl | +linux-cpu-mkl-avx | +paddlepaddle-latest-cp37-cp37m-linux_x86_64.whl | +paddlepaddle-latest-cp38-cp38-linux_x86_64.whl | +paddlepaddle-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle-latest-cp310-cp310-linux_x86_64.whl |
| cpu-openblas | -paddlepaddle-latest-cp36-cp36m-linux_x86_64.whl | -paddlepaddle-latest-cp37-cp37m-linux_x86_64.whl | -paddlepaddle-latest-cp38-cp38-linux_x86_64.whl | -paddlepaddle-latest-cp39-cp39-linux_x86_64.whl | +linux-cpu-openblas-avx | +- | +paddlepaddle-latest-cp38-cp38-linux_x86_64.whl | +- | +- |
| cuda10.1-cudnn7-mkl-gcc5.4 | -paddlepaddle_gpu-latest-cp36-cp36m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp310-cp310-linux_x86_64.whl | |
| cuda10.2-cudnn7-mkl | -paddlepaddle_gpu-latest-cp36-cp36m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp310-cp310-linux_x86_64.whl | |
| cuda11.0-cudnn8.0-mkl | -paddlepaddle_gpu-latest-cp36-cp36m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp310-cp310-linux_x86_64.whl | |
| cuda11.1-cudnn8.1-mkl | -paddlepaddle_gpu-latest-cp36-cp36m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp310-cp310-linux_x86_64.whl | |
| cuda11.2-cudnn8.1-mkl | -paddlepaddle_gpu-latest-cp36-cp36m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | -paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp310-cp310-linux_x86_64.whl | +|
| cuda11.6-cudnn8.4-mkl | +paddlepaddle_gpu-latest-cp37-cp37m-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp38-cp38-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp39-cp39-linux_x86_64.whl | +paddlepaddle_gpu-latest-cp310-cp310-linux_x86_64.whl | |||||
| mac-cpu | -paddlepaddle-cp36-cp36m-macosx_10_6_intel.whl | paddlepaddle-cp37-cp37m-macosx_10_6_intel.whl | paddlepaddle-cp38-cp38-macosx_10_14_x86_64.whl | paddlepaddle-cp39-cp39-macosx_10_14_x86_64.whl | +paddlepaddle-cp310-cp310-macosx_10_14_universal2.whl | ||||
| win-cpu-mkl-avx | diff --git a/docs/install/compile/linux-compile.md b/docs/install/compile/linux-compile.md index b3b2190b319..33c55cef511 100644 --- a/docs/install/compile/linux-compile.md +++ b/docs/install/compile/linux-compile.md @@ -4,10 +4,10 @@ * **Linux 版本 (64 bit)** * **CentOS 6 (不推荐,不提供编译出现问题时的官方支持)** - * **CentOS 7 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6)** + * **CentOS 7 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6/11.7)** * **Ubuntu 14.04 (不推荐,不提供编译出现问题时的官方支持)** - * **Ubuntu 16.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6)** - * **Ubuntu 18.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6)** + * **Ubuntu 16.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6/11.7)** + * **Ubuntu 18.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2/11.6/11.7)** * **Python 版本 3.6/3.7/3.8/3.9/3.10 (64 bit)** ## 选择 CPU/GPU @@ -20,6 +20,7 @@ * **CUDA 工具包 11.1 配合 cuDNN v8.1.1(如需多卡支持,需配合 NCCL2.7 及更高)** * **CUDA 工具包 11.2 配合 cuDNN v8.1.1(如需多卡支持,需配合 NCCL2.7 及更高)** * **CUDA 工具包 11.6 配合 cuDNN v8.4.0(如需多卡支持,需配合 NCCL2.7 及更高)** + * **CUDA 工具包 11.7 配合 cuDNN v8.4.1(如需多卡支持,需配合 NCCL2.7 及更高)** * **GPU 运算能力超过 3.5 的硬件设备** 您可参考 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 [分支名] 例如: ``` -git checkout release/2.3 +git checkout release/2.4 ``` 注意: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 [分支名] 例如: ``` -git checkout release/2.3 +git checkout release/2.4 ``` #### 10. 并且请创建并进入一个叫 build 的目录下: @@ -512,7 +513,7 @@ mkdir build && cd build > 请注意 PY_VERSION 参数更换为您需要的 python 版本 -* 对于需要编译**GPU 版本 PaddlePaddle**的用户:(**仅支持 CentOS7(CUDA11.6/CUDA11.2/CUDA11.1/CUDA10.2/CUDA10.1)**) +* 对于需要编译**GPU 版本 PaddlePaddle**的用户:(**仅支持 CentOS7(CUDA11.7/CUDA11.6/CUDA11.2/CUDA11.1/CUDA10.2/CUDA10.1)**) 1. 请确保您已经正确安装 nccl2,或者按照以下指令安装 nccl2(这里提供的是 CUDA10.2,cuDNN7 下 nccl2 的安装指令,更多版本的安装信息请参考 NVIDIA[官方网站](https://developer.nvidia.com/nccl)): diff --git a/docs/install/compile/linux-compile_en.md b/docs/install/compile/linux-compile_en.md index c28c0c7402b..57214a36669 100644 --- a/docs/install/compile/linux-compile_en.md +++ b/docs/install/compile/linux-compile_en.md @@ -4,10 +4,10 @@ * **Linux version (64 bit)** * **CentOS 6 (not recommended, no official support for compilation problems)** - * **CentOS 7 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6** + * **CentOS 7 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6/11.7** * **Ubuntu 14.04 (not recommended, no official support for compilation problems)** - * **Ubuntu 16.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6)** - * **Ubuntu 18.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6)** + * **Ubuntu 16.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6/11.7)** + * **Ubuntu 18.04 (GPU version supports CUDA 10.1/10.2/11.1/11.2/11.6/11.7)** * **Python version 3.6/3.7/3.8/3.9/3.10 (64 bit)** ## Choose CPU/GPU @@ -20,6 +20,7 @@ * **CUDA toolkit 11.1 with cuDNN v8.1.1(for multi card support, NCCL2.7 or higher)** * **CUDA toolkit 11.2 with cuDNN v8.1.1(for multi card support, NCCL2.7 or higher)** * **CUDA toolkit 11.6 with cuDNN v8.4.0(for multi card support, NCCL2.7 or higher)** + * **CUDA toolkit 11.7 with cuDNN v8.4.1(for multi card support, NCCL2.7 or higher)** * **Hardware devices with GPU computing power over 3.5** 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] For example: ``` -git checkout release/2.3 +git checkout release/2.4 ``` 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] For example: ``` -git checkout release/2.3 +git checkout release/2.4 ``` #### 10. And please create and enter a directory called build: diff --git a/docs/install/compile/macos-compile.md b/docs/install/compile/macos-compile.md index 42c19dfcb71..d9ce6d30049 100644 --- a/docs/install/compile/macos-compile.md +++ b/docs/install/compile/macos-compile.md @@ -94,7 +94,7 @@ git checkout [分支名] 例如: ``` -git checkout release/2.3 +git checkout release/2.4 ``` 注意: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 [分支名] 例如: ``` -git checkout release/2.3 +git checkout release/2.4 ``` 注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持 diff --git a/docs/install/compile/macos-compile_en.md b/docs/install/compile/macos-compile_en.md index afb5975f479..de72cdebb8f 100644 --- a/docs/install/compile/macos-compile_en.md +++ b/docs/install/compile/macos-compile_en.md @@ -95,7 +95,7 @@ git checkout [name of the branch] For example: ``` -git checkout release/2.3 +git checkout release/2.4 ``` 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] For example: ``` -git checkout release/2.3 +git checkout release/2.4 ``` #### 7. And please create and enter a directory called build: diff --git a/docs/install/compile/windows-compile.md b/docs/install/compile/windows-compile.md index 51418d9dc04..d163b01c42b 100644 --- a/docs/install/compile/windows-compile.md +++ b/docs/install/compile/windows-compile.md @@ -15,7 +15,7 @@ * 如果你的计算机硬件没有 NVIDIA® GPU,请编译 CPU 版本的 PaddlePaddle -* 如果你的计算机硬件有 NVIDIA® GPU,推荐编译 GPU 版本的 PaddlePaddle,建议安装 **CUDA 10.1/10.2//11.1/11.2/11.6** +* 如果你的计算机硬件有 NVIDIA® GPU,推荐编译 GPU 版本的 PaddlePaddle,建议安装 **CUDA 10.1/10.2/11.1/11.2/11.6/11.7** ## 本机编译过程 @@ -51,7 +51,7 @@ 5. 切换到 2.2 分支下进行编译: ``` - git checkout release/2.3 + git checkout release/2.4 ``` 6. 创建名为 build 的目录并进入: diff --git a/docs/install/compile/windows-compile_en.md b/docs/install/compile/windows-compile_en.md index 155d96d185b..3ca2518fe4c 100644 --- a/docs/install/compile/windows-compile_en.md +++ b/docs/install/compile/windows-compile_en.md @@ -3,7 +3,7 @@ ## Environment preparation * **Windows 7/8/10 Pro/Enterprise(64bit)** -* **GPU Version support CUDA 10.1/10.2/11.1/11.2/11.6, and only support single GPU** +* **GPU Version support CUDA 10.1/10.2/11.1/11.2/11.6/11.7, and only support single GPU** * **Python version 3.6+/3.7+/3.8+/3.9+/3.10+(64bit)** * **pip version 20.2.2 or above (64bit)** * **Visual Studio 2017** @@ -17,6 +17,7 @@ * **CUDA toolkit 11.1 with cuDNN v8.1.1** * **CUDA toolkit 11.2 with cuDNN v8.2.1** * **CUDA toolkit 11.6 with cuDNN v8.4.0** + * **CUDA toolkit 11.7 with cuDNN v8.4.1** * **GPU's computing capability exceeds 3.5** ## Installation steps @@ -73,7 +74,7 @@ There is one compilation methods in Windows system: For example: ``` - git checkout release/2.3 + git checkout release/2.4 ``` 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 diff --git a/docs/install/conda/linux-conda.md b/docs/install/conda/linux-conda.md index 22c40c66856..e6662874f2f 100644 --- a/docs/install/conda/linux-conda.md +++ b/docs/install/conda/linux-conda.md @@ -7,7 +7,7 @@ 在进行 PaddlePaddle 安装之前请确保您的 Anaconda 软件环境已经正确安装。软件下载和安装参见 Anaconda 官网(https://www.anaconda.com/)。在您已经正确安装 Anaconda 的情况下请按照下列步骤安装 PaddlePaddle。 -* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 (64bit) +* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 / Ubuntu22.04 (64bit) * GPU 版本支持 CUDA 10.1/10.2/11.2/11.6 * conda 版本 4.8.3+ (64 bit) @@ -116,7 +116,7 @@ python -c "import platform;print(platform.architecture()[0]);print(platform.mach 如果您的计算机没有 NVIDIA® GPU,请安装 CPU 版的 PaddlePaddle ``` -conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -127,26 +127,26 @@ conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn * 对于 `CUDA 10.1`,需要搭配 cuDNN 7 (cuDNN>=7.6.5, 多卡环境下 NCCL>=2.7),安装命令为: ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * 对于 `CUDA 10.2`,需要搭配 cuDNN 7 (cuDNN>=7.6.5, 多卡环境下 NCCL>=2.7),安装命令为: ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * 对于 `CUDA 11.2`,需要搭配 cuDNN 8.1.1(多卡环境下 NCCL>=2.7),安装命令为: ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 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.3.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -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/) diff --git a/docs/install/conda/linux-conda_en.md b/docs/install/conda/linux-conda_en.md index 29a82d46e02..a6128447dc9 100644 --- a/docs/install/conda/linux-conda_en.md +++ b/docs/install/conda/linux-conda_en.md @@ -7,7 +7,7 @@ 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. -* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 (64bit) +* CentOS 7 / Ubuntu16.04 / Ubuntu18.04 / Ubuntu20.04 / Ubuntu22.04 (64bit) * GPU Version support CUDA 10.1/10.2/11.2/11.6 * conda version 4.8.3+ (64 bit) @@ -120,7 +120,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.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -131,25 +131,25 @@ conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn * If you are using CUDA 10.1,cuDNN 7 (cuDNN>=7.6.5, for multi card support, NCCL>=2.7): ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * If you are usingCUDA 10.2,cuDNN 7 (cuDNN>=7.6.5, for multi card support, NCCL>=2.7): ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * If you are using CUDA 11.2,cuDNN 8.1.1(for multi card support, NCCL>=2.7): ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 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.3.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -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/) diff --git a/docs/install/conda/macos-conda.md b/docs/install/conda/macos-conda.md index 284884297b8..fcd8050a650 100644 --- a/docs/install/conda/macos-conda.md +++ b/docs/install/conda/macos-conda.md @@ -109,7 +109,7 @@ python -c "import platform;print(platform.architecture()[0]);print(platform.mach * 目前在 MacOS 环境仅支持 CPU 版 PaddlePaddle,请参考如下命令安装 Paddle: ``` - conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` ## **三、验证安装** diff --git a/docs/install/conda/macos-conda_en.md b/docs/install/conda/macos-conda_en.md index 003b73b7c45..56cffcc5b16 100644 --- a/docs/install/conda/macos-conda_en.md +++ b/docs/install/conda/macos-conda_en.md @@ -115,7 +115,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.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` diff --git a/docs/install/conda/windows-conda.md b/docs/install/conda/windows-conda.md index 356e89b2cfe..9ecd6a3343d 100644 --- a/docs/install/conda/windows-conda.md +++ b/docs/install/conda/windows-conda.md @@ -120,7 +120,7 @@ python -c "import platform;print(platform.architecture()[0]);print(platform.mach 如果您的计算机没有 NVIDIA® GPU,请安装 CPU 版的 PaddlePaddle ``` -conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -131,25 +131,25 @@ conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn * 对于 `CUDA 10.1`,需要搭配 cuDNN 7 (cuDNN>=7.6.5),安装命令为: ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * 对于 `CUDA 10.2`,需要搭配 cuDNN 7 (cuDNN>=7.6.5),安装命令为: ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * 对于 `CUDA 11.2`,需要搭配 cuDNN 8.1.1,安装命令为: ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 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.3.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -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/) diff --git a/docs/install/conda/windows-conda_en.md b/docs/install/conda/windows-conda_en.md index a7406670058..cca4dad3900 100644 --- a/docs/install/conda/windows-conda_en.md +++ b/docs/install/conda/windows-conda_en.md @@ -125,7 +125,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.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.0rc0 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -137,25 +137,25 @@ conda install paddlepaddle==2.3.2 --channel https://mirrors.tuna.tsinghua.edu.cn * If you are using CUDA 10.1,cuDNN 7 (cuDNN>=7.6.5): ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * If you are usingCUDA 10.2,cuDNN 7 (cuDNN>=7.6.5): ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * If you are using CUDA 11.2,cuDNN 8.1.1: ``` - conda install paddlepaddle-gpu==2.3.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 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.3.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.0rc0 cudatoolkit=11.6 -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/) diff --git a/docs/install/docker/linux-docker.md b/docs/install/docker/linux-docker.md index 5f779708295..738924700dc 100644 --- a/docs/install/docker/linux-docker.md +++ b/docs/install/docker/linux-docker.md @@ -21,40 +21,46 @@ * CPU 版的 PaddlePaddle: ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.3.2 + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0 ``` * CPU 版的 PaddlePaddle,且镜像中预装好了 jupyter: ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.3.2-jupyter + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-jupyter ``` * GPU 版的 PaddlePaddle: ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.3.2-gpu-cuda10.2-cudnn7 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda10.2-cudnn7.6-trt7.0 ``` ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.3.2-gpu-cuda11.2-cudnn8 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.2-cudnn8.1-trt8.0 + ``` + ``` + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.7-cudnn8.4-trt8.4 ``` 如果您的机器不在中国大陆地区,可以直接从 DockerHub 拉取镜像: * CPU 版的 PaddlePaddle: ``` - docker pull paddlepaddle/paddle:2.3.2 + docker pull paddlepaddle/paddle:2.4.0rc0 ``` * CPU 版的 PaddlePaddle,且镜像中预装好了 jupyter: ``` - docker pull paddlepaddle/paddle:2.3.2-jupyter + docker pull paddlepaddle/paddle:2.4.0rc0-jupyter ``` * GPU 版的 PaddlePaddle: ``` - nvidia-docker pull paddlepaddle/paddle:2.3.2-gpu-cuda10.2-cudnn7 + nvidia-docker pull paddlepaddle/paddle:2.4.0rc0-gpu-cuda10.2-cudnn7.6-trt7.0 + ``` + ``` + nvidia-docker pull paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.2-cudnn8.1-trt8.0 ``` ``` - nvidia-docker pull paddlepaddle/paddle:2.3.2-gpu-cuda11.2-cudnn8 + nvidia-docker pull paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.7-cudnn8.4-trt8.4 ``` 您还可以访问[DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/)获取更多镜像。 @@ -66,7 +72,7 @@ ``` - docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.3.2 /bin/bash + docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0 /bin/bash ``` - `--name paddle_docker`:设定 Docker 的名称,`paddle_docker` 是自己设置的名称; @@ -77,7 +83,7 @@ - `-v $PWD:/paddle`:指定将当前路径(PWD 变量会展开为当前路径的绝对路径)挂载到容器内部的 /paddle 目录; - - `registry.baidubce.com/paddlepaddle/paddle:2.3.2`:指定需要使用的 image 名称,您可以通过`docker images`命令查看;/bin/bash 是在 Docker 中要执行的命令 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0`:指定需要使用的 image 名称,您可以通过`docker images`命令查看;/bin/bash 是在 Docker 中要执行的命令 * 使用 CPU 版本的 PaddlePaddle,且镜像中预装好了 jupyter: @@ -92,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.3.2-jupyter + docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-jupyter ``` - `--rm`:关闭容器后删除容器; @@ -103,13 +109,13 @@ - `-v $PWD:/home/paddle`:指定将当前路径(PWD 变量会展开为当前路径的绝对路径)挂载到容器内部的 /home/paddle 目录; - - `registry.baidubce.com/paddlepaddle/paddle:2.3.2-jupyter`:指定需要使用的 image 名称,您可以通过`docker images`命令查看 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-jupyter`:指定需要使用的 image 名称,您可以通过`docker images`命令查看 * 使用 GPU 版本的 PaddlePaddle: ``` - nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.3.2-gpu-cuda10.2-cudnn7 /bin/bash + nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda10.2-cudnn7.6-trt7.0 /bin/bash ``` - `--name paddle_docker`:设定 Docker 的名称,`paddle_docker` 是自己设置的名称; @@ -120,7 +126,7 @@ - `-v $PWD:/paddle`:指定将当前路径(PWD 变量会展开为当前路径的绝对路径)挂载到容器内部的 /paddle 目录; - - `registry.baidubce.com/paddlepaddle/paddle:2.3.2-gpu-cuda10.2-cudnn7`:指定需要使用的 image 名称,如果您希望使用 CUDA 11.2 的镜像,也可以将其替换成`registry.baidubce.com/paddlepaddle/paddle:2.3.2-gpu-cuda11.2-cudnn8`。您可以通过`docker images`命令查看镜像。/bin/bash 是在 Docker 中要执行的命令 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda10.2-cudnn7.6-trt7.0`:指定需要使用的 image 名称,如果您希望使用 CUDA 11.2 或 CUDA 11.7 的镜像,也可以将其替换成`registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.2-cudnn8.1-trt8.0` 或 `registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.7-cudnn8.4-trt8.4`。您可以通过`docker images`命令查看镜像。/bin/bash 是在 Docker 中要执行的命令 @@ -139,20 +145,24 @@|||||||||
| registry.baidubce.com/paddlepaddle/paddle:2.3.2 | -安装了 2.3.2 版本 paddle 的 CPU 镜像 | +registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0 | +安装了 2.4.0rc0 版本 paddle 的 CPU 镜像 | ||||||
| registry.baidubce.com/paddlepaddle/paddle:2.3.2-jupyter | -安装了 2.3.2 版本 paddle 的 CPU 镜像,且镜像中预装好了 jupyter,启动 docker 即运行 jupyter 服务 | +registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-jupyter | +安装了 2.4.0rc0 版本 paddle 的 CPU 镜像,且镜像中预装好了 jupyter,启动 docker 即运行 jupyter 服务 | ||||||
| registry.baidubce.com/paddlepaddle/paddle:2.3.2-gpu-cuda11.2-cudnn8 | -安装了 2.3.2 版本 paddle 的 GPU 镜像,cuda 版本为 11.2,cudnn 版本为 8.1 | +registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.7-cudnn8.4-trt8.4 | +安装了 2.4.0rc0 版本 paddle 的 GPU 镜像,cuda 版本为 11.7,cudnn 版本为 8.4,trt 版本为 8.4 | ||||||
| registry.baidubce.com/paddlepaddle/paddle:2.3.2-gpu-cuda10.2-cudnn7 | -安装了 2.3.2 版本 paddle 的 GPU 镜像,cuda 版本为 10.2,cudnn 版本为 7 | +||||||||
| registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda11.2-cudnn8.1-trt8.0 | +安装了 2.4.0rc0 版本 paddle 的 GPU 镜像,cuda 版本为 11.2,cudnn 版本为 8.1,trt 版本为 8.0 | +||||||||
| registry.baidubce.com/paddlepaddle/paddle:2.4.0rc0-gpu-cuda10.2-cudnn7.6-trt7.0 | +安装了 2.4.0rc0 版本 paddle 的 GPU 镜像,cuda 版本为 10.2,cudnn 版本为 7.6,trt 版本为 7.0 |