提交 cc6e37be 编写于 作者: W wopeizl 提交者: xsrobin

fix the doc for 1.5 test=develop (#990)

* fix the doc for 1.5 test=develop

* test=develop
上级 e743682d
......@@ -12,7 +12,7 @@
* 如果您的计算机没有 NVIDIA® GPU,请编译CPU版的PaddlePaddle
* 如果您的计算机有NVIDIA® GPU,并且满足以下条件,推荐编译GPU版的PaddlePaddle
* *CUDA 工具包8.0配合cuDNN v7*
* *CUDA 工具包8.0/9.2配合cuDNN v7.3+*
* *GPU运算能力超过1.0的硬件设备*
## 安装步骤
......
......@@ -3,13 +3,9 @@
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:
* Windows 10 Family Edition / Professional Edition / Enterprise Edition
* Windows 10 Professional Edition / Enterprise Edition
* Visual Studio 2015 Update3
## Determine which version to compile
* **Only PaddlePaddle for CPU is supported.**
## Choose a compilation method
We provide one compilation method under the Windows system:
......@@ -18,7 +14,7 @@ We provide one compilation method under the Windows system:
Since the situation on host machine is more complicated, we only support specific systems.
Please note: The current version does not support NCCL, distributed, AVX, warpctc and MKL related functions.
Please note: The current version does not support NCCL and distributed related functions.
### ***Local compilation***
......@@ -27,7 +23,7 @@ Please note: The current version does not support NCCL, distributed, AVX, warpct
1. Check that your computer and operating system meet our supported compilation standards
* Windows 10 Family Edition / Professional Edition / Enterprise Edition
* Windows 10 Professional Edition / Enterprise Edition
* Visual Studio 2015 Update3
......@@ -54,7 +50,7 @@ Please note: The current version does not support NCCL, distributed, AVX, warpct
4. Switch to a more stable release branch for compilation :
- `git checkout release/1.2`
- `git checkout release/1.5`
5. Create a directory called build and enter it:
......@@ -76,7 +72,6 @@ Please note: The current version does not support NCCL, distributed, AVX, warpct
-DPYTHON_LIBRARY = $ {PYTHON_LIBRARY}
-DPYTHON_EXECUTABLE = $ {PYTHON_EXECUTABLE} -DWITH_FLUID_ONLY = ON -DWITH_GPU = OFF -DWITH_TESTING =OFF -DCMAKE_BUILD_TYPE=Release`
> If you encounter `Could NOT find PROTOBUF (missing: PROTOBUF_LIBRARY PROTOBUF_INCLUDE_DIR)`, you can re-execute the cmake command.
7. Some third-party dependencies (openblas, snappystream) currently require users to provide pre-compiled versions, or download pre-compiled files from `https://github.com/wopeizl/Paddle_deps` and place the entire `third_party` folder in the `build` directory.
......@@ -102,3 +97,5 @@ After the installation is complete, you can use: `python` to enter the Python in
Please use the following command to uninstall PaddlePaddle:
* ***CPU version of PaddlePaddle*** : `pip uninstall paddlepaddle` or `pip3 uninstall paddlepaddle`
* ***GPU version of PaddlePaddle*** : `pip uninstall paddlepaddle-gpu` or `pip3 uninstall paddlepaddle-gpu`
......@@ -8,7 +8,7 @@
### 注意事项
* 默认提供的安装包需要计算机支持AVX指令集和MKL,如果您的环境不支持,请在[这里](./Tables.html/#ciwhls-release)下载`no_avx``openblas`版本的安装包
* 默认提供的安装包需要计算机支持AVX指令集和MKL,如果您的环境不支持,请在[这里](./Tables.html/#ciwhls-release)下载`openblas`版本的安装包
* 当前版本暂不支持NCCL,分布式等相关功能
## 选择CPU/GPU
......@@ -16,7 +16,7 @@
* 如果您的计算机没有 NVIDIA® GPU,请安装CPU版的PaddlePaddle
* 如果您的计算机有 NVIDIA® GPU,并且满足以下条件,推荐安装GPU版的PaddlePaddle
* *CUDA 工具包8.0配合cuDNN v7*
* *CUDA 工具包8.0/9.2配合cuDNN v7.3+*
* *GPU运算能力超过1.0的硬件设备*
您可参考NVIDIA官方文档了解CUDA和CUDNN的安装流程和配置方法,请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/)
......
......@@ -17,7 +17,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 8.0 with cuDNN v7*
* *CUDA Toolkit 8.0/9.2 with cuDNN v7.3+*
* *GPU's computing capability exceeds 1.0*
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/).
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册