From 47fda9894915c143b7781717786f735fd98af888 Mon Sep 17 00:00:00 2001
From: zhouwei25 <52485244+zhouwei25@users.noreply.github.com>
Date: Mon, 9 Sep 2019 16:16:21 +0800
Subject: [PATCH] CUDA and CUDnn support will need to be updated for Windows
installation (#1142)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
With the release of 1.5.2, CUDA and CUDnn support will also need to be updated for Windows installation.
Now，release of 1.5.2 support CUDA10, and CUDA8 should match up cuDNN v7.1+.
* fix the installation document of Windows, test=document_preview
* CUDA and CUDnn support will need to be updated for Windows installation, test=develop
---
.../beginners_guide/install/compile/compile_Windows.md | 4 ++--
.../beginners_guide/install/compile/compile_Windows_en.md | 4 +---
doc/fluid/beginners_guide/install/install_Windows.md | 8 ++++----
doc/fluid/beginners_guide/install/install_Windows_en.md | 8 ++++----
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/doc/fluid/beginners_guide/install/compile/compile_Windows.md b/doc/fluid/beginners_guide/install/compile/compile_Windows.md
index 7c3f4b228..bf680a7d9 100644
--- a/doc/fluid/beginners_guide/install/compile/compile_Windows.md
+++ b/doc/fluid/beginners_guide/install/compile/compile_Windows.md
@@ -2,7 +2,7 @@
## 环境准备
-* *Windows 7/8/10 专业版/企业版 (64bit) (GPU版本支持CUDA 8/9.2, 且仅支持单卡)*
+* *Windows 7/8/10 专业版/企业版 (64bit) (GPU版本支持CUDA 8.0/9.0/10.0, 且仅支持单卡)*
* *Python 版本 2.7/3.5.1+/3.6/3.7 (64 bit)*
* *pip 或 pip3 版本 9.0.1+ (64 bit)*
* *Visual Studio 2015 Update3*
@@ -12,7 +12,7 @@
* 如果您的计算机没有 NVIDIA® GPU，请编译CPU版的PaddlePaddle
* 如果您的计算机有NVIDIA® GPU，并且满足以下条件，推荐编译GPU版的PaddlePaddle
- * *CUDA 工具包8.0 配合cuDNN v7.1+, 9.0配合cuDNN v7.3+*
+ * *CUDA 工具包8.0配合cuDNN v7.1+, 9.0/10.0配合cuDNN v7.3+*
* *GPU运算能力超过1.0的硬件设备*
## 安装步骤
diff --git a/doc/fluid/beginners_guide/install/compile/compile_Windows_en.md b/doc/fluid/beginners_guide/install/compile/compile_Windows_en.md
index 4255ceb2a..c6a6408a8 100644
--- a/doc/fluid/beginners_guide/install/compile/compile_Windows_en.md
+++ b/doc/fluid/beginners_guide/install/compile/compile_Windows_en.md
@@ -1,4 +1,3 @@
-***
# **Compile on Windows from Source Code**
This instruction will show you how to compile PaddlePaddle on a *64-bit desktop or laptop* and Windows 10. The Windows systems we support must meet the following requirements:
@@ -59,8 +58,7 @@ Please note: The current version does not support NCCL and distributed related f
6. Execute cmake:
- > For details on the compilation options, see [the compilation options list](../Tables.html/#Compile).
-
+ > For details on the compilation options, see [the compilation options list](../Tables.html/#Compile).
* For users who need to compile **the CPU version PaddlePaddle**:
For Python2:`cmake .. -G "Visual Studio 14 2015 Win64" -DPYTHON_INCLUDE_DIR = $ {PYTHON_INCLUDE_DIRS}
diff --git a/doc/fluid/beginners_guide/install/install_Windows.md b/doc/fluid/beginners_guide/install/install_Windows.md
index 1ffd6b1eb..8256b7ce7 100644
--- a/doc/fluid/beginners_guide/install/install_Windows.md
+++ b/doc/fluid/beginners_guide/install/install_Windows.md
@@ -2,7 +2,7 @@
## 环境准备
-* *Windows 7/8/10 专业版/企业版 (64bit) (GPU版本支持CUDA 8.0/9.0，且仅支持单卡)*
+* *Windows 7/8/10 专业版/企业版 (64bit) (GPU版本支持CUDA 8.0/9.0/10.0，且仅支持单卡)*
* *Python 版本 2.7.15+/3.5.1+/3.6/3.7 (64 bit)*
* *pip 或 pip3 版本 9.0.1+ (64 bit)*
@@ -60,10 +60,10 @@
* 如果您的计算机没有 NVIDIA® GPU，请安装CPU版的PaddlePaddle
* 如果您的计算机有 NVIDIA® GPU，并且满足以下条件，推荐安装GPU版的PaddlePaddle
- * *CUDA 工具包8.0配合cuDNN v7.1+， 9.0配合cuDNN v7.3+*
+ * *CUDA 工具包8.0配合cuDNN v7.1+, 9.0/10.0配合cuDNN v7.3+*
* *GPU运算能力超过1.0的硬件设备*
-注: 目前官方发布的windows安装包仅包含 CUDA 8.0/9.0 的单卡模式，不包含 CUDA 9.1/9.2/10.0/10.1，如需使用，请通过源码自行编译。
+注: 目前官方发布的windows安装包仅包含 CUDA 8.0/9.0/10.0 的单卡模式，不包含 CUDA 9.1/9.2/10.1，如需使用，请通过源码自行编译。
您可参考NVIDIA官方文档了解CUDA和CUDNN的安装流程和配置方法，请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)，[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)
@@ -91,7 +91,7 @@ Windows系统下有3种安装方式：
* 如果是python2.7, 建议使用`python`命令; 如果是python3.x, 则建议使用`python3`命令
-* `python -m pip install paddlepaddle-gpu -i https://pypi.tuna.tsinghua.edu.cn/simple` 此命令将安装支持CUDA 8.0/9.0 cuDNN v7.3+的PaddlePaddle，如您对CUDA或cuDNN版本有不同要求，可用`python -m pip install paddlepaddle-gpu==[版本号] -i https://pypi.tuna.tsinghua.edu.cn/simple`或 `python3 -m pip install paddlepaddle-gpu==[版本号] -i https://pypi.tuna.tsinghua.edu.cn/simple`命令来安装，版本号请见[这里](https://pypi.org/project/paddlepaddle-gpu/#history), 关于paddlepaddle与CUDA, cuDNN版本的对应关系请见[安装包列表](./Tables.html/#whls)
+* `python -m pip install paddlepaddle-gpu -i https://pypi.tuna.tsinghua.edu.cn/simple` 此命令将安装支持CUDA 8.0(配合cuDNN v7.1+)或者CUDA 9.0/10.0(配合cuDNN v7.3+)的PaddlePaddle，如您对CUDA或cuDNN版本有不同要求，可用`python -m pip install paddlepaddle-gpu==[版本号] -i https://pypi.tuna.tsinghua.edu.cn/simple`或 `python3 -m pip install paddlepaddle-gpu==[版本号] -i https://pypi.tuna.tsinghua.edu.cn/simple`命令来安装，版本号请见[这里](https://pypi.org/project/paddlepaddle-gpu/#history), 关于paddlepaddle与CUDA, cuDNN版本的对应关系请见[安装包列表](./Tables.html/#whls)
diff --git a/doc/fluid/beginners_guide/install/install_Windows_en.md b/doc/fluid/beginners_guide/install/install_Windows_en.md
index 5dbd5bb95..f06bea82c 100644
--- a/doc/fluid/beginners_guide/install/install_Windows_en.md
+++ b/doc/fluid/beginners_guide/install/install_Windows_en.md
@@ -2,7 +2,7 @@
## Operating Environment
-* *Windows 7/8/10 Pro/Enterprise(64bit)(CUDA 8.0/9.0 are supported, and only single GPU is supported)*
+* *Windows 7/8/10 Pro/Enterprise(64bit)(CUDA 8.0/9.0/10.0 are supported, and only single GPU is supported)*
* *Python 2.7.15+/3.5.1+/3.6/3.7(64bit)*
* *pip or pip3 9.0.1+(64bit)*
@@ -16,10 +16,10 @@
* 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 8.0/9.0 with cuDNN v7.3+*
+ * *CUDA Toolkit 8.0 with cuDNN v7.1+, or 9.0/10.0 with cuDNN v7.3+*
* *GPU's computing capability exceeds 1.0*
-Note: currently, the official Windows installation package only support CUDA 8.0/9.0 with single GPU, and don't support CUDA 9.1/9.2/10.0/10.1. if you need to use, please compile by yourself through the source code.
+Note: currently, the official Windows installation package only support CUDA 8.0/9.0/10.0 with single GPU, and don't support CUDA 9.1/9.2/10.1. if you need to use, please compile by yourself through the source code.
Please refer to the NVIDIA official documents for the installation process and the configuration methods of [CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/) and [cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/).
@@ -43,7 +43,7 @@ There is a checking function below for [verifyig whether the installation is suc
Notice:
* The version of pip and the version of python should be corresponding: python2.7 corresponds to `pip`; python3.x corresponds to `pip3`.
-* `pip install paddlepaddle-gpu` This command will install PaddlePaddle that supports CUDA 8.0/9.0 cuDNN v7.3+, Currently, PaddlePaddle doesn't support any other version of CUDA or cuDNN on Windows.
+* `pip install paddlepaddle-gpu` This command will install PaddlePaddle that supports CUDA 8.0(with cuDNN v7.1+), or CUDA 9.0/10.0(with cuDNN v7.3+).
## Installation Verification
--
GitLab