diff --git a/doc/fluid/beginners_guide/install/Tables.md b/doc/fluid/beginners_guide/install/Tables.md index 1644f5bed5e488c2bccb459648cd19f91cddc35d..a6541f0e937ed9fce644951d382ecde451ba7a68 100644 --- a/doc/fluid/beginners_guide/install/Tables.md +++ b/doc/fluid/beginners_guide/install/Tables.md @@ -259,7 +259,8 @@ PaddePaddle通过编译时指定路径来实现引用各种BLAS/CUDA/cuDNN库。

您可以在 [Release History](https://pypi.org/project/paddlepaddle-gpu/#history) 中找到PaddlePaddle-gpu的各个发行版本。 -需要注意的是,在v1.3版本中, paddlepaddle-gpu 命令在windows环境下,会默认安装CUDA 8.0和cuDNN 5编译的PaddlePaddle + +需要注意的是,在v1.3版本中, paddlepaddle-gpu 命令在windows环境下,会默认安装CUDA 8.0和cuDNN 7编译的PaddlePaddle *** @@ -361,27 +362,51 @@ PaddePaddle通过编译时指定路径来实现引用各种BLAS/CUDA/cuDNN库。 paddlepaddle_gpu-1.3.0-cp37-cp37m-linux_x86_64.whl - win_amd64 + win_cpu_noavx_openblas - paddlepaddle-1.3.0-cp27-cp27m-win_amd64.whl - paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl + paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl paddlepaddle-1.3.0-cp36-cp36m-win_amd64.whl paddlepaddle-1.3.0-cp37-cp37m-win_amd64.whl - cuda8.0_cudnn5_win_amd64 + win_cpu_noavx_mkl + - + + paddlepaddle-1.3.0-cp27-cp27m-win_amd64.whl + + paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl + + paddlepaddle-1.3.0-cp36-cp36m-win_amd64.whl + + paddlepaddle-1.3.0-cp37-cp37m-win_amd64.whl + + + win_cpu_avx_openblas - - + + paddlepaddle-1.3.0-cp27-cp27m-win_amd64.whl + + paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl + + paddlepaddle-1.3.0-cp36-cp36m-win_amd64.whl + + paddlepaddle-1.3.0-cp37-cp37m-win_amd64.whl + + + win_cuda8.0_cudnn7_cpu_avx_openblas + - + paddlepaddle_gpu-1.3.0-cp27-cp27m-win_amd64.whl - + paddlepaddle_gpu-1.3.0-cp35-cp35m-win_amd64.whl - + paddlepaddle_gpu-1.3.0-cp36-cp36m-win_amd64.whl - + paddlepaddle_gpu-1.3.0-cp37-cp37m-win_amd64.whl @@ -406,9 +431,6 @@ cuda8.0_cudnn7_avx_mkl: 支持GPU训练和预测,使用avx指令集和Intel mk cuda9.0_cudnn7_avx_mkl: 支持GPU训练和预测,使用avx指令集和Intel mkl数学库 -win_amd64:只支持CPU训练和预测,使用AMD64指令集 - -cuda8.0_cudnn5_win_amd64:支持支持GPU训练和预测,使用AMD64指令集 - 横轴 diff --git a/doc/fluid/beginners_guide/install/Tables_en.md b/doc/fluid/beginners_guide/install/Tables_en.md index f55fca8e9f6c1fcd926a2429658132d3d8b9e751..3b4ea01f7a28208a078f8a1aabd3b030378fdb33 100644 --- a/doc/fluid/beginners_guide/install/Tables_en.md +++ b/doc/fluid/beginners_guide/install/Tables_en.md @@ -261,7 +261,8 @@ 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). -Please note that: paddlepaddle-gpu==1.3.0 in windows, will download package compiled with CUDA 8.0 and cuDNN 5 + +Please note that: paddlepaddle-gpu==1.3.0 in windows, will download package compiled with CUDA 8.0 and cuDNN 7 *** @@ -399,27 +400,51 @@ You can find the docker image for each release of PaddlePaddle in the [DockerHub paddlepaddle_gpu-1.3.0-cp37-cp37m-linux_x86_64.whl - win_amd64 + win_cpu_noavx_openblas - paddlepaddle-1.3.0-cp27-cp27m-win_amd64.whl - paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl + paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl paddlepaddle-1.3.0-cp36-cp36m-win_amd64.whl paddlepaddle-1.3.0-cp37-cp37m-win_amd64.whl - cuda8.0_cudnn5_win_amd64 + win_cpu_noavx_mkl + - + + paddlepaddle-1.3.0-cp27-cp27m-win_amd64.whl + + paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl + + paddlepaddle-1.3.0-cp36-cp36m-win_amd64.whl + + paddlepaddle-1.3.0-cp37-cp37m-win_amd64.whl + + + win_cpu_avx_openblas + - + + paddlepaddle-1.3.0-cp27-cp27m-win_amd64.whl + + paddlepaddle-1.3.0-cp35-cp35m-win_amd64.whl + + paddlepaddle-1.3.0-cp36-cp36m-win_amd64.whl + + paddlepaddle-1.3.0-cp37-cp37m-win_amd64.whl + + + win_cuda8.0_cudnn7_cpu_avx_openblas - - + paddlepaddle_gpu-1.3.0-cp27-cp27m-win_amd64.whl - + paddlepaddle_gpu-1.3.0-cp35-cp35m-win_amd64.whl - + paddlepaddle_gpu-1.3.0-cp36-cp36m-win_amd64.whl - + paddlepaddle_gpu-1.3.0-cp37-cp37m-win_amd64.whl diff --git a/doc/fluid/beginners_guide/install/install_Windows.md b/doc/fluid/beginners_guide/install/install_Windows.md index 8ef5a6be7cfa9754a640d3e22f0948185a475058..746ccf0eda38b7a7ef3ff13d0da0dfd904f36157 100644 --- a/doc/fluid/beginners_guide/install/install_Windows.md +++ b/doc/fluid/beginners_guide/install/install_Windows.md @@ -9,7 +9,7 @@ ### 注意事项 -* 默认提供的安装包需要计算机支持AVX指令集和MKL +* 默认提供的安装包需要计算机支持AVX指令集和MKL,如果您的环境不支持,请在[这里](./Tables.html/#ciwhls-release)下载`no_avx`、`openblas`等版本的安装包 * 当前版本暂不支持NCCL,分布式等相关功能 ## 选择CPU/GPU