From 0cecc40d6aa3c272655fae10ae637acefa5746ee Mon Sep 17 00:00:00 2001 From: zhengqiwen1997 Date: Fri, 24 Feb 2023 08:00:09 +0000 Subject: [PATCH 1/4] 2.4.1 to 2.4.2 and macOS avx installation --- docs/design/phi/design_cn.md | 2 +- docs/design/phi/design_en.md | 2 +- docs/install/Tables.md | 208 ++++++++++++------------- docs/install/Tables_en.md | 208 ++++++++++++------------- docs/install/conda/linux-conda.md | 10 +- docs/install/conda/linux-conda_en.md | 10 +- docs/install/conda/macos-conda.md | 2 +- docs/install/conda/macos-conda_en.md | 2 +- docs/install/conda/windows-conda.md | 10 +- docs/install/conda/windows-conda_en.md | 10 +- docs/install/docker/linux-docker.md | 52 +++---- docs/install/docker/linux-docker_en.md | 52 +++---- docs/install/docker/macos-docker.md | 24 +-- docs/install/docker/macos-docker_en.md | 24 +-- docs/install/index_cn.rst | 8 +- docs/install/index_en.rst | 8 +- docs/install/pip/linux-pip.md | 18 +-- docs/install/pip/linux-pip_en.md | 18 +-- docs/install/pip/macos-pip.md | 17 +- docs/install/pip/macos-pip_en.md | 17 +- docs/install/pip/windows-pip.md | 18 +-- docs/install/pip/windows-pip_en.md | 18 +-- 22 files changed, 358 insertions(+), 380 deletions(-) diff --git a/docs/design/phi/design_cn.md b/docs/design/phi/design_cn.md index bc5043e07ed..b159c44f8e7 100644 --- a/docs/design/phi/design_cn.md +++ b/docs/design/phi/design_cn.md @@ -1192,7 +1192,7 @@ REGISTER_OPERATOR(sign, ops::SignOp, ops::SignOpMaker, > 本节要点： > 1. 支持新形式 Kernel 在现有静态图和动态图体系中调用，难点在于解决多参数 Op 到少参数 Kernel 的匹配问题 -#### 2.4.1 ArgumentMapping 体系设计 +#### 2.4.2 ArgumentMapping 体系设计 由于新形式 Kernel 参数列表与 Python API 对齐，和原先的 OpMaker 中注册的参数列表存在差异，导致新形式 Kernel 在原先 fluid 体系中调用时会很难匹配。 diff --git a/docs/design/phi/design_en.md b/docs/design/phi/design_en.md index 9d6cd489481..9080953c3d8 100644 --- a/docs/design/phi/design_en.md +++ b/docs/design/phi/design_en.md @@ -1192,7 +1192,7 @@ So far, after the original Op's `InferShape` function has been migrated to PHI ` > Highlights of this section: > 1. Support the new form of Kernel to be called in the existing static graph and dynamic graph architecture, the difficulty lies in solving the matching problem of multi-parameter Op to few-parameter Kernel. -#### 2.4.1 ArgumentMapping Architecture Design +#### 2.4.2 ArgumentMapping Architecture Design The parameter list of the new form of Kernel is aligned with the Python API, which is different from the parameter list registered in the original `OpMaker`, this makes it difficult to match when the new form of Kernel is called in the original fluid architecture. diff --git a/docs/install/Tables.md b/docs/install/Tables.md index 5d5e8a80506..c80307069a1 100644 --- a/docs/install/Tables.md +++ b/docs/install/Tables.md @@ -320,11 +320,11 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库 - paddlepaddle==[版本号] 例如 paddlepaddle==2.4.1 + paddlepaddle==[版本号] 例如 paddlepaddle==2.4.2 只支持 CPU 对应版本的 PaddlePaddle，具体版本请参见Pypi - paddlepaddle-gpu==[版本号] 例如 paddlepaddle-gpu==2.4.1 + paddlepaddle-gpu==[版本号] 例如 paddlepaddle-gpu==2.4.2 默认安装支持 CUDA 10.2 和 cuDNN 7 的对应[版本号]的 PaddlePaddle 安装包 @@ -334,7 +334,7 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库 您可以在 [Release History](https://pypi.org/project/paddlepaddle-gpu/#history) 中找到 PaddlePaddle-gpu 的各个发行版本。 > 其中`postXX` 对应的是 CUDA 和 cuDNN 的版本，`postXX`之前的数字代表 Paddle 的版本 -需要注意的是，命令中 paddlepaddle-gpu==2.4.1 在 windows 环境下，会默认安装支持 CUDA 10.2 和 cuDNN 7 的对应[版本号]的 PaddlePaddle 安装包 +需要注意的是，命令中 paddlepaddle-gpu==2.4.2 在 windows 环境下，会默认安装支持 CUDA 10.2 和 cuDNN 7 的对应[版本号]的 PaddlePaddle 安装包

@@ -356,17 +356,17 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库 cpu-mkl-avx - paddlepaddle-2.4.1-cp36-cp36m-linux_x86_64.whl - paddlepaddle-2.4.1-cp37-cp37m-linux_x86_64.whl - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl - paddlepaddle-2.4.1-cp39-cp39-linux_x86_64.whl - paddlepaddle-2.4.1-cp310-cp310-linux_x86_64.whl + paddlepaddle-2.4.2-cp36-cp36m-linux_x86_64.whl + paddlepaddle-2.4.2-cp37-cp37m-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp39-cp39-linux_x86_64.whl + paddlepaddle-2.4.2-cp310-cp310-linux_x86_64.whl cpu-openblas-avx - - - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl - - @@ -374,7 +374,7 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库 cpu-mkl-noavx - - - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl - - @@ -382,121 +382,121 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库 cpu-openblas-noavx - - - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl - - cuda10.2-cudnn7-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp310-cp310-linux_x86_64.whl cuda10.2-cudnn7-mkl-gcc8.2-noavx - - - - paddlepaddle_gpu-2.4.1-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp38-cp38-linux_x86_64.whl - - cuda11.2-cudnn8.1-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1.post112-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp310-cp310-linux_x86_64.whl cuda11.6-cudnn8.4-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1.post116-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp310-cp310-linux_x86_64.whl cuda11.7-cudnn8.4-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1.post117-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp310-cp310-linux_x86_64.whl macos-cpu-openblas - - paddlepaddle-2.4.1-cp36-cp36m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp37-cp37m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp38-cp38-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp39-cp39-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp310-cp310-macosx_10_14_universal2.whl + + paddlepaddle-2.4.2-cp36-cp36m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp37-cp37m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp38-cp38-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp39-cp39-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp310-cp310-macosx_10_14_universal2.whl macos-cpu-openblas-noavx - - paddlepaddle-2.4.1-cp36-cp36m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp37-cp37m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp38-cp38-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp39-cp39-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp310-cp310-macosx_10_14_universal2.whl + + paddlepaddle-2.4.2-cp36-cp36m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp37-cp37m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp38-cp38-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp39-cp39-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp310-cp310-macosx_10_14_universal2.whl macos-cpu-openblas-m1 - - - - paddlepaddle-2.4.1-cp38-cp38-macosx_11_0_arm64.whl - - paddlepaddle-2.4.1-cp39-cp39-macosx_11_0_arm64.whl - - paddlepaddle-2.4.1-cp310-cp310-macosx_11_0_arm64.whl + + paddlepaddle-2.4.2-cp38-cp38-macosx_11_0_arm64.whl + + paddlepaddle-2.4.2-cp39-cp39-macosx_11_0_arm64.whl + + paddlepaddle-2.4.2-cp310-cp310-macosx_11_0_arm64.whl win-cpu-mkl-avx - paddlepaddle-2.4.1-cp36-cp36m-win_amd64.whl - paddlepaddle-2.4.1-cp37-cp37m-win_amd64.whl - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl - paddlepaddle-2.4.1-cp39-cp39-win_amd64.whl - paddlepaddle-2.4.1-cp310-cp310-win_amd64.whl + paddlepaddle-2.4.2-cp36-cp36m-win_amd64.whl + paddlepaddle-2.4.2-cp37-cp37m-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp39-cp39-win_amd64.whl + paddlepaddle-2.4.2-cp310-cp310-win_amd64.whl win-cpu-mkl-noavx - - - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl - - @@ -504,7 +504,7 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库 win-cpu-openblas-avx - - - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl - - @@ -512,41 +512,41 @@ PaddePaddle 通过编译时指定路径来实现引用各种 BLAS/CUDA/cuDNN 库 win-cpu-openblas-noavx - - - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl - - win-cuda10.2-cudnn7-mkl-vs2017-avx - paddlepaddle_gpu-2.4.1-cp36-cp36m-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp38-cp38-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp39-cp39-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp310-cp310-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp36-cp36m-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp39-cp39-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp310-cp310-win_amd64.whl win-cuda10.2-cudnn7-mkl-vs2017-noavx - - paddlepaddle_gpu-2.4.1-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp38-cp38-win_amd64.whl - - win-cuda11.2-cudnn8.2-mkl-vs2017-avx - paddlepaddle_gpu-2.4.1.post112-cp36-cp36m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp38-cp38-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp39-cp39-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp310-cp310-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp36-cp36m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp39-cp39-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp310-cp310-win_amd64.whl win-cuda11.6-cudnn8.4-mkl-vs2017-avx - paddlepaddle_gpu-2.4.1.post116-cp36-cp36m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp38-cp38-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp39-cp39-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp310-cp310-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp36-cp36m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp39-cp39-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp310-cp310-win_amd64.whl diff --git a/docs/install/Tables_en.md b/docs/install/Tables_en.md index 2b333c267d2..20c1878ccd7 100644 --- a/docs/install/Tables_en.md +++ b/docs/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.4.1 + paddlepaddle==[version code] such as paddlepaddle==2.4.2 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.4.1 + paddlepaddle-gpu==[version code], such as paddlepaddle-gpu==2.4.2 The default installation supports the PaddlePaddle installation package corresponding to [version number] of CUDA 10.2 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.4.1 will install the installation package of PaddlePaddle that supports CUDA 10.2 and cuDNN 7 by default under Windows environment. +Please note that: in the commands, paddlepaddle-gpu==2.4.2 will install the installation package of PaddlePaddle that supports CUDA 10.2 and cuDNN 7 by default under Windows environment. @@ -258,17 +258,17 @@ Please note that: in the commands, paddlepaddle-gpu==2.4.1 will i cpu-mkl-avx - paddlepaddle-2.4.1-cp36-cp36m-linux_x86_64.whl - paddlepaddle-2.4.1-cp37-cp37m-linux_x86_64.whl - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl - paddlepaddle-2.4.1-cp39-cp39-linux_x86_64.whl - paddlepaddle-2.4.1-cp310-cp310-linux_x86_64.whl + paddlepaddle-2.4.2-cp36-cp36m-linux_x86_64.whl + paddlepaddle-2.4.2-cp37-cp37m-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp39-cp39-linux_x86_64.whl + paddlepaddle-2.4.2-cp310-cp310-linux_x86_64.whl cpu-openblas-avx - - - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl - - @@ -276,7 +276,7 @@ Please note that: in the commands, paddlepaddle-gpu==2.4.1 will i cpu-mkl-noavx - - - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl - - @@ -284,121 +284,121 @@ Please note that: in the commands, paddlepaddle-gpu==2.4.1 will i cpu-openblas-noavx - - - paddlepaddle-2.4.1-cp38-cp38-linux_x86_64.whl + paddlepaddle-2.4.2-cp38-cp38-linux_x86_64.whl - - cuda10.2-cudnn7-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp310-cp310-linux_x86_64.whl cuda10.2-cudnn7-mkl-gcc8.2-noavx - - - - paddlepaddle_gpu-2.4.1-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2-cp38-cp38-linux_x86_64.whl - - cuda11.2-cudnn8.1-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1.post112-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post112-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post112-cp310-cp310-linux_x86_64.whl cuda11.6-cudnn8.4-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1.post116-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post116-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post116-cp310-cp310-linux_x86_64.whl cuda11.7-cudnn8.4-mkl-gcc8.2-avx - - paddlepaddle_gpu-2.4.1.post117-cp36-cp36m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp37-cp37m-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp38-cp38-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp39-cp39-linux_x86_64.whl - - paddlepaddle_gpu-2.4.1.post117-cp310-cp310-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp36-cp36m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp37-cp37m-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp38-cp38-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp39-cp39-linux_x86_64.whl + + paddlepaddle_gpu-2.4.2.post117-cp310-cp310-linux_x86_64.whl macos-cpu-openblas - - paddlepaddle-2.4.1-cp36-cp36m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp37-cp37m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp38-cp38-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp39-cp39-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp310-cp310-macosx_10_14_universal2.whl + + paddlepaddle-2.4.2-cp36-cp36m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp37-cp37m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp38-cp38-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp39-cp39-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp310-cp310-macosx_10_14_universal2.whl macos-cpu-openblas-noavx - - paddlepaddle-2.4.1-cp36-cp36m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp37-cp37m-macosx_10_6_intel.whl - - paddlepaddle-2.4.1-cp38-cp38-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp39-cp39-macosx_10_14_x86_64.whl - - paddlepaddle-2.4.1-cp310-cp310-macosx_10_14_universal2.whl + + paddlepaddle-2.4.2-cp36-cp36m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp37-cp37m-macosx_10_6_intel.whl + + paddlepaddle-2.4.2-cp38-cp38-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp39-cp39-macosx_10_14_x86_64.whl + + paddlepaddle-2.4.2-cp310-cp310-macosx_10_14_universal2.whl macos-cpu-openblas-m1 - - - - paddlepaddle-2.4.1-cp38-cp38-macosx_11_0_arm64.whl - - paddlepaddle-2.4.1-cp39-cp39-macosx_11_0_arm64.whl - - paddlepaddle-2.4.1-cp310-cp310-macosx_11_0_arm64.whl + + paddlepaddle-2.4.2-cp38-cp38-macosx_11_0_arm64.whl + + paddlepaddle-2.4.2-cp39-cp39-macosx_11_0_arm64.whl + + paddlepaddle-2.4.2-cp310-cp310-macosx_11_0_arm64.whl win-cpu-mkl-avx - paddlepaddle-2.4.1-cp36-cp36m-win_amd64.whl - paddlepaddle-2.4.1-cp37-cp37m-win_amd64.whl - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl - paddlepaddle-2.4.1-cp39-cp39-win_amd64.whl - paddlepaddle-2.4.1-cp310-cp310-win_amd64.whl + paddlepaddle-2.4.2-cp36-cp36m-win_amd64.whl + paddlepaddle-2.4.2-cp37-cp37m-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp39-cp39-win_amd64.whl + paddlepaddle-2.4.2-cp310-cp310-win_amd64.whl win-cpu-mkl-noavx - - - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl - - @@ -406,7 +406,7 @@ Please note that: in the commands, paddlepaddle-gpu==2.4.1 will i win-cpu-openblas-avx - - - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl - - @@ -414,42 +414,42 @@ Please note that: in the commands, paddlepaddle-gpu==2.4.1 will i win-cpu-openblas-noavx - - - paddlepaddle-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle-2.4.2-cp38-cp38-win_amd64.whl - - win-cuda10.2-cudnn7-mkl-vs2017-avx - paddlepaddle_gpu-2.4.1-cp36-cp36m-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp38-cp38-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp39-cp39-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp310-cp310-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp36-cp36m-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp39-cp39-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp310-cp310-win_amd64.whl win-cuda10.2-cudnn7-mkl-vs2017-noavx - - paddlepaddle_gpu-2.4.1-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2-cp38-cp38-win_amd64.whl - - win-cuda11.2-cudnn8.2-mkl-vs2017-avx - paddlepaddle_gpu-2.4.1.post112-cp36-cp36m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp38-cp38-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp39-cp39-win_amd64.whl - paddlepaddle_gpu-2.4.1.post112-cp310-cp310-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp36-cp36m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp39-cp39-win_amd64.whl + paddlepaddle_gpu-2.4.2.post112-cp310-cp310-win_amd64.whl win-cuda11.6-cudnn8.4-mkl-vs2017-avx - paddlepaddle_gpu-2.4.1.post116-cp36-cp36m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp37-cp37m-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp38-cp38-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp39-cp39-win_amd64.whl - paddlepaddle_gpu-2.4.1.post116-cp310-cp310-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp36-cp36m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp37-cp37m-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp38-cp38-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp39-cp39-win_amd64.whl + paddlepaddle_gpu-2.4.2.post116-cp310-cp310-win_amd64.whl diff --git a/docs/install/conda/linux-conda.md b/docs/install/conda/linux-conda.md index 4b6b84daa72..aa85bf91a95 100644 --- a/docs/install/conda/linux-conda.md +++ b/docs/install/conda/linux-conda.md @@ -89,7 +89,7 @@ python3 -c "import platform;print(platform.architecture()[0]);print(platform.mac 如果您的计算机没有 NVIDIA® GPU，请安装 CPU 版的 PaddlePaddle ``` -conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -100,26 +100,26 @@ conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn * 对于 `CUDA 10.2`，需要搭配 cuDNN 7.6.5(多卡环境下 NCCL>=2.7)，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * 对于 `CUDA 11.2`，需要搭配 cuDNN 8.2.1(多卡环境下 NCCL>=2.7)，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * 对于 `CUDA 11.6`，需要搭配 cuDNN 8.4.0(多卡环境下 NCCL>=2.7)，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * 对于 `CUDA 11.7`，需要搭配 cuDNN 8.4.1(多卡环境下 NCCL>=2.7)，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` 您可参考 NVIDIA 官方文档了解 CUDA 和 CUDNN 的安装流程和配置方法，请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)，[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/) diff --git a/docs/install/conda/linux-conda_en.md b/docs/install/conda/linux-conda_en.md index 6cd6a8ffcca..c15884e486c 100644 --- a/docs/install/conda/linux-conda_en.md +++ b/docs/install/conda/linux-conda_en.md @@ -94,7 +94,7 @@ You can choose the following version of PaddlePaddle to start installation: If your computer doesn't have NVIDIA® GPU, please install `the CPU Version of PaddlePaddle` ``` -conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -105,25 +105,25 @@ conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn * If you are usingCUDA 10.2，cuDNN 7.6.5(for multi card support, NCCL>=2.7): ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * If you are using CUDA 11.2，cuDNN 8.2.1(for multi card support, NCCL>=2.7): ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * If you are using CUDA 11.6，cuDNN 8.4.0(for multi card support, NCCL>=2.7): ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * If you are using CUDA 11.7，cuDNN 8.4.1(for multi card support, NCCL>=2.7): ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` You can refer to NVIDIA official documents for installation process and configuration method of CUDA and cudnn. Please refer to [CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)，[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/) diff --git a/docs/install/conda/macos-conda.md b/docs/install/conda/macos-conda.md index 040dda5f02c..9c801f20d62 100644 --- a/docs/install/conda/macos-conda.md +++ b/docs/install/conda/macos-conda.md @@ -83,7 +83,7 @@ python3 -c "import platform;print(platform.architecture()[0]);print(platform.mac * 目前在 MacOS 环境仅支持 CPU 版 PaddlePaddle，请参考如下命令安装 Paddle: ``` - conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle==2.4.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` ## **三、验证安装** diff --git a/docs/install/conda/macos-conda_en.md b/docs/install/conda/macos-conda_en.md index 3d4c55461d7..f87d7246e1e 100644 --- a/docs/install/conda/macos-conda_en.md +++ b/docs/install/conda/macos-conda_en.md @@ -87,7 +87,7 @@ conda config --set show_channel_urls yes * Currently, only the CPU version of PaddlePaddle is supported in the MacOS environment. Please use the following command to install PaddlePaddle： ``` - conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle==2.4.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` diff --git a/docs/install/conda/windows-conda.md b/docs/install/conda/windows-conda.md index 20f1c718de7..22ff9f315ff 100644 --- a/docs/install/conda/windows-conda.md +++ b/docs/install/conda/windows-conda.md @@ -91,7 +91,7 @@ python -c "import platform;print(platform.architecture()[0]);print(platform.mach 如果您的计算机没有 NVIDIA® GPU，请安装 CPU 版的 PaddlePaddle ``` -conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -102,25 +102,25 @@ conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn * 对于 `CUDA 10.2`，需要搭配 cuDNN 7.6.5，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * 对于 `CUDA 11.2`，需要搭配 cuDNN 8.2.1，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * 对于 `CUDA 11.6`，需要搭配 cuDNN 8.4.0，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * 对于 `CUDA 11.7`，需要搭配 cuDNN 8.4.1，安装命令为: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` 您可参考 NVIDIA 官方文档了解 CUDA 和 CUDNN 的安装流程和配置方法，请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)，[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/) diff --git a/docs/install/conda/windows-conda_en.md b/docs/install/conda/windows-conda_en.md index 7d6c568ef9a..23c93671be3 100644 --- a/docs/install/conda/windows-conda_en.md +++ b/docs/install/conda/windows-conda_en.md @@ -96,7 +96,7 @@ You can choose the following version of PaddlePaddle to start installation: If your computer doesn't have NVIDIA® GPU, please install `the CPU Version of PaddlePaddle` ``` -conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ +conda install paddlepaddle==2.4.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` @@ -108,25 +108,25 @@ conda install paddlepaddle==2.4.1 --channel https://mirrors.tuna.tsinghua.edu.cn * If you are usingCUDA 10.2，cuDNN 7.6.5: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=10.2 --channel https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ ``` * If you are using CUDA 11.2，cuDNN 8.2.1: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.2 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * If you are using CUDA 11.6，cuDNN 8.4.0: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.6 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` * If you are using CUDA 11.7，cuDNN 8.4.1: ``` - conda install paddlepaddle-gpu==2.4.1 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge + conda install paddlepaddle-gpu==2.4.2 cudatoolkit=11.7 -c https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/Paddle/ -c conda-forge ``` You can refer to NVIDIA official documents for installation process and configuration method of CUDA and cudnn. Please refer to [CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/)，[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/) diff --git a/docs/install/docker/linux-docker.md b/docs/install/docker/linux-docker.md index 2af8035cdaf..60d78e7fbf1 100644 --- a/docs/install/docker/linux-docker.md +++ b/docs/install/docker/linux-docker.md @@ -21,46 +21,46 @@ * CPU 版的 PaddlePaddle： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1 + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2 ``` * CPU 版的 PaddlePaddle，且镜像中预装好了 jupyter： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` * GPU 版的 PaddlePaddle： ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 ``` ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.2-cudnn8.2-trt8.0 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.2-cudnn8.2-trt8.0 ``` ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.7-cudnn8.4-trt8.4 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.7-cudnn8.4-trt8.4 ``` 如果您的机器不在中国大陆地区，可以直接从 DockerHub 拉取镜像： * CPU 版的 PaddlePaddle： ``` - docker pull paddlepaddle/paddle:2.4.1 + docker pull paddlepaddle/paddle:2.4.2 ``` * CPU 版的 PaddlePaddle，且镜像中预装好了 jupyter： ``` - docker pull paddlepaddle/paddle:2.4.1-jupyter + docker pull paddlepaddle/paddle:2.4.2-jupyter ``` * GPU 版的 PaddlePaddle： ``` - nvidia-docker pull paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 + nvidia-docker pull paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 ``` ``` - nvidia-docker pull paddlepaddle/paddle:2.4.1-gpu-cuda11.2-cudnn8.2-trt8.0 + nvidia-docker pull paddlepaddle/paddle:2.4.2-gpu-cuda11.2-cudnn8.2-trt8.0 ``` ``` - nvidia-docker pull paddlepaddle/paddle:2.4.1-gpu-cuda11.7-cudnn8.4-trt8.4 + nvidia-docker pull paddlepaddle/paddle:2.4.2-gpu-cuda11.7-cudnn8.4-trt8.4 ``` 您还可以访问[DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/)获取更多镜像。 @@ -72,7 +72,7 @@ ``` - docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1 /bin/bash + docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2 /bin/bash ``` - `--name paddle_docker`：设定 Docker 的名称，`paddle_docker` 是自己设置的名称； @@ -83,7 +83,7 @@ - `-v $PWD:/paddle`：指定将当前路径（PWD 变量会展开为当前路径的绝对路径）挂载到容器内部的 /paddle 目录； - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1`：指定需要使用的 image 名称，您可以通过`docker images`命令查看；/bin/bash 是在 Docker 中要执行的命令 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2`：指定需要使用的 image 名称，您可以通过`docker images`命令查看；/bin/bash 是在 Docker 中要执行的命令 * 使用 CPU 版本的 PaddlePaddle，且镜像中预装好了 jupyter： @@ -98,7 +98,7 @@ cd ./jupyter_docker ``` ``` - docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` - `--rm`：关闭容器后删除容器； @@ -109,13 +109,13 @@ - `-v $PWD:/home/paddle`：指定将当前路径（PWD 变量会展开为当前路径的绝对路径）挂载到容器内部的 /home/paddle 目录； - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter`：指定需要使用的 image 名称，您可以通过`docker images`命令查看 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter`：指定需要使用的 image 名称，您可以通过`docker images`命令查看 * 使用 GPU 版本的 PaddlePaddle： ``` - nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 /bin/bash + nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 /bin/bash ``` - `--name paddle_docker`：设定 Docker 的名称，`paddle_docker` 是自己设置的名称； @@ -126,7 +126,7 @@ - `-v $PWD:/paddle`：指定将当前路径（PWD 变量会展开为当前路径的绝对路径）挂载到容器内部的 /paddle 目录； - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0`：指定需要使用的 image 名称，如果您希望使用 CUDA 11.2 或 CUDA 11.7 的镜像，也可以将其替换成`registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.2-cudnn8.2-trt8.0` 或 `registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.7-cudnn8.4-trt8.4`。您可以通过`docker images`命令查看镜像。/bin/bash 是在 Docker 中要执行的命令 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0`：指定需要使用的 image 名称，如果您希望使用 CUDA 11.2 或 CUDA 11.7 的镜像，也可以将其替换成`registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.2-cudnn8.2-trt8.0` 或 `registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.7-cudnn8.4-trt8.4`。您可以通过`docker images`命令查看镜像。/bin/bash 是在 Docker 中要执行的命令 @@ -145,24 +145,24 @@ - registry.baidubce.com/paddlepaddle/paddle:2.4.1 - 安装了 2.4.1 版本 paddle 的 CPU 镜像 + registry.baidubce.com/paddlepaddle/paddle:2.4.2 + 安装了 2.4.2 版本 paddle 的 CPU 镜像 - registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter - 安装了 2.4.1 版本 paddle 的 CPU 镜像，且镜像中预装好了 jupyter，启动 docker 即运行 jupyter 服务 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter + 安装了 2.4.2 版本 paddle 的 CPU 镜像，且镜像中预装好了 jupyter，启动 docker 即运行 jupyter 服务 - registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.7-cudnn8.4-trt8.4 - 安装了 2.4.1 版本 paddle 的 GPU 镜像，cuda 版本为 11.7，cudnn 版本为 8.4，trt 版本为 8.4 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.7-cudnn8.4-trt8.4 + 安装了 2.4.2 版本 paddle 的 GPU 镜像，cuda 版本为 11.7，cudnn 版本为 8.4，trt 版本为 8.4 - registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.2-cudnn8.2-trt8.0 - 安装了 2.4.1 版本 paddle 的 GPU 镜像，cuda 版本为 11.2，cudnn 版本为 8.2，trt 版本为 8.0 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.2-cudnn8.2-trt8.0 + 安装了 2.4.2 版本 paddle 的 GPU 镜像，cuda 版本为 11.2，cudnn 版本为 8.2，trt 版本为 8.0 - registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 - 安装了 2.4.1 版本 paddle 的 GPU 镜像，cuda 版本为 10.2，cudnn 版本为 7.6，trt 版本为 7.0 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 + 安装了 2.4.2 版本 paddle 的 GPU 镜像，cuda 版本为 10.2，cudnn 版本为 7.6，trt 版本为 7.0 diff --git a/docs/install/docker/linux-docker_en.md b/docs/install/docker/linux-docker_en.md index 16da62ee1a7..7a33f057f75 100644 --- a/docs/install/docker/linux-docker_en.md +++ b/docs/install/docker/linux-docker_en.md @@ -21,46 +21,46 @@ For domestic users, when downloading docker is slow due to network problems, you * CPU version of PaddlePaddle： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1 + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2 ``` * CPU version of PaddlePaddle, and the image is pre-installed with jupyter： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` * GPU version of PaddlePaddle： ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 ``` ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.2-cudnn8.2-trt8.0 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.2-cudnn8.2-trt8.0 ``` ``` - nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.7-cudnn8.4-trt8.4 + nvidia-docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.7-cudnn8.4-trt8.4 ``` If your machine is not in mainland China, you can pull the image directly from DockerHub: * CPU version of PaddlePaddle： ``` - docker pull paddlepaddle/paddle:2.4.1 + docker pull paddlepaddle/paddle:2.4.2 ``` * CPU version of PaddlePaddle, and the image is pre-installed with jupyter： ``` - docker pull paddlepaddle/paddle:2.4.1-jupyter + docker pull paddlepaddle/paddle:2.4.2-jupyter ``` * GPU version of PaddlePaddle： ``` - nvidia-docker pull paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 + nvidia-docker pull paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 ``` ``` - nvidia-docker pull paddlepaddle/paddle:2.4.1-gpu-cuda11.2-cudnn8.2-trt8.0 + nvidia-docker pull paddlepaddle/paddle:2.4.2-gpu-cuda11.2-cudnn8.2-trt8.0 ``` ``` - nvidia-docker pull paddlepaddle/paddle:2.4.1-gpu-cuda11.7-cudnn8.4-trt8.4 + nvidia-docker pull paddlepaddle/paddle:2.4.2-gpu-cuda11.7-cudnn8.4-trt8.4 ``` You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to get more images. @@ -72,7 +72,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g ``` - docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1 /bin/bash + docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2 /bin/bash ``` - `--name paddle_docker`: set name of Docker, `paddle_docker` is name of docker you set; @@ -83,7 +83,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g - `-v $PWD:/paddle`: Specifies to mount the current path of the host (PWD variable in Linux will expand to the absolute path of the current path) to the /paddle directory inside the container; - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1`: Specify the name of the image to be used. You can view it through the 'docker images' command. /bin/Bash is the command to be executed in Docker + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2`: Specify the name of the image to be used. You can view it through the 'docker images' command. /bin/Bash is the command to be executed in Docker * Use GPU version of PaddlePaddle： @@ -91,7 +91,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g ``` - nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 /bin/bash + nvidia-docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 /bin/bash ``` - `--name paddle_docker`: set name of Docker, `paddle_docker` is name of docker you set; @@ -102,7 +102,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g - `-v $PWD:/paddle`: Specifies to mount the current path of the host (PWD variable in Linux will expand to the absolute path of the current path) to the /paddle directory inside the container; - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0`: Specify the name of the image to be used. You can view it through the 'docker images' command. /bin/Bash is the command to be executed in Docker + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0`: Specify the name of the image to be used. You can view it through the 'docker images' command. /bin/Bash is the command to be executed in Docker * Use CPU version of PaddlePaddle with jupyter： @@ -118,7 +118,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g cd ./jupyter_docker ``` ``` - docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` - `--rm`: Delete the container after closing it; @@ -129,7 +129,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g - `-v $PWD:/home/paddle`: Specifies to mount the current path (the PWD variable will be expanded to the absolute path of the current path) to the /home/paddle directory inside the container; - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter`: Specify the name of the image to be used, you can view it through the `docker images` command + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter`: Specify the name of the image to be used, you can view it through the `docker images` command Now you have successfully used Docker to install PaddlePaddle. For more information about using Docker, see[Docker official documents](https://docs.docker.com) @@ -147,24 +147,24 @@ Now you have successfully used Docker to install PaddlePaddle. For more informat - registry.baidubce.com/paddlepaddle/paddle:2.4.1 - CPU image with 2.4.1 version of paddle installed + registry.baidubce.com/paddlepaddle/paddle:2.4.2 + CPU image with 2.4.2 version of paddle installed - registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter - CPU image of paddle version 2.4.1 is installed, and jupyter is pre-installed in the image. Start the docker to run the jupyter service + registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter + CPU image of paddle version 2.4.2 is installed, and jupyter is pre-installed in the image. Start the docker to run the jupyter service - registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.7-cudnn8.4-trt8.4 - GPU image of paddle version 2.4.1 is installed, cuda version is 11.7, cudnn version is 8.4, trt version is 8.4 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.7-cudnn8.4-trt8.4 + GPU image of paddle version 2.4.2 is installed, cuda version is 11.7, cudnn version is 8.4, trt version is 8.4 - registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda11.2-cudnn8.2-trt8.0 - GPU image of paddle version 2.4.1 is installed, cuda version is 11.2, cudnn version is 8.2, trt version is 8.0 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda11.2-cudnn8.2-trt8.0 + GPU image of paddle version 2.4.2 is installed, cuda version is 11.2, cudnn version is 8.2, trt version is 8.0 - registry.baidubce.com/paddlepaddle/paddle:2.4.1-gpu-cuda10.2-cudnn7.6-trt7.0 - GPU image of paddle version 2.4.1 is installed, cuda version is 10.2, cudnn version is 7.6, trt version is 7.0 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-gpu-cuda10.2-cudnn7.6-trt7.0 + GPU image of paddle version 2.4.2 is installed, cuda version is 10.2, cudnn version is 7.6, trt version is 7.0 diff --git a/docs/install/docker/macos-docker.md b/docs/install/docker/macos-docker.md index 3214819131b..9ed0353b91d 100644 --- a/docs/install/docker/macos-docker.md +++ b/docs/install/docker/macos-docker.md @@ -19,24 +19,24 @@ * CPU 版的 PaddlePaddle： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1 + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2 ``` * CPU 版的 PaddlePaddle，且镜像中预装好了 jupyter： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` 如果您的机器不在中国大陆地区，可以直接从 DockerHub 拉取镜像： * CPU 版的 PaddlePaddle： ``` - docker pull paddlepaddle/paddle:2.4.1 + docker pull paddlepaddle/paddle:2.4.2 ``` * CPU 版的 PaddlePaddle，且镜像中预装好了 jupyter： ``` - docker pull paddlepaddle/paddle:2.4.1-jupyter + docker pull paddlepaddle/paddle:2.4.2-jupyter ``` 您还可以访问[DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/)获取更多镜像。 @@ -48,7 +48,7 @@ ``` - docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1 /bin/bash + docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2 /bin/bash ``` - `--name paddle_docker`：设定 Docker 的名称，`paddle_docker` 是自己设置的名称； @@ -59,7 +59,7 @@ - `-v $PWD:/paddle`：指定将当前路径（PWD 变量会展开为当前路径的绝对路径）挂载到容器内部的 /paddle 目录； - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1`：指定需要使用的 image 名称，您可以通过`docker images`命令查看；/bin/bash 是在 Docker 中要执行的命令 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2`：指定需要使用的 image 名称，您可以通过`docker images`命令查看；/bin/bash 是在 Docker 中要执行的命令 * 使用 CPU 版本的 PaddlePaddle，且镜像中预装好了 jupyter： @@ -73,7 +73,7 @@ cd ./jupyter_docker ``` ``` - docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` - `--rm`：关闭容器后删除容器； @@ -84,7 +84,7 @@ - `-v $PWD:/home/paddle`：指定将当前路径（PWD 变量会展开为当前路径的绝对路径）挂载到容器内部的 /home/paddle 目录； - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter`：指定需要使用的 image 名称，您可以通过`docker images`命令查看 + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter`：指定需要使用的 image 名称，您可以通过`docker images`命令查看 @@ -104,12 +104,12 @@ - registry.baidubce.com/paddlepaddle/paddle:2.4.1 - 安装了 2.4.1 版本 paddle 的 CPU 镜像 + registry.baidubce.com/paddlepaddle/paddle:2.4.2 + 安装了 2.4.2 版本 paddle 的 CPU 镜像 - registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter - 安装了 2.4.1 版本 paddle 的 CPU 镜像，且镜像中预装好了 jupyter，启动 docker 即运行 jupyter 服务 + registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter + 安装了 2.4.2 版本 paddle 的 CPU 镜像，且镜像中预装好了 jupyter，启动 docker 即运行 jupyter 服务 diff --git a/docs/install/docker/macos-docker_en.md b/docs/install/docker/macos-docker_en.md index dec7111d0c8..c70543ccd91 100644 --- a/docs/install/docker/macos-docker_en.md +++ b/docs/install/docker/macos-docker_en.md @@ -19,24 +19,24 @@ For domestic users, when downloading docker is slow due to network problems, you * CPU version of PaddlePaddle： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1 + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2 ``` * CPU version of PaddlePaddle, and the image is pre-installed with jupyter： ``` - docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker pull registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` If your machine is not in mainland China, you can pull the image directly from DockerHub: * CPU version of PaddlePaddle： ``` - docker pull paddlepaddle/paddle:2.4.1 + docker pull paddlepaddle/paddle:2.4.2 ``` * CPU version of PaddlePaddle, and the image is pre-installed with jupyter： ``` - docker pull paddlepaddle/paddle:2.4.1-jupyter + docker pull paddlepaddle/paddle:2.4.2-jupyter ``` You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to get more images. @@ -48,7 +48,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g ``` - docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1 /bin/bash + docker run --name paddle_docker -it -v $PWD:/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2 /bin/bash ``` - `--name paddle_docker`: set name of Docker, `paddle_docker` is name of docker you set; @@ -59,7 +59,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g - `-v $PWD:/paddle`: Specifies to mount the current path of the host (PWD variable in Linux will expand to the absolute path of the current path) to the /paddle directory inside the container; - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1`: Specify the name of the image to be used. You can view it through the 'docker images' command. /bin/Bash is the command to be executed in Docker + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2`: Specify the name of the image to be used. You can view it through the 'docker images' command. /bin/Bash is the command to be executed in Docker * Use CPU version of PaddlePaddle with jupyter： @@ -75,7 +75,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g cd ./jupyter_docker ``` ``` - docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter + docker run -p 80:80 --rm --env USER_PASSWD="password you set" -v $PWD:/home/paddle registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter ``` - `--rm`: Delete the container after closing it; @@ -86,7 +86,7 @@ You can see [DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/) to g - `-v $PWD:/home/paddle`: Specifies to mount the current path (the PWD variable will be expanded to the absolute path of the current path) to the /home/paddle directory inside the container; - - `registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter`: Specify the name of the image to be used, you can view it through the `docker images` command + - `registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter`: Specify the name of the image to be used, you can view it through the `docker images` command @@ -105,12 +105,12 @@ Now you have successfully used Docker to install PaddlePaddle. For more informat - registry.baidubce.com/paddlepaddle/paddle:2.4.1 - CPU image with 2.4.1 version of paddle installed + registry.baidubce.com/paddlepaddle/paddle:2.4.2 + CPU image with 2.4.2 version of paddle installed - registry.baidubce.com/paddlepaddle/paddle:2.4.1-jupyter - CPU image of paddle version 2.4.1 is installed, and jupyter is pre-installed in the image. Start the docker to run the jupyter service + registry.baidubce.com/paddlepaddle/paddle:2.4.2-jupyter + CPU image of paddle version 2.4.2 is installed, and jupyter is pre-installed in the image. Start the docker to run the jupyter service diff --git a/docs/install/index_cn.rst b/docs/install/index_cn.rst index 72736792c3f..93c1fcbc104 100644 --- a/docs/install/index_cn.rst +++ b/docs/install/index_cn.rst @@ -137,11 +137,11 @@ 安装 CPU 版本的命令为： :: - python -m pip install paddlepaddle==2.4.1 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle==2.4.2 -i https://mirror.baidu.com/pypi/simple 或 - python -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple (2). **GPU 版本** ：如果您想使用 GPU 版本请参考如下命令安装 @@ -153,11 +153,11 @@ 请注意用以下指令安装的 PaddlePaddle 在 Windows、Ubuntu、CentOS 下只支持 CUDA10.2： :: - python -m pip install paddlepaddle-gpu==2.4.1 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle-gpu==2.4.2 -i https://mirror.baidu.com/pypi/simple 或 - python -m pip install paddlepaddle-gpu==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle-gpu==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple 请确认需要安装 PaddlePaddle 的 Python 是您预期的位置，因为您计算机可能有多个 Python。根据您的环境您可能需要将说明中所有命令行中的 python 替换为具体的 Python 路径。 diff --git a/docs/install/index_en.rst b/docs/install/index_en.rst index ee98685d2a6..82ad6edbdd2 100644 --- a/docs/install/index_en.rst +++ b/docs/install/index_en.rst @@ -145,11 +145,11 @@ This section describes how to use pip to install. Command to install CPU version is: :: - python -m pip install paddlepaddle==2.4.1 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle==2.4.2 -i https://mirror.baidu.com/pypi/simple or - python -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple (2). **GPU version** : If you only want to install GPU version, please refer to command below @@ -162,11 +162,11 @@ This section describes how to use pip to install. Please attention that PaddlePaddle installed through command below only supports CUDA10.2 under Windows、Ubuntu、CentOS: :: - python -m pip install paddlepaddle-gpu==2.4.1 -i https://mirror.baidu.com/pypi/simple + python -m pip install paddlepaddle-gpu==2.4.2 -i https://mirror.baidu.com/pypi/simple or - python -m pip install paddlepaddle-gpu==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle-gpu==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple Please confirm that the Python where you need to install PaddlePaddle is your expected location, because your computer may have multiple Python. Depending on the environment, you may need to replace Python in all command lines in the instructions with Python 3 or specific Python path. diff --git a/docs/install/pip/linux-pip.md b/docs/install/pip/linux-pip.md index 6c98551eefc..eb3c030cc9a 100644 --- a/docs/install/pip/linux-pip.md +++ b/docs/install/pip/linux-pip.md @@ -115,7 +115,7 @@ ``` - python3 -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python3 -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` @@ -128,7 +128,7 @@ ``` - python3 -m pip install paddlepaddle-gpu==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python3 -m pip install paddlepaddle-gpu==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` @@ -136,7 +136,7 @@ ``` - python3 -m pip install paddlepaddle-gpu==2.4.1.post112 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html + python3 -m pip install paddlepaddle-gpu==2.4.2.post112 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html ``` @@ -144,14 +144,14 @@ ``` - python3 -m pip install paddlepaddle-gpu==2.4.1.post116 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html + python3 -m pip install paddlepaddle-gpu==2.4.2.post116 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html ``` 2.2.4 CUDA11.7 的 PaddlePaddle ``` - python3 -m pip install paddlepaddle-gpu==2.4.1.post117 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html + python3 -m pip install paddlepaddle-gpu==2.4.2.post117 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html ``` @@ -177,20 +177,20 @@ * cpu、mkl 版本 noavx 机器安装： ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps ``` * cpu、openblas 版本 noavx 机器安装： ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/noavx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/noavx/stable.html --no-index --no-deps ``` * gpu 版本 cuda10.2 noavx 机器安装： ``` - python3 -m pip download paddlepaddle-gpu==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle-gpu==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps ``` 再使用`python3 -m pip install [name].whl`本地安装（[name]为 wheel 包名称）。 @@ -199,7 +199,7 @@ * 如果你想安装`avx`、`openblas`的 Paddle 包，可以通过以下命令将 wheel 包下载到本地，再使用`python3 -m pip install [name].whl`本地安装（[name]为 wheel 包名称）： ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/avx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/avx/stable.html --no-index --no-deps ``` diff --git a/docs/install/pip/linux-pip_en.md b/docs/install/pip/linux-pip_en.md index c7ec4a6e6e6..74b9ec447cd 100644 --- a/docs/install/pip/linux-pip_en.md +++ b/docs/install/pip/linux-pip_en.md @@ -119,7 +119,7 @@ You can choose the following version of PaddlePaddle to start installation: ``` - python3 -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python3 -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` @@ -132,7 +132,7 @@ You can choose the following version of PaddlePaddle to start installation: ``` - python3 -m pip install paddlepaddle-gpu==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python3 -m pip install paddlepaddle-gpu==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` @@ -140,7 +140,7 @@ You can choose the following version of PaddlePaddle to start installation: ``` - python3 -m pip install paddlepaddle-gpu==2.4.1.post112 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html + python3 -m pip install paddlepaddle-gpu==2.4.2.post112 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html ``` @@ -148,14 +148,14 @@ You can choose the following version of PaddlePaddle to start installation: ``` - python3 -m pip install paddlepaddle-gpu==2.4.1.post116 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html + python3 -m pip install paddlepaddle-gpu==2.4.2.post116 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html ``` 2.2.4 If you are using CUDA 11.7 ``` - python3 -m pip install paddlepaddle-gpu==2.4.1.post117 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html + python3 -m pip install paddlepaddle-gpu==2.4.2.post117 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html ``` Note： @@ -177,20 +177,20 @@ Note： * cpu and mkl version installed on noavx machine： ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps ``` * cpu and openblas version installed on noavx machine： ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/noavx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/noavx/stable.html --no-index --no-deps ``` * GPU cuda10.2 version install on noavx machine： ``` - python3 -m pip download paddlepaddle-gpu==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle-gpu==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/noavx/stable.html --no-index --no-deps ``` To determine whether your machine supports `avx`, you can use the following command. If the output contains `avx`, it means that the machine supports `avx`: @@ -201,7 +201,7 @@ Note： * If you want to install the Paddle package with `avx` and `openblas`, you can use the following command to download the wheel package to the local, and then use `python3 -m pip install [name].whl` to install locally ([name] is the name of the wheel package): ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/avx/stable.html --no-index --no-deps + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/linux/openblas/avx/stable.html --no-index --no-deps ``` diff --git a/docs/install/pip/macos-pip.md b/docs/install/pip/macos-pip.md index 2becfa14a24..ddc68a8b82d 100644 --- a/docs/install/pip/macos-pip.md +++ b/docs/install/pip/macos-pip.md @@ -70,7 +70,7 @@ ``` - python3 -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python3 -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` @@ -79,21 +79,10 @@ * 请确认需要安装 PaddlePaddle 的 Python 是您预期的位置，因为您计算机可能有多个 Python。根据您的环境您可能需要将说明中所有命令行中的 python3 替换为具体的 Python 路径。 * 默认下载最新稳定版的安装包，如需获取 develop 版本 nightly build 的安装包，请参考[这里](https://www.paddlepaddle.org.cn/install/quick/zh/1.8.5-windows-pip) * 使用 MacOS 中自带 Python 可能会导致安装失败。请使用[python 官网](https://www.python.org/downloads/mac-osx/)提供的 python3.6.x、python3.7.x、python3.8.x、python3.9.x、python3.10.x。 -* 上述命令默认安装`noavx`的包。如果你的机器支持`avx`，想要安装`avx`的 Paddle 包，可以通过以下命令安装： +* 上述命令默认安装avx的包，如果想要安装noavx的包，可以使用如下命令： - 首先使用如下命令将 wheel 包下载到本地，再使用`python3 -m pip install [name].whl`本地安装（[name]为 wheel 包名称）： - - ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/mac/openblas/avx/stable.html --no-index --no-deps - ``` - - 判断你的机器是否支持`avx`，可以输入以下命令，如果输出中包含`avx`，则表示机器支持`avx` - ``` - sysctl machdep.cpu.features | grep -i avx - ``` - 或 ``` - sysctl machdep.cpu.leaf7_features | grep -i avx + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/mac/openblas/noavx/stable.html --no-index --no-deps ``` ## **三、验证安装** diff --git a/docs/install/pip/macos-pip_en.md b/docs/install/pip/macos-pip_en.md index 7d27620a6b3..b8d0675b10c 100644 --- a/docs/install/pip/macos-pip_en.md +++ b/docs/install/pip/macos-pip_en.md @@ -66,28 +66,17 @@ You can choose the following version of PaddlePaddle to start installation: ``` -python3 -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple +python3 -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` Note： * Please confirm that the Python where you need to install PaddlePaddle is your expected location, because your computer may have multiple Python. Depending on the environment, you may need to replace python3 in all command lines in the instructions with specific Python path. -* The above commands install the `noavx` package by default. If your machine supports `avx`, and you want to install the Paddle package of `avx`, you can use the following command to install： +* The above commands install the `avx` package by default. If you want to install the Paddle package of `noavx`, you can use the following command to install： - First use the following command to download the wheel package to the local, and then use `python3 -m pip install [name].whl` to install locally ([name] is the name of the wheel package): - - ``` - python3 -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/mac/openblas/avx/stable.html --no-index --no-deps - ``` - - To determine whether your machine supports `avx`, you can use the following command. If the output contains `avx`, it means that the machine supports `avx`: - ``` - sysctl machdep.cpu.features | grep -i avx - ``` - or ``` - sysctl machdep.cpu.leaf7_features | grep -i avx + python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/mac/openblas/noavx/stable.html --no-index --no-deps ``` diff --git a/docs/install/pip/windows-pip.md b/docs/install/pip/windows-pip.md index 3b423dc867c..e9f8f34647e 100644 --- a/docs/install/pip/windows-pip.md +++ b/docs/install/pip/windows-pip.md @@ -69,7 +69,7 @@ ``` - python -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` #### 2.2 GPU 版的 PaddlePaddle @@ -80,27 +80,27 @@ ``` - python -m pip install paddlepaddle-gpu==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle-gpu==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` 2.2.2 CUDA11.2 的 PaddlePaddle ``` - python -m pip install paddlepaddle-gpu==2.4.1.post112 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html + python -m pip install paddlepaddle-gpu==2.4.2.post112 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html ``` 2.2.3 CUDA11.6 的 PaddlePaddle ``` - python -m pip install paddlepaddle-gpu==2.4.1.post116 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html + python -m pip install paddlepaddle-gpu==2.4.2.post116 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html ``` 2.2.4 CUDA11.7 的 PaddlePaddle ``` - python -m pip install paddlepaddle-gpu==2.4.1.post117 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html + python -m pip install paddlepaddle-gpu==2.4.2.post117 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html ``` @@ -117,19 +117,19 @@ * cpu、mkl 版本 noavx 机器安装： ``` - python -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps + python -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps ``` * cpu、openblas 版本 noavx 机器安装： ``` - python -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/noavx/stable.html --no-index --no-deps + python -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/noavx/stable.html --no-index --no-deps ``` * gpu 版本 cuda10.2 noavx 机器安装： ``` - python -m pip download paddlepaddle-gpu==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps + python -m pip download paddlepaddle-gpu==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps ``` 再使用`python -m pip install [name].whl`本地安装（[name]为 wheel 包名称） @@ -137,7 +137,7 @@ * 如果你想安装`avx`、`openblas`的 Paddle 包，可以通过以下命令将 wheel 包下载到本地，再使用`python -m pip install [name].whl`本地安装（[name]为 wheel 包名称）： ``` - python -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/avx/stable.html --no-index --no-deps + python -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/avx/stable.html --no-index --no-deps ``` diff --git a/docs/install/pip/windows-pip_en.md b/docs/install/pip/windows-pip_en.md index 4420aaa6364..d109f1d8c20 100644 --- a/docs/install/pip/windows-pip_en.md +++ b/docs/install/pip/windows-pip_en.md @@ -66,7 +66,7 @@ You can choose the following version of PaddlePaddle to start installation: ``` - python -m pip install paddlepaddle==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` @@ -77,26 +77,26 @@ You can choose the following version of PaddlePaddle to start installation: 2.2.1 If you are using CUDA 10.2 ``` - python -m pip install paddlepaddle-gpu==2.4.1 -i https://pypi.tuna.tsinghua.edu.cn/simple + python -m pip install paddlepaddle-gpu==2.4.2 -i https://pypi.tuna.tsinghua.edu.cn/simple ``` 2.2.2 If you are using CUDA 11.2 ``` - python -m pip install paddlepaddle-gpu==2.4.1.post112 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html + python -m pip install paddlepaddle-gpu==2.4.2.post112 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html ``` 2.2.3 If you are using CUDA 11.6 ``` - python -m pip install paddlepaddle-gpu==2.4.1.post116 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html + python -m pip install paddlepaddle-gpu==2.4.2.post116 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html ``` 2.2.4 If you are using CUDA 11.7 ``` - python -m pip install paddlepaddle-gpu==2.4.1.post117 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html + python -m pip install paddlepaddle-gpu==2.4.2.post117 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html ``` Note： @@ -112,19 +112,19 @@ Note： * cpu and mkl version installed on noavx machine： ``` - python -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps + python -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps ``` * cpu and openblas version installed on noavx machine： ``` - python -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/noavx/stable.html --no-index --no-deps + python -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/noavx/stable.html --no-index --no-deps ``` * GPU cuda10.2 version install on noavx machine： ``` - python -m pip download paddlepaddle-gpu==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps + python -m pip download paddlepaddle-gpu==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/noavx/stable.html --no-index --no-deps ``` To determine whether your machine supports `avx`, you can install the [CPU-Z](https://www.cpuid.com/softwares/cpu-z.html) tool to view the "processor-instruction set". @@ -133,7 +133,7 @@ Note： * If you want to install the Paddle package with `avx` and `openblas`, you can use the following command to download the wheel package to the local, and then use `python -m pip install [name].whl` to install locally ([name] is the name of the wheel package): ``` - python -m pip download paddlepaddle==2.4.1 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/avx/stable.html --no-index --no-deps + python -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/windows/openblas/avx/stable.html --no-index --no-deps ``` ## Verify installation From 83cce92102804a40928b8799cf69aec056a764f8 Mon Sep 17 00:00:00 2001 From: zhengqiwen1997 Date: Fri, 24 Feb 2023 08:58:56 +0000 Subject: [PATCH 2/4] codestyle --- docs/install/pip/macos-pip.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install/pip/macos-pip.md b/docs/install/pip/macos-pip.md index ddc68a8b82d..2ac8266d448 100644 --- a/docs/install/pip/macos-pip.md +++ b/docs/install/pip/macos-pip.md @@ -79,7 +79,7 @@ * 请确认需要安装 PaddlePaddle 的 Python 是您预期的位置，因为您计算机可能有多个 Python。根据您的环境您可能需要将说明中所有命令行中的 python3 替换为具体的 Python 路径。 * 默认下载最新稳定版的安装包，如需获取 develop 版本 nightly build 的安装包，请参考[这里](https://www.paddlepaddle.org.cn/install/quick/zh/1.8.5-windows-pip) * 使用 MacOS 中自带 Python 可能会导致安装失败。请使用[python 官网](https://www.python.org/downloads/mac-osx/)提供的 python3.6.x、python3.7.x、python3.8.x、python3.9.x、python3.10.x。 -* 上述命令默认安装avx的包，如果想要安装noavx的包，可以使用如下命令： +* 上述命令默认安装`avx`的包，如果想要安装`noavx`的包，可以使用如下命令： ``` python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/mac/openblas/noavx/stable.html --no-index --no-deps From 1677405140b868ccda3ba5b1e40ce256ecbec10c Mon Sep 17 00:00:00 2001 From: zhengqiwen1997 Date: Fri, 24 Feb 2023 09:34:53 +0000 Subject: [PATCH 3/4] fix errors --- docs/design/phi/design_cn.md | 4 ++-- docs/design/phi/design_en.md | 4 ++-- docs/install/pip/macos-pip.md | 11 +++++++++++ docs/install/pip/macos-pip_en.md | 11 +++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/docs/design/phi/design_cn.md b/docs/design/phi/design_cn.md index b159c44f8e7..d9b62d9d330 100644 --- a/docs/design/phi/design_cn.md +++ b/docs/design/phi/design_cn.md @@ -1192,7 +1192,7 @@ REGISTER_OPERATOR(sign, ops::SignOp, ops::SignOpMaker, > 本节要点： > 1. 支持新形式 Kernel 在现有静态图和动态图体系中调用，难点在于解决多参数 Op 到少参数 Kernel 的匹配问题 -#### 2.4.2 ArgumentMapping 体系设计 +#### 2.4.1 ArgumentMapping 体系设计 由于新形式 Kernel 参数列表与 Python API 对齐，和原先的 OpMaker 中注册的参数列表存在差异，导致新形式 Kernel 在原先 fluid 体系中调用时会很难匹配。 @@ -1414,7 +1414,7 @@ class ProtoArgumentMappingContext : public phi::ArgumentMappingContext { }; ``` -#### 2.4.2 PHI Kernel 兼容调度执行 +#### 2.4.1 PHI Kernel 兼容调度执行 目前 PHI kernel 可以兼容地在老 Executor，ParallelExecutor，动态图的 Tracer，Engine，推理的 Predictor，以及新执行器 InterpreterCore 等在执行体系中被调度执行。 diff --git a/docs/design/phi/design_en.md b/docs/design/phi/design_en.md index 9080953c3d8..156a29eb461 100644 --- a/docs/design/phi/design_en.md +++ b/docs/design/phi/design_en.md @@ -1192,7 +1192,7 @@ So far, after the original Op's `InferShape` function has been migrated to PHI ` > Highlights of this section: > 1. Support the new form of Kernel to be called in the existing static graph and dynamic graph architecture, the difficulty lies in solving the matching problem of multi-parameter Op to few-parameter Kernel. -#### 2.4.2 ArgumentMapping Architecture Design +#### 2.4.1 ArgumentMapping Architecture Design The parameter list of the new form of Kernel is aligned with the Python API, which is different from the parameter list registered in the original `OpMaker`, this makes it difficult to match when the new form of Kernel is called in the original fluid architecture. @@ -1414,7 +1414,7 @@ class ProtoArgumentMappingContext : public phi::ArgumentMappingContext { }; ``` -#### 2.4.2 PHI Kernel Compatible with Scheduled Execution +#### 2.4.1 PHI Kernel Compatible with Scheduled Execution At present, the PHI kernel can be compatibly scheduled and executed in the following execution systems: old `Executor`, `ParallelExecutor`, the `Tracer` and the `Engine` of dynamic graph, the `Predictor` of inference, and new executor `InterpreterCore`, etc. diff --git a/docs/install/pip/macos-pip.md b/docs/install/pip/macos-pip.md index 2ac8266d448..44f1fa59904 100644 --- a/docs/install/pip/macos-pip.md +++ b/docs/install/pip/macos-pip.md @@ -81,10 +81,21 @@ * 使用 MacOS 中自带 Python 可能会导致安装失败。请使用[python 官网](https://www.python.org/downloads/mac-osx/)提供的 python3.6.x、python3.7.x、python3.8.x、python3.9.x、python3.10.x。 * 上述命令默认安装`avx`的包，如果想要安装`noavx`的包，可以使用如下命令： + 首先使用如下命令将 wheel 包下载到本地，再使用`python3 -m pip install [name].whl`本地安装（[name]为 wheel 包名称）： + ``` python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/mac/openblas/noavx/stable.html --no-index --no-deps ``` + 判断你的机器是否支持`avx`，可以输入以下命令，如果输出中包含`avx`，则表示机器支持`avx` + ``` + sysctl machdep.cpu.features | grep -i avx + ``` + 或 + ``` + sysctl machdep.cpu.leaf7_features | grep -i avx + ``` + ## **三、验证安装** 安装完成后您可以使用 `python` 进入 python 解释器，输入`import paddle` ，再输入 diff --git a/docs/install/pip/macos-pip_en.md b/docs/install/pip/macos-pip_en.md index b8d0675b10c..440aa2d70a6 100644 --- a/docs/install/pip/macos-pip_en.md +++ b/docs/install/pip/macos-pip_en.md @@ -75,10 +75,21 @@ Note： * Please confirm that the Python where you need to install PaddlePaddle is your expected location, because your computer may have multiple Python. Depending on the environment, you may need to replace python3 in all command lines in the instructions with specific Python path. * The above commands install the `avx` package by default. If you want to install the Paddle package of `noavx`, you can use the following command to install： + First use the following command to download the wheel package to the local, and then use `python3 -m pip install [name].whl` to install locally ([name] is the name of the wheel package): + ``` python3 -m pip download paddlepaddle==2.4.2 -f https://www.paddlepaddle.org.cn/whl/mac/openblas/noavx/stable.html --no-index --no-deps ``` + To determine whether your machine supports `avx`, you can use the following command. If the output contains `avx`, it means that the machine supports `avx`: + ``` + sysctl machdep.cpu.features | grep -i avx + ``` + or + ``` + sysctl machdep.cpu.leaf7_features | grep -i avx + ``` + ## Verify installation From 907c6db6f2e2ac8413d4a59f74a82658ab56d640 Mon Sep 17 00:00:00 2001 From: zhengqiwen1997 Date: Mon, 27 Feb 2023 03:06:01 +0000 Subject: [PATCH 4/4] fix error --- docs/design/phi/design_cn.md | 2 +- docs/design/phi/design_en.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/design/phi/design_cn.md b/docs/design/phi/design_cn.md index d9b62d9d330..bc5043e07ed 100644 --- a/docs/design/phi/design_cn.md +++ b/docs/design/phi/design_cn.md @@ -1414,7 +1414,7 @@ class ProtoArgumentMappingContext : public phi::ArgumentMappingContext { }; ``` -#### 2.4.1 PHI Kernel 兼容调度执行 +#### 2.4.2 PHI Kernel 兼容调度执行 目前 PHI kernel 可以兼容地在老 Executor，ParallelExecutor，动态图的 Tracer，Engine，推理的 Predictor，以及新执行器 InterpreterCore 等在执行体系中被调度执行。 diff --git a/docs/design/phi/design_en.md b/docs/design/phi/design_en.md index 156a29eb461..9d6cd489481 100644 --- a/docs/design/phi/design_en.md +++ b/docs/design/phi/design_en.md @@ -1414,7 +1414,7 @@ class ProtoArgumentMappingContext : public phi::ArgumentMappingContext { }; ``` -#### 2.4.1 PHI Kernel Compatible with Scheduled Execution +#### 2.4.2 PHI Kernel Compatible with Scheduled Execution At present, the PHI kernel can be compatibly scheduled and executed in the following execution systems: old `Executor`, `ParallelExecutor`, the `Tracer` and the `Engine` of dynamic graph, the `Predictor` of inference, and new executor `InterpreterCore`, etc.