Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CodeStyle][py36] 修改部分关于 py36 的内容 #5460

Merged
merged 6 commits into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions docs/install/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,9 @@

> 出现这个问题原因主要是由于您的显卡驱动低于对应 CUDA 版本的要求,请保证您的显卡驱动支持所使用的 CUDA 版本


<a name="MACPRO"></a>

- macOS 下安装 PaddlePaddle 后 import paddle.fluid 出现`Fatal Python error: PyThreadState_Get: no current thread running`错误

- For Python2.7.x (install by brew): 请使用`export LD_LIBRARY_PATH=/usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7 && export DYLD_LIBRARY_PATH=/usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7`
gsq7474741 marked this conversation as resolved.
Show resolved Hide resolved
- For Python2.7.x (install by Python.org): 请使用`export LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/2.7 && export DYLD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/2.7`
- For Python3.5.x (install by Python.org): 请使用`export LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.5/ && export DYLD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.5/`

<a name="OPENBLAS"></a>

- MACOS 下使用自定义的 openblas 详见 issue:
- macOS 下使用自定义的 openblas 详见 issue:

> [ISSUE 13217](https://github.com/PaddlePaddle/Paddle/issues/13721)

Expand Down
11 changes: 1 addition & 10 deletions docs/install/FAQ_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,7 @@

> The main reason for this problem is that your graphics card driver is lower than the corresponding CUDA version. Please ensure that your graphics card driver supports the CUDA version used.


- `Fatal Python error: PyThreadState_Get: no current thread running` error occurs when importing paddle.fluid after installing PaddlePaddle on macOS.


- For Python2.7.x (install by brew): Please use `export LD_LIBRARY_PATH=/usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7 && export DYLD_LIBRARY_PATH=/usr/ Local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7`
- For Python2.7.x (install by Python.org): Please use `export LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/2.7 && export DYLD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/2.7`
- For Python3.5.x (install by Python.org): Please use `export LD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.5/ && export DYLD_LIBRARY_PATH=/Library/Frameworks/Python.framework/Versions/3.5 /`


- Use customized openblas under MACOS. See issue for details:
- Use customized openblas under macOS. See issue for details:

>[ISSUE 13217](https://github.com/PaddlePaddle/Paddle/issues/13721)

Expand Down
4 changes: 2 additions & 2 deletions docs/install/Tables.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
</tr>
<tr>
<td> Python(64 bit) </td>
<td> 3.6+.x </td>
<td> 依赖 libpython3.6+.so </td>
<td> 3.7+ </td>
<td> 依赖 libpython3.7+.so </td>
<td> 请访问<a href="https://www.python.org">Python 官网</a></td>
</tr>
<tr>
Expand Down
4 changes: 2 additions & 2 deletions docs/install/Tables_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</tr>
<tr>
<td> Python(64 bit) </td>
<td> 3.6+.x </td>
SigureMo marked this conversation as resolved.
Show resolved Hide resolved
<td> depends on libpython3.6+.so </td>
<td> 3.7+ </td>
<td> depends on libpython3.7+.so </td>
<td> please go to <a href="https://www.python.org">Python official website </a></td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/install/compile/arm-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

* **处理器:FT2000+/Kunpeng 920 2426SK**
* **操作系统:麒麟 v10/UOS**
* **Python 版本 2.7.15+/3.5.1+/3.6/3.7/3.8 (64 bit)**
SigureMo marked this conversation as resolved.
Show resolved Hide resolved
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**
* **pip 或 pip3 版本 9.0.1+ (64 bit)**

飞腾 FT2000+和鲲鹏 920 处理器均为 ARMV8 架构,在该架构上编译 Paddle 的方式一致,本文以 FT2000+为例,介绍 Paddle 的源码编译。
Expand Down
10 changes: 5 additions & 5 deletions docs/install/compile/linux-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* **Ubuntu 14.04 (不推荐,不提供编译出现问题时的官方支持)**
* **Ubuntu 16.04 (GPU 版本支持 CUDA 10.1/10.2/11.0/11.1/11.2)**
* **Ubuntu 18.04 (GPU 版本支持 CUDA 10.1/10.2/11.0/11.1/11.2)**
* **Python 版本 3.6/3.7/3.8/3.9 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**

## 选择 CPU/GPU

Expand Down Expand Up @@ -135,7 +135,7 @@ cd /paddle
git checkout develop
```

注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持
注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持

#### 7. 创建并进入/paddle/build 路径下:

Expand Down Expand Up @@ -378,13 +378,13 @@ uname -m && cat /etc/*release

(请参照 Python 官方流程安装, 并保证拥有 20.2.2 及以上的 pip3 版本,请注意,python3.6 及以上版本环境下,pip3 并不一定对应 python 版本,如 python3.7 下默认只有 pip3.7)

* c.(Only For Python3)设置 Python3 相关的环境变量,这里以 python3.7 版本示例,请替换成您使用的版本(3.6、3.8、3.9):
* c.(Only For Python3)设置 Python3 相关的环境变量,这里以 python3.7 版本示例,请替换成您使用的版本(3.8、3.9):

1. 首先使用
```
find `dirname $(dirname $(which python3))` -name "libpython3.so"
```
找到 Python lib 的路径,如果是 3.6、3.7、3.8、3.9,请将`python3`改成`python3.6`、`python3.7`、`python3.8`、`python3.9`,然后将下面[python-lib-path]替换为找到文件路径
找到 Python lib 的路径,如果是 3.7、3.8、3.9、3.10,请将`python3`改成`python3.7`、`python3.8`、`python3.9`,`python3.10`,然后将下面[python-lib-path]替换为找到文件路径

2. 设置 PYTHON_LIBRARIES:
```
Expand Down Expand Up @@ -538,7 +538,7 @@ mkdir build && cd build
cmake .. -DPYTHON_EXECUTABLE:FILEPATH=[您可执行的 Python3 的路径] -DPYTHON_INCLUDE_DIR:PATH=[之前的 PYTHON_INCLUDE_DIRS] -DPYTHON_LIBRARY:FILEPATH=[之前的 PYTHON_LIBRARY] -DWITH_GPU=ON
```

注意:以上涉及 Python3 的命令,用 Python3.7 来举例,如您的 Python 版本为 3.6/3.8/3.9,请将上述命令中的 Python3.7 改成 Python3.6/Python3.8/Python3.9
注意:以上涉及 Python3 的命令,用 Python3.7 来举例,如您的 Python 版本为 3.8/3.9,请将上述命令中的 Python3.7 改成 Python3.8/Python3.9



Expand Down
8 changes: 4 additions & 4 deletions docs/install/compile/linux-compile_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* **Ubuntu 14.04 (not recommended, no official support for compilation problems)**
* **Ubuntu 16.04 (GPU version supports CUDA 10.1/10.2/11.0/11.1/11.2)**
* **Ubuntu 18.04 (GPU version supports CUDA 10.1/10.2/11.0/11.1/11.2)**
* **Python version 3.6/3.7/3.8/3.9 (64 bit)**
* **Python version 3.7/3.8/3.9/3.10 (64 bit)**

## Choose CPU/GPU

Expand Down Expand Up @@ -141,7 +141,7 @@ cd /paddle
git checkout develop
```

Note: python3.6、python3.7 version started supporting from release/1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch
Note: python3.6、python3.7 version started supporting from release/1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch, python3.10 version started supporting from release/2.3 branch

#### 7. Create and enter the /paddle/build path:

Expand Down Expand Up @@ -367,7 +367,7 @@ uname -m && cat /etc/*release
```
find `dirname $(dirname $(which python3))` -name "libpython3.so"
```
If it is 3.6,3.7,3.8,3.9, change `python3` to `python3.6`,`python3.7`, `python3.8`, `python3.9`, then replace [python-lib-path] in the following steps with the file path found.
If it is 3.7/3.8/3.9/3.10, change `python3` to `python3.7`, `python3.8`, `python3.9`, `python3.10`, then replace [python-lib-path] in the following steps with the file path found.

2. Set PYTHON_LIBRARIES:
```
Expand Down Expand Up @@ -511,7 +511,7 @@ mkdir build && cd build
```


Note: For the command involving Python 3, we use Python 3.7 as an example above, if the version of your Python is 3.6/3.8/3.9, please change Python3.7 in the commands to Python3.6/Python3.8/Python3.9
Note: For the command involving Python 3, we use Python 3.7 as an example above, if the version of your Python is 3.8/3.9, please change Python3.7 in the commands to Python3.8/Python3.9



Expand Down
8 changes: 4 additions & 4 deletions docs/install/compile/macos-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## 环境准备

* **macOS 版本 10.x/11.x (64 bit) (不支持 GPU 版本)**
* **Python 版本 3.6/3.7/3.8/3.9 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**

## 选择 CPU/GPU

Expand Down Expand Up @@ -90,7 +90,7 @@ cd /paddle
git checkout develop
```

注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持
注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持

#### 8. 创建并进入/paddle/build 路径下:

Expand Down Expand Up @@ -167,7 +167,7 @@ uname -m

#### 2. 安装 Python 以及 pip:

> **请不要使用 macOS 中自带 Python**,我们强烈建议您使用[Homebrew](https://brew.sh)安装 python(对于**Python3**请使用 python[官方下载](https://www.python.org/downloads/mac-osx/)python3.6.x、python3.7.x、python3.8、python3.9), pip 以及其他的依赖,这将会使您高效编译。
> **请不要使用 macOS 中自带 Python**,我们强烈建议您使用[Homebrew](https://brew.sh)安装 python(对于**Python3**请使用 python[官方下载](https://www.python.org/downloads/mac-osx/)python3.7.x、python3.8、python3.9、python3.10), pip 以及其他的依赖,这将会使您高效编译。

使用 Python 官网安装

Expand Down Expand Up @@ -243,7 +243,7 @@ cd Paddle
git checkout develop
```

注意:python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持
注意:python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持

#### 7. 并且请创建并进入一个叫 build 的目录下:

Expand Down
8 changes: 4 additions & 4 deletions docs/install/compile/macos-compile_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Environment preparation

* **macOS version 10.x/11.x (64 bit) (not support GPU version)**
* **Python version 3.6/3.7/3.8/3.9 (64 bit)**
* **Python version 3.7/3.8/3.9/3.10 (64 bit)**

## Choose CPU/GPU

Expand Down Expand Up @@ -93,7 +93,7 @@ cd /paddle
git checkout develop
```

Note: python3.6、python3.7 version started supporting from release/1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch
Note: python3.7 version started supporting from release/1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch, python3.10 version started supporting from release/2.3 branch

#### 8. Create and enter the /paddle/build path:

Expand Down Expand Up @@ -168,7 +168,7 @@ We used Python3.7 command as an example above, if the version of your Python is

#### 2. Install python and pip:

> **Please do not use the Python initially given by macOS**, we strongly recommend that you use [Homebrew](https://brew.sh/) to install python (for Python3 please use python [official download](https://www.python.org/downloads/mac-osx/) python3.6.x, python3.7.x, python3.8, python3.9), pip and other dependencies, This will greatly reduce the difficulty of installing and compiling.
> **Please do not use the Python initially given by macOS**, we strongly recommend that you use [Homebrew](https://brew.sh/) to install python (for Python3 please use python [official download](https://www.python.org/downloads/mac-osx/) python3.7.x, python3.8, python3.9, python3.10), pip and other dependencies, This will greatly reduce the difficulty of installing and compiling.

Install using Python official website

Expand Down Expand Up @@ -243,7 +243,7 @@ git clone https://github.com/PaddlePaddle/Paddle.git
cd Paddle
```

#### 6. Switch to develop branch to compile: (Note that python 3.6, python 3.7 version are supported from the 1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch)
#### 6. Switch to develop branch to compile: (Note that python 3.6, python 3.7 version are supported from the 1.2 branch, python3.8 version started supporting from release/1.8 branch, python3.9 version started supporting from release/2.1 branch, python3.10 version started supporting from release/2.3 branch)

```
git checkout develop
Expand Down
2 changes: 1 addition & 1 deletion docs/install/compile/mips-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

* **处理器:Loongson-3A R4 (Loongson-3A4000)**
* **操作系统:Loongnix release 1.0**
* **Python 版本 2.7.15+/3.5.1+/3.6/3.7/3.8 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**
* **pip 或 pip3 版本 20.2.2+ (64 bit)**

本文以 Loongson-3A4000 为例,介绍 Paddle 在 MIPS 架构下的源码编译。
Expand Down
2 changes: 1 addition & 1 deletion docs/install/compile/sw-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

* **处理器:SW6A**
* **操作系统:普华, iSoft Linux 5**
* **Python 版本 2.7.15+/3.5.1+/3.6/3.7/3.8 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**
* **pip 或 pip3 版本 9.0.1+ (64 bit)**

申威机器为 SW 架构,目前生态支持的软件比较有限,本文以比较 trick 的方式在申威机器上源码编译 Paddle,未来会随着申威软件的完善不断更新。
Expand Down
4 changes: 2 additions & 2 deletions docs/install/compile/windows-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
## 环境准备

* **Windows 7/8/10 专业版/企业版 (64bit)**
* **Python 版本 3.6/3.7/3.8/3.9/3.10 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**
* **Visual Studio 2017/2019 社区版/专业版/企业版**

## 选择 CPU/GPU
Expand All @@ -24,7 +24,7 @@

> **git**:官网下载[链接](https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/Git-2.35.1.2-64-bit.exe),使用默认选项安装。

> **python**:官网[链接](https://www.python.org/downloads/windows/),可选择 3.6/3.7/3.8/3.9 中任一版本的 Windows installer(64-bit)安装。安装时注意勾选 `Add Python 3.x to PATH`,将 Python 添加到环境变量中。
> **python**:官网[链接](https://www.python.org/downloads/windows/),可选择 3.7/3.8/3.9/3.10 中任一版本的 Windows installer(64-bit)安装。安装时注意勾选 `Add Python 3.x to PATH`,将 Python 添加到环境变量中。

> **Visual studio**:需根据 CUDA 版本选择对应的 Visual studio 版本,当只编译 CPU 版本或者 CUDA 版本 < 11.2 时,安装 VS2017;当 CUDA 版本 >= 11.2 时,安装 VS2019。官网[链接](https://visualstudio.microsoft.com/zh-hans/vs/older-downloads/),需要登录后下载,建议下载 Community 社区版。在安装时需要在工作负荷一栏中勾选 `使用 C++的桌面开发` 和 `通用 Windows 平台开发`,并在语言包一栏中选择 `英语`。

Expand Down
2 changes: 1 addition & 1 deletion docs/install/compile/windows-compile_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ There is one compilation methods in Windows system:
git checkout develop
```

Note: python3.6、python3.7 version started supporting from release/1.2, python3.8 version started supporting from release/1.8, python3.9 version started supporting from release/2.1
Note: python3.7 version started supporting from release/1.2, python3.8 version started supporting from release/1.8, python3.9 version started supporting from release/2.1, python3.10 version started supporting from release/2.3 branch

4. Create a directory called build and enter it:

Expand Down
2 changes: 1 addition & 1 deletion docs/install/compile/zhaoxin-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

* **处理器:ZHAOXIN KaiSheng KH-37800D**
* **操作系统:centos7**
* **Python 版本 2.7.15+/3.5.1+/3.6/3.7/3.8 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**
* **pip 或 pip3 版本 9.0.1+ (64 bit)**

兆芯为 x86 架构,编译方法与[Linux 下从源码编译 cpu 版](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/compile/compile_Linux.html)一致。
Expand Down
2 changes: 1 addition & 1 deletion docs/install/conda/linux-conda_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ which python
1.2.2 Check the version of Python


Use the following command to confirm it's version is 3.6/3.7/3.8/3.9
Use the following command to confirm it's version is 3.7/3.8/3.9/3.10

```
python --version
Expand Down
2 changes: 1 addition & 1 deletion docs/install/conda/macos-conda_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ which python

1.2.2 Check the version of Python

Use the following command to confirm it's version is 3.6/3.7/3.8/3.9
Use the following command to confirm it's version is 3.7/3.8/3.9/3.10

```
python --version
Expand Down
2 changes: 1 addition & 1 deletion docs/install/conda/windows-conda_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ which python

1.2.2 Check the version of Python

Use the following command to confirm it's version is 3.6/3.7/3.8/3.9
Use the following command to confirm it's version is 3.7/3.8/3.9/3.10

```
python --version
Expand Down
4 changes: 2 additions & 2 deletions docs/install/index_cn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

**3. Python 和 pip 版本要求:**

* Python 的版本要求 3.6/3.7/3.8/3.9
* Python 的版本要求 3.7/3.8/3.9/3.10
* Python 具有 pip, 且 pip 的版本要求 20.2.2+
* Python 和 pip 要求是 64 位版本

Expand Down Expand Up @@ -126,7 +126,7 @@

4. 检查 Python 的版本

使用以下命令确认是 3.6/3.7/3.8/3.9
使用以下命令确认是 3.7/3.8/3.9/3.10
::

python --version
Expand Down
4 changes: 2 additions & 2 deletions docs/install/index_en.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ The manuals will guide you to build and install PaddlePaddle on your 64-bit desk
3. Version requirements of python and pip:
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

* Python requires version 3.6/3.7/3.8/3.9
* Python requires version 3.7/3.8/3.9/3.10
* Python needs pip, and pip requires version 20.2.2 or above
* Python and pip requires 64-bit

Expand Down Expand Up @@ -133,7 +133,7 @@ This section describes how to use pip to install.

4. Check the version of Python

Confirm the Python is 3.6/3.7/3.8/3.9 using command
Confirm the Python is 3.7/3.8/3.9/3.10 using command
::

python --version
Expand Down
4 changes: 2 additions & 2 deletions docs/install/pip/linux-pip.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* **Ubuntu 16.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2)**
* **Ubuntu 18.04 (GPU 版本支持 CUDA 10.1/10.2/11.1/11.2)**

* **Python 版本 3.6/3.7/3.8/3.9 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**

* **pip 或 pip3 版本 20.2.2 或更高版本 (64 bit)**

Expand All @@ -35,7 +35,7 @@

* 需要确认 python 的版本是否满足要求

* 使用以下命令确认是 3.6/3.7/3.8/3.9
* 使用以下命令确认是 3.7/3.8/3.9/3.10

python --version

Expand Down
4 changes: 2 additions & 2 deletions docs/install/pip/linux-pip_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* **Ubuntu 16.04 (GPUVersion Supports CUDA 10.1/10.2/11.2)**
* **Ubuntu 18.04 (GPUVersion Supports CUDA 10.1/10.2/11.2)**

* **Python Version: 3.6/3.7/3.8/3.9 (64 bit)**
* **Python Version: 3.7/3.8/3.9/3.10 (64 bit)**

* **pip or pip3 Version 20.2.2 or above (64 bit)**

Expand All @@ -35,7 +35,7 @@

* You need to confirm whether the version of Python meets the requirements

* Use the following command to confirm that it is 3.6/3.7/3.8/3.9
* Use the following command to confirm that it is 3.7/3.8/3.9/3.10

python --version

Expand Down
6 changes: 3 additions & 3 deletions docs/install/pip/macos-pip.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

* **macOS 版本 10.11/10.12/10.13/10.14 (64 bit) (不支持 GPU 版本)**

* **Python 版本 3.6/3.7/3.8/3.9 (64 bit)**
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**

* **pip 或 pip3 版本 20.2.2 或更高版本 (64 bit)**

Expand All @@ -33,7 +33,7 @@

* 需要确认 python 的版本是否满足要求

* 使用以下命令确认是 3.6/3.7/3.8/3.9
* 使用以下命令确认是 3.7/3.8/3.9/3.10

```
python --version
Expand Down Expand Up @@ -89,7 +89,7 @@
* macOS 上您需要安装 unrar 以支持 PaddlePaddle,可以使用命令 `brew install rar`
* 请确认需要安装 PaddlePaddle 的 Python 是您预期的位置,因为您计算机可能有多个 Python。根据您的环境您可能需要将说明中所有命令行中的 python 替换为具体的 Python 路径。
* 默认下载最新稳定版的安装包,如需获取开发版安装包,请参考[这里](https://www.paddlepaddle.org.cn/install/quick/zh/1.8.5-windows-pip)
* 使用 macOS 中自带 Python 可能会导致安装失败。请使用[Python.org](https://www.python.org/downloads/mac-osx/)提供的 python3.6.x、python3.7.x、python3.8.x 或 python3.9.x。
* 使用 macOS 中自带 Python 可能会导致安装失败。请使用[Python.org](https://www.python.org/downloads/mac-osx/)提供的 python3.7.x、python3.8.x 、python3.9.x 或 python3.10.x。

## **三、验证安装**

Expand Down
Loading