Skip to content

Commit 70a1456

Browse files
Update pip install whl (#6948)
* Update pip install whl * Fix * Fix
1 parent 219327e commit 70a1456

File tree

6 files changed

+21
-57
lines changed

6 files changed

+21
-57
lines changed

docs/install/pip/linux-pip.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
[The Python Package Index(PyPI)](https://pypi.org/)是 Python 的包管理器。本文档为你介绍 PyPI 安装方式,飞桨提供的 PyPI 安装包支持分布式训练(多机多卡)、TensorRT 推理功能。
44

5+
* 您无需再安装 CUDA\CUDNN\NCCL 等软件, paddle whl 包中已经自带, 直接安装 paddle whl 包即可
6+
57
## 一、环境准备
68

79
### 1.1 如何查看您的环境
@@ -31,9 +33,6 @@
3133
3234
* 需要确认 pip 的版本是否满足要求,要求 pip 版本为 20.2.2 或更高版本
3335
34-
```
35-
python3 -m ensurepip
36-
```
3736
3837
```
3938
python3 -m pip --version
@@ -49,7 +48,7 @@
4948
5049
5150
52-
* 默认提供的安装包需要计算机支持 MKL
51+
* 默认提供的安装包需要计算机支持 MKL, Intel 芯片都支持 MKL
5352
5453
5554
@@ -61,10 +60,6 @@
6160
6261
* 如果您的计算机有 NVIDIA® GPU,请确保满足以下条件并且安装[GPU 版 PaddlePaddle](#gpu),依赖库环境版本要求如下:
6362
64-
* **CUDA 工具包 11.8 配合 cuDNN v8.6.0, 如需使用 PaddleTensorRT 推理,需配合 TensorRT8.5.3.1**
65-
66-
* **CUDA 工具包 12.3 配合 cuDNN v9.0.0, 如需使用 PaddleTensorRT 推理,需配合 TensorRT8.6.1.6**
67-
6863
* **GPU 运算能力超过 6.0 的硬件设备**
6964
7065
您可参考 NVIDIA 官方文档了解 CUDA、CUDNN 和 TensorRT 的安装流程和配置方法,请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/),[TensorRT](https://developer.nvidia.com/tensorrt)
@@ -82,15 +77,15 @@
8277
#### 2.2 <span id="gpu">GPU 版的 PaddlePaddle</span>
8378
8479
85-
2.2.1 CUDA11.8 的 PaddlePaddle
80+
2.2.1 CUDA11.8 的 PaddlePaddle(依赖 gcc8+, 如果需要使用 TensorRT 可自行安装 TensorRT8.5.3.1)
8681
8782
8883
```
8984
python3 -m pip install paddlepaddle-gpu==3.0.0b2 -i https://www.paddlepaddle.org.cn/packages/stable/cu118/
9085
```
9186
9287
93-
2.2.2 CUDA12.3 的 PaddlePaddle
88+
2.2.2 CUDA12.3 的 PaddlePaddle(依赖 gcc12+, 如果需要使用 TensorRT 可自行安装 TensorRT8.6.1.6)
9489
9590
9691
```

docs/install/pip/linux-pip_en.md

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Install on Linux via PIP
22

3+
[The Python Package Index(PyPI)]( https://pypi.org/ )It is a package manager for Python. This document introduces the PyPI installation method. The PyPI installation package provided by PaddlePaddle supports distributed training (multiple computers and multiple cards) and TensorRT reasoning functions.
4+
5+
* You don't need to install CUDA, CUDNN, NCCL and other software anymore. The Paddle WHL package already comes with it, just install the Paddle WHL package directly
6+
37
## Environmental preparation
48

59
### 1.1 How to check your environment
@@ -31,10 +35,6 @@
3135
* It is required to confirm whether the version of pip meets the requirements. The version of pip is required to be 20.2.2 or above
3236
3337
34-
```
35-
python3 -m ensurepip
36-
```
37-
3838
```
3939
python3 -m pip --version
4040
```
@@ -49,10 +49,11 @@
4949
5050
5151
52-
* The installation package provided by default requires computer support for MKL
53-
54-
* If you do not know the machine environment, please download and use[Quick install script](https://fast-install.bj.bcebos.com/fast_install.sh), for instructions please refer to[here](https://github.com/PaddlePaddle/FluidDoc/tree/develop/doc/fluid/install/install_script.md)。
52+
* The installation package provided by default requires computer support for MKL, Intel chips all support MKL
5553
54+
```
55+
cat /proc/cpuinfo
56+
```
5657
5758
5859
## INSTALLATION
@@ -63,10 +64,6 @@
6364
6465
* If your computer has NVIDIA® GPU, please make sure that the following conditions are met and install [the GPU Version of PaddlePaddle](#gpu)
6566
66-
* **CUDA toolkit 11.8 with cuDNN v8.6.0(for PaddleTensorRT deployment, TensorRT8.5.1.7)**
67-
68-
* **CUDA toolkit 12.3 with cuDNN v9.0.0(for PaddleTensorRT deployment, TensorRT8.6.1.6)**
69-
7067
* **Hardware devices with GPU computing power over 6.0**
7168
7269
You can refer to NVIDIA official documents for installation process and configuration method of CUDA, cuDNN and TensorRT. Please refer to [CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/),[TensorRT](https://developer.nvidia.com/tensorrt)
@@ -90,16 +87,15 @@ You can choose the following version of PaddlePaddle to start installation:
9087
#### 2.2 <span id="gpu">GPU Version of PaddlePaddle</span>
9188
9289
93-
2.2.4 If you are using CUDA 11.8
90+
2.2.4 If you are using CUDA 11.8(Dependent on GCC8+, If you need to use TensorRT, you can install TensorRT 8.5.3.1 yourself)
9491
9592
9693
```
9794
python3 -m pip install paddlepaddle-gpu==3.0.0b2 -i https://www.paddlepaddle.org.cn/packages/stable/cu118/
9895
```
9996
10097
101-
2.2.5 If you are using CUDA 12.3
102-
98+
2.2.5 If you are using CUDA 12.3(Dependent on GCC8+, If you need to use TensorRT, you can install TensorRT 8.6.1.6 yourself)
10399
104100
```
105101
python3 -m pip install paddlepaddle-gpu==3.0.0b2 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/

docs/install/pip/macos-pip.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
```
2424
2525
26-
2726
* 需要确认 python 的版本是否满足要求
2827
2928
* 使用以下命令确认是 3.8/3.9/3.10/3.11/3.12
@@ -35,10 +34,6 @@
3534
* 需要确认 pip 的版本是否满足要求,要求 pip 版本为 20.2.2 或更高版本
3635
3736
38-
```
39-
python3 -m ensurepip
40-
```
41-
4237
```
4338
python3 -m pip --version
4439
```

docs/install/pip/macos-pip_en.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
```
1212

1313

14-
1514
* Confirm that the Python where you need to install PaddlePaddle is your expected location, because your computer may have multiple Python
1615

1716
* Use the following command to output Python path. Depending on the environment, you may need to replace python3 in all command lines in the description with specific Python path
@@ -21,7 +20,6 @@
2120
```
2221
2322
24-
2523
* You need to confirm whether the version of Python meets the requirements
2624
2725
* Use the following command to confirm that it is 3.8/3.9/3.10/3.11/3.12
@@ -30,9 +28,6 @@
3028
3129
* It is required to confirm whether the version of pip meets the requirements. The version of pip is required to be 20.2.2 or above
3230
33-
```
34-
python3 -m ensurepip
35-
```
3631
3732
```
3833
python3 -m pip --version

docs/install/pip/windows-pip.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
1717
* 需要确认 pip 的版本是否满足要求,要求 pip 版本为 20.2.2 或更高版本
1818
19-
```
20-
python -m ensurepip
21-
```
22-
2319
```
2420
python -m pip --version
2521
```
@@ -32,8 +28,8 @@
3228
```
3329
3430
35-
* 默认提供的安装包需要计算机支持 MKL
3631
* Windows 暂不支持 NCCL,分布式等相关功能
32+
* 默认提供的安装包需要计算机支持 MKL, Intel 芯片都支持 MKL
3733
3834
3935
## 二、开始安装
@@ -46,10 +42,6 @@
4642
4743
* 如果您的计算机有 NVIDIA® GPU,请确保满足以下条件并且安装 GPU 版 PaddlePaddle
4844
49-
* **CUDA 工具包 11.8 配合 cuDNN v8.6.0,如需使用 PaddleTensorRT 推理,需配合 TensorRT8.5.1.7**
50-
51-
* **CUDA 工具包 12.3 配合 cuDNN v9.0.0, 如需使用 PaddleTensorRT 推理,需配合 TensorRT8.6.1.6**
52-
5345
* **GPU 运算能力超过 6.0 的硬件设备**
5446
5547
* 注:目前官方发布的 windows 安装包仅包含 CUDA 11.2/11.6/11.7/11.8/12.0,如需使用其他 cuda 版本,请通过源码自行编译。您可参考 NVIDIA 官方文档了解 CUDA、CUDNN 和 TensorRT 的安装流程和配置方法,请见[CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/),[TensorRT](https://developer.nvidia.com/tensorrt)
@@ -72,13 +64,13 @@
7264
#### 2.2 <span id="gpu">GPU 版的 PaddlePaddle</span>
7365
7466
75-
2.2.4 CUDA11.8 的 PaddlePaddle
67+
2.2.4 CUDA11.8 的 PaddlePaddle(如果需要使用 TensorRT 可自行安装 TensorRT8.5.1.7)
7668
7769
```
7870
python -m pip install paddlepaddle-gpu==3.0.0b2 -i https://www.paddlepaddle.org.cn/packages/stable/cu118/
7971
```
8072
81-
2.2.5 CUDA12.3 的 PaddlePaddle
73+
2.2.5 CUDA12.3 的 PaddlePaddle(如果需要使用 TensorRT 可自行安装 TensorRT8.6.1.6)
8274
8375
```
8476
python -m pip install paddlepaddle-gpu==3.0.0b2 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/

docs/install/pip/windows-pip_en.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313

1414
* Confirm whether the version of pip meets the requirements. The version of pip is required to be 20.2.2 or above
1515

16-
```
17-
python -m ensurepip
18-
```
19-
2016
```
2117
python -m pip --version
2218
```
@@ -28,9 +24,8 @@
2824
```
2925
3026
31-
* The installation package provided by default requires computer support for MKL
3227
* NCCL, distribution are not supported on windows now
33-
28+
* The installation package provided by default requires computer support for MKL, Intel chips all support MKL
3429
3530
3631
## INSTALLATION
@@ -43,10 +38,6 @@ If you installed Python via Homebrew or the Python website, `pip` was installed
4338
4439
* If your computer has NVIDIA® GPU, please make sure that the following conditions are met and install [the GPU Version of PaddlePaddle](#gpu)
4540
46-
* **CUDA toolkit 11.8 with cuDNN v8.6.0(for PaddleTensorRT deployment, TensorRT8.5.1.7)**
47-
48-
* **CUDA toolkit 12.3 with cuDNN v9.0.0(for PaddleTensorRT deployment, TensorRT8.6.1.6)**
49-
5041
* **GPU CUDA capability over 6.0**
5142
5243
You can refer to NVIDIA official documents for installation process and configuration method of CUDA, cuDNN and TensorRT. Please refer to [CUDA](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/),[cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/),[TensorRT](https://developer.nvidia.com/tensorrt)
@@ -69,13 +60,13 @@ You can choose the following version of PaddlePaddle to start installation:
6960
#### 2.2 <span id="gpu">GPU Version of PaddlePaddle</span>
7061
7162
72-
2.2.4 If you are using CUDA 11.8
63+
2.2.4 If you are using CUDA 11.8(If you need to use TensorRT, you can install TensorRT 8.5.1.7 yourself)
7364
7465
```
7566
python -m pip install paddlepaddle-gpu==3.0.0b2 -i https://www.paddlepaddle.org.cn/packages/stable/cu118/
7667
```
7768
78-
2.2.5 If you are using CUDA 12.3
69+
2.2.5 If you are using CUDA 12.3(If you need to use TensorRT, you can install TensorRT 8.6.1.6 yourself)
7970
8071
```
8172
python -m pip install paddlepaddle-gpu==3.0.0b2 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/

0 commit comments

Comments
 (0)