From e26fbc40e1b2f54fae959754ce5bf738c88897bb Mon Sep 17 00:00:00 2001 From: tianshuo78520a <707759223@qq.com> Date: Sat, 12 Sep 2020 14:48:03 +0800 Subject: [PATCH] update install doc for release/2.0-beta0 (#2595) --- doc/paddle/install/Tables.md | 94 +++++++++---------- doc/paddle/install/Tables_en.md | 94 +++++++++---------- doc/paddle/install/compile/compile_Windows.md | 4 +- .../install/compile/compile_Windows_en.md | 4 +- doc/paddle/install/index_cn.rst | 8 +- doc/paddle/install/index_en.rst | 8 +- doc/paddle/install/install_Windows.md | 10 +- doc/paddle/install/install_Windows_en.md | 10 +- 8 files changed, 120 insertions(+), 112 deletions(-) diff --git a/doc/paddle/install/Tables.md b/doc/paddle/install/Tables.md index 25969a18a..5333d6a24 100644 --- a/doc/paddle/install/Tables.md +++ b/doc/paddle/install/Tables.md @@ -223,11 +223,11 @@ PaddePaddle通过编译时指定路径来实现引用各种BLAS/CUDA/cuDNN库。 - paddlepaddle==[版本号] 例如 paddlepaddle==2.0.0a0 + paddlepaddle==[版本号] 例如 paddlepaddle==2.0.0b0 只支持CPU对应版本的PaddlePaddle，具体版本请参见Pypi - paddlepaddle-gpu==[版本号] 例如 paddlepaddle-gpu==2.0.0a0 + paddlepaddle-gpu==[版本号] 例如 paddlepaddle-gpu==2.0.0b0 默认安装支持CUDA 10.0和cuDNN 7的对应[版本号]的PaddlePaddle安装包 @@ -237,7 +237,7 @@ PaddePaddle通过编译时指定路径来实现引用各种BLAS/CUDA/cuDNN库。 您可以在 [Release History](https://pypi.org/project/paddlepaddle-gpu/#history) 中找到PaddlePaddle-gpu的各个发行版本。 > 其中`postXX` 对应的是CUDA和cuDNN的版本，`postXX`之前的数字代表Paddle的版本 -需要注意的是，命令中 paddlepaddle-gpu==2.0.0a0 在windows环境下，会默认安装支持CUDA 10.0和cuDNN 7的对应[版本号]的PaddlePaddle安装包 +需要注意的是，命令中 paddlepaddle-gpu==2.0.0b0 在windows环境下，会默认安装支持CUDA 10.0和cuDNN 7的对应[版本号]的PaddlePaddle安装包

@@ -259,65 +259,65 @@ PaddePaddle通过编译时指定路径来实现引用各种BLAS/CUDA/cuDNN库。 cpu-mkl - - paddlepaddle-2.0.0a0-cp27-cp27mu-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp27-cp27m-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp35-cp35m-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp36-cp36m-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp37-cp37m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp27-cp27mu-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp27-cp27m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp35-cp35m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp36-cp36m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp37-cp37m-linux_x86_64.whl cuda10_cudnn7-mkl - - paddlepaddle_gpu-2.0.0a0-cp27-cp27mu-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp27-cp27m-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp35-cp35m-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp27-cp27mu-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp27-cp27m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp35-cp35m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp37-cp37m-linux_x86_64.whl win_cpu_mkl - - - paddlepaddle-2.0.0a0-cp27-cp27m-win_amd64.whl - - paddlepaddle-2.0.0a0-cp35-cp35m-win_amd64.whl - - paddlepaddle-2.0.0a0-cp36-cp36m-win_amd64.whl - - paddlepaddle-2.0.0a0-cp37-cp37m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp27-cp27m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp35-cp35m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp36-cp36m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp37-cp37m-win_amd64.whl win_cuda10_cudnn7_mkl - - - paddlepaddle_gpu-2.0.0a0-cp27-cp27m-win_amd64.whl - - paddlepaddle_gpu-2.0.0a0-cp35-cp35m-win_amd64.whl - - paddlepaddle_gpu-2.0.0a0-cp36-cp36m-win_amd64.whl - - paddlepaddle_gpu-2.0.0a0-cp37-cp37m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp27-cp27m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp35-cp35m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp36-cp36m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp37-cp37m-win_amd64.whl mac_cpu - - - paddlepaddle-2.0.0a0-cp27-cp27m-macosx_10_6_intel.whl - - paddlepaddle-2.0.0a0-cp35-cp35m-macosx_10_6_intel.whl - - paddlepaddle-2.0.0a0-cp36-cp36m-macosx_10_6_intel.whl - - paddlepaddle-2.0.0a0-cp37-cp37m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp27-cp27m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp35-cp35m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp36-cp36m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp37-cp37m-macosx_10_6_intel.whl diff --git a/doc/paddle/install/Tables_en.md b/doc/paddle/install/Tables_en.md index ec27275a1..85487d42d 100644 --- a/doc/paddle/install/Tables_en.md +++ b/doc/paddle/install/Tables_en.md @@ -220,11 +220,11 @@ PaddePaddle implements references to various BLAS/CUDA/cuDNN libraries by specif - paddlepaddle==[version code] such as paddlepaddle==2.0.0a0 + paddlepaddle==[version code] such as paddlepaddle==2.0.0b0 Only support the corresponding version of the CPU PaddlePaddle, please refer to Pypi for the specific version. - paddlepaddle-gpu==[version code], such as paddlepaddle-gpu==2.0.0a0 + paddlepaddle-gpu==[version code], such as paddlepaddle-gpu==2.0.0b0 The default installation supports the PaddlePaddle installation package corresponding to [version number] of CUDA 10.0 and cuDNN 7 @@ -234,7 +234,7 @@ PaddePaddle implements references to various BLAS/CUDA/cuDNN libraries by specif You can find various distributions of PaddlePaddle-gpu in [the Release History](https://pypi.org/project/paddlepaddle-gpu/#history). > 'postxx' corresponds to CUDA and cuDNN versions, and the number before 'postxx' represents the version of Paddle -Please note that: in the commands, paddlepaddle-gpu==2.0.0a0 will install the installation package of PaddlePaddle that supports CUDA 10.0 and cuDNN 7 by default under Windows environment. +Please note that: in the commands, paddlepaddle-gpu==2.0.0b0 will install the installation package of PaddlePaddle that supports CUDA 10.0 and cuDNN 7 by default under Windows environment. @@ -258,65 +258,65 @@ Please note that: in the commands, paddlepaddle-gpu==2.0.0a0 will cpu-mkl - - paddlepaddle-2.0.0a0-cp27-cp27mu-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp27-cp27m-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp35-cp35m-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp36-cp36m-linux_x86_64.whl - - paddlepaddle-2.0.0a0-cp37-cp37m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp27-cp27mu-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp27-cp27m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp35-cp35m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp36-cp36m-linux_x86_64.whl + + paddlepaddle-2.0.0b0-cp37-cp37m-linux_x86_64.whl cuda10_cudnn7-mkl - - paddlepaddle_gpu-2.0.0a0-cp27-cp27mu-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp27-cp27m-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp35-cp35m-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.0.0a0-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp27-cp27mu-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp27-cp27m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp35-cp35m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.0.0b0-cp37-cp37m-linux_x86_64.whl win_cpu_mkl - - - paddlepaddle-2.0.0a0-cp27-cp27m-win_amd64.whl - - paddlepaddle-2.0.0a0-cp35-cp35m-win_amd64.whl - - paddlepaddle-2.0.0a0-cp36-cp36m-win_amd64.whl - - paddlepaddle-2.0.0a0-cp37-cp37m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp27-cp27m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp35-cp35m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp36-cp36m-win_amd64.whl + + paddlepaddle-2.0.0b0-cp37-cp37m-win_amd64.whl win_cuda10_cudnn7_mkl - - - paddlepaddle_gpu-2.0.0a0-cp27-cp27m-win_amd64.whl - - paddlepaddle_gpu-2.0.0a0-cp35-cp35m-win_amd64.whl - - paddlepaddle_gpu-2.0.0a0-cp36-cp36m-win_amd64.whl - - paddlepaddle_gpu-2.0.0a0-cp37-cp37m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp27-cp27m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp35-cp35m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp36-cp36m-win_amd64.whl + + paddlepaddle_gpu-2.0.0b0-cp37-cp37m-win_amd64.whl mac_cpu - - - paddlepaddle-2.0.0a0-cp27-cp27m-macosx_10_6_intel.whl - - paddlepaddle-2.0.0a0-cp35-cp35m-macosx_10_6_intel.whl - - paddlepaddle-2.0.0a0-cp36-cp36m-macosx_10_6_intel.whl - - paddlepaddle-2.0.0a0-cp37-cp37m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp27-cp27m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp35-cp35m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp36-cp36m-macosx_10_6_intel.whl + + paddlepaddle-2.0.0b0-cp37-cp37m-macosx_10_6_intel.whl diff --git a/doc/paddle/install/compile/compile_Windows.md b/doc/paddle/install/compile/compile_Windows.md index 7a572faf3..1628169aa 100644 --- a/doc/paddle/install/compile/compile_Windows.md +++ b/doc/paddle/install/compile/compile_Windows.md @@ -13,7 +13,7 @@ * 如果您的计算机没有 NVIDIA® GPU，请编译CPU版的PaddlePaddle * 如果您的计算机有NVIDIA® GPU，并且满足以下条件，推荐编译GPU版的PaddlePaddle - * **CUDA 工具包 9.0/9.1/9.2/10.0/10.1 配合 cuDNN v7.3+** + * **CUDA 工具包 9.0/9.1/9.2/10.0/10.1 配合 cuDNN v7.4+** * **GPU运算能力超过1.0的硬件设备** ## 安装步骤 @@ -41,6 +41,8 @@ > git可以在官网[下载](https://gitforwindows.org/)，并添加到环境变量中。 + > 如果您使用的是Python2，还需要安装[Microsoft Visual C++ Compiler for Python 2.7](https://www.microsoft.com/en-us/download/details.aspx?id=44266) + 2. 将PaddlePaddle的源码clone在当前目录下的Paddle的文件夹中，并进入Padde目录下： - `git clone https://github.com/PaddlePaddle/Paddle.git` diff --git a/doc/paddle/install/compile/compile_Windows_en.md b/doc/paddle/install/compile/compile_Windows_en.md index 29a9c1ca5..0eb652a7d 100644 --- a/doc/paddle/install/compile/compile_Windows_en.md +++ b/doc/paddle/install/compile/compile_Windows_en.md @@ -13,7 +13,7 @@ * If your computer doesn't have NVIDIA® GPU, please install CPU version of PaddlePaddle * If your computer has NVIDIA® GPU, and the following conditions are met，GPU version of PaddlePaddle is recommended. - * **CUDA toolkit 9.0/9.1/9.2/10.0/10.1 with cuDNN v7.3+** + * **CUDA toolkit 9.0/9.1/9.2/10.0/10.1 with cuDNN v7.4+** * **GPU's computing capability exceeds 1.0** ## Installation steps @@ -45,6 +45,8 @@ There is one compilation methods in Windows system: > Git can be downloaded on the [official website](https://gitforwindows.org/) and added to the environment variable. + > If you are using Python 2, you need to install [Microsoft Visual C++ Compiler for Python 2.7](https://www.microsoft.com/en-us/download/details.aspx?id=44266) + 2. Clone the PaddlePaddle source code to the Paddle subdirectories of the current directory and go to the Paddle subdirectories: - `git clone https://github.com/PaddlePaddle/Paddle.git` diff --git a/doc/paddle/install/index_cn.rst b/doc/paddle/install/index_cn.rst index d6a6f0b2c..7e4a5f70b 100644 --- a/doc/paddle/install/index_cn.rst +++ b/doc/paddle/install/index_cn.rst @@ -181,11 +181,11 @@ 如果您是使用 Python 2，安装CPU版本的命令为： :: - python -m pip install paddlepaddle==2.0.0a0 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle==2.0.0b0 -i https://mirror.baidu.com/pypi/simple 或 - python -m pip install paddlepaddle==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple 如果您是使用 Python 3，请将上述命令中的 **python** 更换为 **python3** 进行安装 @@ -198,11 +198,11 @@ 如果您是使用 Python2，请注意用以下指令安装的PaddlePaddle在Windows、Ubuntu、CentOS下只支持CUDA10.0： :: - python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle-gpu==2.0.0b0 -i https://mirror.baidu.com/pypi/simple 或 - python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle-gpu==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple 如果您是使用 Python 3，请将上述命令中的 **python** 更换为 **python3** 进行安装。 diff --git a/doc/paddle/install/index_en.rst b/doc/paddle/install/index_en.rst index 2c08e52ce..0f337d513 100644 --- a/doc/paddle/install/index_en.rst +++ b/doc/paddle/install/index_en.rst @@ -182,11 +182,11 @@ This section describes how to use pip to install. If you are using Python 2, command to install CPU version is: :: - python -m pip install paddlepaddle==2.0.0a0 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle==2.0.0b0 -i https://mirror.baidu.com/pypi/simple or - python -m pip install paddlepaddle==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple If you are using Python 3, please change **python** in the above command to **python3** and install. @@ -201,11 +201,11 @@ This section describes how to use pip to install. If you are using Python2, please attention that PaddlePaddle installed through command below only supports CUDA10.0 under Windows、Ubuntu、CentOS: :: - python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle-gpu==2.0.0b0 -i https://mirror.baidu.com/pypi/simple or - python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle-gpu==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple If you are using Python 3, please change **python** in the above command to **python3** and install. diff --git a/doc/paddle/install/install_Windows.md b/doc/paddle/install/install_Windows.md index 5a31ae11f..103318d57 100644 --- a/doc/paddle/install/install_Windows.md +++ b/doc/paddle/install/install_Windows.md @@ -17,6 +17,8 @@ * 如果您是使用 Python 3，输出应是 3.5.1+/3.6+/3.7+ + 如果您使用的是Python2，还需要安装[Microsoft Visual C++ Compiler for Python 2.7](https://www.microsoft.com/en-us/download/details.aspx?id=44266) + * 如果不符合您预期的版本，使用以下命令查看python的路径是否是您预期的位置 where python @@ -49,7 +51,7 @@ * 如果您的计算机没有 NVIDIA® GPU，请安装CPU版的PaddlePaddle * 如果您的计算机有 NVIDIA® GPU，并且满足以下条件，推荐安装GPU版的PaddlePaddle - * **CUDA 工具包 9.0/10.0 配合 cuDNN v7.3+** + * **CUDA 工具包 9.0/10.0 配合 cuDNN v7.4+** * **GPU运算能力超过1.0的硬件设备** 注: 目前官方发布的windows安装包仅包含 CUDA 9.0/10.0 的单卡模式，不包含 CUDA 9.1/9.2/10.1，如需使用，请通过源码自行编译。 @@ -68,16 +70,16 @@ Windows系统下有2种安装方式： ## 安装步骤 * CPU版PaddlePaddle： - * `python -m pip install paddlepaddle==2.0.0a0 -i https://mirror.baidu.com/pypi/simple`（推荐使用百度源） 或 `python -m pip install paddlepaddle==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple` + * `python -m pip install paddlepaddle==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html` * GPU版PaddlePaddle： - * `python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://mirror.baidu.com/pypi/simple` 或 `python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple` + * `python -m pip install paddlepaddle_gpu==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html` 您可[验证是否安装成功](#check)，如有问题请查看[FAQ](./FAQ.html) 注： -* `python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple` 此命令将安装支持CUDA 10.0(配合cuDNN v7.3+)的PaddlePaddle。 +* `python -m pip install paddlepaddle_gpu==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html` 此命令将安装支持CUDA 10.0(配合cuDNN v7.4+)的PaddlePaddle。 diff --git a/doc/paddle/install/install_Windows_en.md b/doc/paddle/install/install_Windows_en.md index c28184ea5..4f2569e6c 100644 --- a/doc/paddle/install/install_Windows_en.md +++ b/doc/paddle/install/install_Windows_en.md @@ -17,6 +17,8 @@ * If you are using Python 3, the output should be 3.5.1+/3.6+/3.7+ + If you are using Python 2, you need to install [Microsoft Visual C++ Compiler for Python 2.7](https://www.microsoft.com/en-us/download/details.aspx?id=44266) + * If Python doesn't match your expected version, use the following command to see if Python's path is where you expect it to be: where python @@ -50,7 +52,7 @@ * If your computer doesn’t have NVIDIA® GPU, please install the CPU version of PaddlePaddle * If your computer has NVIDIA® GPU, and it satisfies the following requirements, we recommend you to install the GPU version of PaddlePaddle - * *CUDA Toolkit 9.0/10.0 with cuDNN v7.3+* + * *CUDA Toolkit 9.0/10.0 with cuDNN v7.4+* * *GPU's computing capability exceeds 1.0* Note: currently, the official Windows installation package only support CUDA 9.0/10.0 with single GPU, and don't include CUDA 9.1/9.2/10.1. if you need to use, please compile by yourself through the source code. @@ -69,16 +71,16 @@ We would like to introduce the pip installation here. ## Installation steps * CPU version of PaddlePaddle: - * `python -m pip install paddlepaddle==2.0.0a0 -i https://mirror.baidu.com/pypi/simple`(Baidu source is recommended) or `python -m pip install paddlepaddle==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple` + * `python -m pip install paddlepaddle==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html` * GPU version of PaddlePaddle: - * `python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://mirror.baidu.com/pypi/simple`(Baidu source is recommended) or `python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple` + * `python -m pip install paddlepaddle_gpu==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html` There is a checking function below for [verifyig whether the installation is successful](#check). If you have any further questions, please check the [FAQ](./FAQ.html). Notice: -* `python -m pip install paddlepaddle-gpu==2.0.0a0 -i https://pypi.tuna.tsinghua.edu.cn/simple` This command will install PaddlePaddle that supports CUDA 10.0(with cuDNN v7.3+). +* `python -m pip install paddlepaddle_gpu==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html` This command will install PaddlePaddle that supports CUDA 10.0(with cuDNN v7.4+). ## Installation Verification After completing the installation process, you can use `python` to enter python interface and input `import paddle.fluid as fluid` and then `fluid.install_check.run_check()` to check whether the installation is successful. -- GitLab