Skip to content

Commit 1db127f

Browse files
authored
[CodeStyle][py27]Python2退场:清除文档中和Python2有关的命令 (#5466)
* remove python2 related docs, test=document_fix * remove travis.yml * revert changes in FAQ * add a blank line to avoid conflict
1 parent b21a16b commit 1db127f

File tree

11 files changed

+3
-125
lines changed

11 files changed

+3
-125
lines changed

.travis.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

docs/faq/install_cn.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@
2929

3030
+ 操作步骤:
3131

32-
1. Python2 情况下,使用如下命令安装 PaddlePaddle。
33-
34-
```bash
35-
pip install paddlepaddle -i https://mirror.baidu.com/pypi/simple/
36-
```
37-
38-
2. Python3 情况下,使用如下命令安装 PaddlePaddle。
32+
1. 使用如下命令安装 PaddlePaddle。
3933

4034
```bash
4135
pip3 install paddlepaddle -i https://mirror.baidu.com/pypi/simple/

docs/guides/advanced/visualdl_en.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ sudo apt-get install python3-pip python3-dev python-virtualenv
111111

112112
Then create a Virtualenv environment by one of following command:
113113
```
114-
virtualenv ~/vdl # for Python2.7
115114
virtualenv -p python3 ~/vdl for Python 3.x
116115
```
117116

docs/guides/hardware_support/xpu_docs/paddle_install_cn.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,24 +157,6 @@ cmake .. -DPY_VERSION=3.6 \
157157
make -j20
158158
```
159159

160-
Python2
161-
162-
```
163-
cmake .. -DPY_VERSION=2.7 \
164-
-DCMAKE_BUILD_TYPE=Release \
165-
-DWITH_GPU=OFF \
166-
-DWITH_XPU=ON \
167-
-DON_INFER=ON \
168-
-DWITH_PYTHON=ON \
169-
-DWITH_AVX=ON \
170-
-DWITH_MKL=ON \
171-
-DWITH_MKLDNN=ON \
172-
-DWITH_XPU_BKCL=ON \
173-
-DWITH_DISTRIBUTE=ON \
174-
-DWITH_NCCL=OFF
175-
176-
make -j20
177-
```
178160

179161
**飞腾 CPU+昆仑 XPU+麒麟 V10 系统**
180162

docs/install/FAQ.md

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

66
> [安装 nccl2](https://developer.nvidia.com/nccl/nccl-download)
77
8-
- CentOS6 下如何编译 python2.7 为共享库?
9-
10-
> 使用以下指令:
11-
12-
./configure --prefix=/usr/local/python2.7 --enable-shared
13-
make && make install
14-
158
<!--TODO please add more F&Q parts here-->
169

1710
- Ubuntu18.04 下 libidn11 找不到?

docs/install/FAQ_en.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33

44
# **FAQ**
55

6-
- How to compile python2.7 as a shared library under CentOS6?
7-
8-
> Use the following instructions:
9-
10-
11-
12-
./configure --prefix=/usr/local/python2.7 --enable-shared
13-
make && make install
14-
15-
166
- Ubuntu18.04 under libidn11 can not be found?
177

188
> Use the following instructions:

docs/install/compile/arm-compile.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@
8686
8787
>具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile)
8888
89-
For Python2:
90-
```
91-
cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_ARM=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_XBYAK=OFF
92-
```
93-
9489
For Python3:
9590
```
9691
cmake .. -DPY_VERSION=3 -DPYTHON_EXECUTABLE=`which python3` -DWITH_ARM=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_XBYAK=OFF

docs/install/compile/mips-compile.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
102102
>具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile)
103103
104-
For Python2:
105-
```
106-
cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_MIPS=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_XBYAK=OFF -DWITH_MKL=OFF
107-
```
108-
109104
For Python3:
110105
```
111106
cmake .. -DPY_VERSION=3 -DPYTHON_EXECUTABLE=`which python3` -DWITH_MIPS=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_XBYAK=OFF -DWITH_MKL=OFF

docs/install/compile/sw-compile.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@
6666
6767
>具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile)
6868
69-
For Python2:
70-
```
71-
cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_MKL=OFF -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON -DWITH_XBYAK=OFF -DWITH_SW=ON -DCMAKE_CXX_FLAGS="-Wno-error -w" -DWITH_RCCL=OFF
72-
```
7369
For Python3:
7470
```
7571
cmake .. -DPY_VERSION=3 -DPYTHON_EXECUTABLE=`which python3` -DWITH_MKL=OFF -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON -DWITH_XBYAK=OFF -DWITH_SW=ON -DCMAKE_CXX_FLAGS="-Wno-error -w" -DWITH_RCCL=OFF
@@ -86,7 +82,7 @@
8682
11. 在当前机器或目标机器安装编译好的`.whl`包:
8783
8884
```
89-
python2 -m pip install -U(whl 包的名字)`或`python3 -m pip install -U(whl 包的名字)
85+
python3 -m pip install -U(whl 包的名字)
9086
```
9187
9288
恭喜,至此您已完成 PaddlePaddle 在 FT 环境下的编译安装。

docs/install/compile/zhaoxin-compile.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@
9090
9191
>具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile)
9292
93-
For Python2:
94-
```
95-
cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_MKL=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON
96-
```
9793
For Python3:
9894
```
9995
cmake .. -DPY_VERSION=3 -DPYTHON_EXECUTABLE=`which python3` -DWITH_MKL=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON
@@ -110,7 +106,7 @@
110106
11. 在当前机器或目标机器安装编译好的`.whl`包:
111107
112108
```
113-
python2 -m pip install -U(whl 包的名字)`或`python3 -m pip install -U(whl 包的名字)
109+
python3 -m pip install -U(whl 包的名字)
114110
```
115111
116112
恭喜,至此您已完成 PaddlePaddle 在 FT 环境下的编译安装。

0 commit comments

Comments
 (0)