From 73b72da4ac4ea5bd3bd7268aae6f466f77d4df12 Mon Sep 17 00:00:00 2001 From: tianshuo78520a <707759223@qq.com> Date: Tue, 15 Sep 2020 18:57:23 +0800 Subject: [PATCH] fix windows pip install (#2635) * fix windows pip install * change = * change = * fix die link * fix --- doc/paddle/install/index_cn.rst | 8 ++++++++ doc/paddle/install/index_en.rst | 27 ++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/doc/paddle/install/index_cn.rst b/doc/paddle/install/index_cn.rst index 7e4a5f70b..8fe0f24e5 100644 --- a/doc/paddle/install/index_cn.rst +++ b/doc/paddle/install/index_cn.rst @@ -187,6 +187,10 @@ python -m pip install paddlepaddle==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple + 如果您是使用Windows系统请使用以下指令: + + pip install paddlepaddle==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html + 如果您是使用 Python 3,请将上述命令中的 **python** 更换为 **python3** 进行安装 (2). **GPU版本** :如果您想使用GPU版本请参考如下命令安装 @@ -203,6 +207,10 @@ 或 python -m pip install paddlepaddle-gpu==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple + + 如果您是使用Windows系统请使用以下指令: + + python -m pip install paddlepaddle_gpu==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html 如果您是使用 Python 3,请将上述命令中的 **python** 更换为 **python3** 进行安装。 diff --git a/doc/paddle/install/index_en.rst b/doc/paddle/install/index_en.rst index 0f337d513..f3d4be681 100644 --- a/doc/paddle/install/index_en.rst +++ b/doc/paddle/install/index_en.rst @@ -1,12 +1,13 @@ .. _install_introduction_: -====================== + +============================ Installation Manuals -====================== +============================ The manuals will guide you to build and install PaddlePaddle on your 64-bit desktop or laptop. 1. Operating system requirements: -============================ +================================= * Windows 7 / 8 / 10, Pro/Enterprise * Ubuntu 14.04 / 16.04 / 18.04 @@ -15,13 +16,13 @@ The manuals will guide you to build and install PaddlePaddle on your 64-bit desk * 64-bit operating system is required 2. Processor requirements: -============================ +========================== * Processor supports MKL * The processor architecture is x86_64(or called x64, Intel 64, AMD64). Currently, PaddlePaddle does not support arm64. 3. Version requirements of python and pip: -============================ +========================================== * Python 2 requires version 2.7.15+ * Python 3 requires version 3.5.1+/3.6/3.7 @@ -29,7 +30,7 @@ The manuals will guide you to build and install PaddlePaddle on your 64-bit desk * Python and pip requires 64-bit 4. PaddlePaddle's support for GPU: -================================= +================================== * Currently, **PaddlePaddle** only supports **CUDA** driver of **NVIDIA** graphics card. * You need to install `cuDNN `_ , and version 7.6+ is required(For CUDA9/10) @@ -64,7 +65,7 @@ The manuals will guide you to build and install PaddlePaddle on your 64-bit desk Please make sure your environment meets the above conditions. If you have other requirements, please refer to `Appendix `_ . 5. PaddlePaddle's support for NCCL: -================================= +=================================== * Support for Windows @@ -97,7 +98,7 @@ Please make sure your environment meets the above conditions. If you have other The first way to install: use pip to install -================================ +============================================ You can choose any of the four ways to install: "use pip to install", "use Conda to install", "use Docker to install", "compiling from the source code" @@ -188,6 +189,10 @@ This section describes how to use pip to install. python -m pip install paddlepaddle==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple + If you are using Windows environment, please use the following instruction: + + python -m pip install paddlepaddle==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html + If you are using Python 3, please change **python** in the above command to **python3** and install. @@ -206,6 +211,10 @@ This section describes how to use pip to install. or python -m pip install paddlepaddle-gpu==2.0.0b0 -i https://pypi.tuna.tsinghua.edu.cn/simple + + If you are using Windows environment, please use the following instruction: + + python -m pip install paddlepaddle_gpu==2.0.0b0 -f https://paddlepaddle.org.cn/whl/stable.html If you are using Python 3, please change **python** in the above command to **python3** and install. @@ -228,7 +237,7 @@ This section describes how to use pip to install. The second way to install: compile and install with source code -==================================== +=============================================================== - If you use PaddlePaddle only, we suggest you installation methods **pip** to install. - If you need to develop PaddlePaddle, please refer to `compile from source code `_ -- GitLab