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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1787c4
wait
gsq7474741 Nov 29, 2022
0b500bc
Update arm-compile.md
gsq7474741 Nov 30, 2022
7a4506a
fix some compile docs
gsq7474741 Nov 30, 2022
e4cfd39
MACOS -> macOS
gsq7474741 Nov 30, 2022
fe6fb0e
fix some support py version
gsq7474741 Nov 30, 2022
aa8b9b6
fix py ver
gsq7474741 Nov 30, 2022
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
6 changes: 2 additions & 4 deletions docs/install/FAQ.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,11 @@

- 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/`
> 请检查您的 Python 版本是否小于 3.7 ，如果是，请使用 Python 3.7 或以上版本。
gsq7474741 marked this conversation as resolved.
Show resolved Hide resolved

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

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

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

Expand Down
6 changes: 1 addition & 5 deletions docs/install/FAQ_en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,7 @@

- `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 /`

> Please check whether your Python version lower than 3.7. If so, please upgrade your Python version to 3.7 or higher.

- Use customized openblas under MACOS. See issue for details:
gsq7474741 marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
4 changes: 2 additions & 2 deletions docs/install/Tables.md
View file
Open in desktop
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+.x </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
View file
Open in desktop
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+.x </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
View file
Open in desktop
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 版本 2.7.15+/3.5.1+/3.6/3.7/3.8/3.9 (64 bit)**
* **pip 或 pip3 版本 9.0.1+ (64 bit)**

飞腾 FT2000+和鲲鹏 920 处理器均为 ARMV8 架构，在该架构上编译 Paddle 的方式一致，本文以 FT2000+为例，介绍 Paddle 的源码编译。
Expand Down
2 changes: 1 addition & 1 deletion docs/install/compile/mips-compile.md
View file
Open in desktop
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 版本 2.7.15+/3.5.1+/3.6/3.7/3.8/3.9 (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
View file
Open in desktop
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 版本 2.7.15+/3.5.1+/3.6/3.7/3.8/3.9 (64 bit)**
* **pip 或 pip3 版本 9.0.1+ (64 bit)**

申威机器为 SW 架构，目前生态支持的软件比较有限，本文以比较 trick 的方式在申威机器上源码编译 Paddle，未来会随着申威软件的完善不断更新。
Expand Down
2 changes: 1 addition & 1 deletion docs/install/compile/zhaoxin-compile.md
View file
Open in desktop
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 版本 2.7.15+/3.5.1+/3.6/3.7/3.8/3.9 (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/pip/macos-pip.md
View file
Open in desktop
Original file line number Diff line number Diff line change
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。
gsq7474741 marked this conversation as resolved.
Show resolved Hide resolved

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

Expand Down