Skip to content

Commit fe6fb0e

Browse files
gsq7474741gsq7474741
committed
fix some support py version
1 parent e4cfd39 commit fe6fb0e

18 files changed

+31
-43
lines changed

‎docs/install/FAQ.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@
8282

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

85-
86-
<a name="MACPRO"></a>
87-
88-
- macOS 下安装 PaddlePaddle 后 import paddle.fluid 出现`Fatal Python error: PyThreadState_Get: no current thread running`错误
89-
90-
> 请检查您的 Python 版本是否小于 3.7 ，如果是，请使用 Python 3.7 或以上版本。
91-
9285
<a name="OPENBLAS"></a>
9386

9487
- macOS 下使用自定义的 openblas 详见 issue：

‎docs/install/FAQ_en.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@
108108

109109
> 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.
110110
111-
112-
- `Fatal Python error: PyThreadState_Get: no current thread running` error occurs when importing paddle.fluid after installing PaddlePaddle on macOS.
113-
114-
> Please check whether your Python version lower than 3.7. If so, please upgrade your Python version to 3.7 or higher.
115-
116111
- Use customized openblas under macOS. See issue for details:
117112

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

‎docs/install/compile/linux-compile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* **Ubuntu 14.04 (不推荐，不提供编译出现问题时的官方支持)**
99
* **Ubuntu 16.04 (GPU 版本支持 CUDA 10.1/10.2/11.0/11.1/11.2)**
1010
* **Ubuntu 18.04 (GPU 版本支持 CUDA 10.1/10.2/11.0/11.1/11.2)**
11-
* **Python 版本 3.6/3.7/3.8/3.9 (64 bit)**
11+
* **Python 版本 3.7/3.8/3.9/3.10 (64 bit)**
1212

1313
## 选择 CPU/GPU
1414

@@ -135,7 +135,7 @@ cd /paddle
135135
git checkout develop
136136
```
137137
138-
注意：python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持
138+
注意：python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持
139139
140140
#### 7. 创建并进入/paddle/build 路径下：
141141
@@ -384,7 +384,7 @@ uname -m && cat /etc/*release
384384
```
385385
find `dirname $(dirname $(which python3))` -name "libpython3.so"
386386
```
387-
找到 Python lib 的路径，如果是 3.7、3.8、3.9，请将`python3`改成`python3.7`、`python3.8`、`python3.9`，然后将下面[python-lib-path]替换为找到文件路径
387+
找到 Python lib 的路径，如果是 3.7、3.8、3.9、3.10，请将`python3`改成`python3.7`、`python3.8`、`python3.9`，`python3.10`，然后将下面[python-lib-path]替换为找到文件路径
388388
389389
2. 设置 PYTHON_LIBRARIES：
390390
```

‎docs/install/compile/linux-compile_en.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* **Ubuntu 14.04 (not recommended, no official support for compilation problems)**
99
* **Ubuntu 16.04 (GPU version supports CUDA 10.1/10.2/11.0/11.1/11.2)**
1010
* **Ubuntu 18.04 (GPU version supports CUDA 10.1/10.2/11.0/11.1/11.2)**
11-
* **Python version 3.6/3.7/3.8/3.9 (64 bit)**
11+
* **Python version 3.7/3.8/3.9/3.10 (64 bit)**
1212

1313
## Choose CPU/GPU
1414

@@ -141,7 +141,7 @@ cd /paddle
141141
git checkout develop
142142
```
143143
144-
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
144+
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
145145
146146
#### 7. Create and enter the /paddle/build path:
147147
@@ -367,7 +367,7 @@ uname -m && cat /etc/*release
367367
```
368368
find `dirname $(dirname $(which python3))` -name "libpython3.so"
369369
```
370-
If it is 3.7,3.8,3.9, change `python3` to `python3.7`, `python3.8`, `python3.9`, then replace [python-lib-path] in the following steps with the file path found.
370+
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.
371371
372372
2. Set PYTHON_LIBRARIES:
373373
```

‎docs/install/compile/macos-compile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## 环境准备
44

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

88
## 选择 CPU/GPU
99

@@ -90,7 +90,7 @@ cd /paddle
9090
git checkout develop
9191
```
9292
93-
注意：python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持
93+
注意：python3.6、python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持
9494
9595
#### 8. 创建并进入/paddle/build 路径下：
9696
@@ -243,7 +243,7 @@ cd Paddle
243243
git checkout develop
244244
```
245245
246-
注意：python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持
246+
注意：python3.7 版本从 release/1.2 分支开始支持, python3.8 版本从 release/1.8 分支开始支持, python3.9 版本从 release/2.1 分支开始支持, python3.10 版本从 release/2.3 分支开始支持
247247
248248
#### 7. 并且请创建并进入一个叫 build 的目录下：
249249

‎docs/install/compile/macos-compile_en.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Environment preparation
44

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

88
## Choose CPU/GPU
99

@@ -93,7 +93,7 @@ cd /paddle
9393
git checkout develop
9494
```
9595

96-
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
96+
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
9797

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

@@ -243,7 +243,7 @@ git clone https://github.com/PaddlePaddle/Paddle.git
243243
cd Paddle
244244
```
245245
246-
#### 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)
246+
#### 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)
247247
248248
```
249249
git checkout develop

‎docs/install/compile/windows-compile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## 环境准备
88

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

1313
## 选择 CPU/GPU
@@ -24,7 +24,7 @@
2424
2525
> **git**：官网下载[链接](https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/Git-2.35.1.2-64-bit.exe)，使用默认选项安装。
2626
27-
> **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 添加到环境变量中。
27+
> **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 添加到环境变量中。
2828
2929
> **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 平台开发`，并在语言包一栏中选择 `英语`。
3030

‎docs/install/compile/windows-compile_en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ There is one compilation methods in Windows system:
7171
git checkout develop
7272
```
7373
74-
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
74+
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
7575
7676
4. Create a directory called build and enter it:
7777

‎docs/install/conda/linux-conda_en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ which python
7979
1.2.2 Check the version of Python
8080

8181

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

8484
```
8585
python --version

‎docs/install/conda/macos-conda_en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ which python
8383

8484
1.2.2 Check the version of Python
8585

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

8888
```
8989
python --version

0 commit comments

Comments
 (0)