diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3ee2d1d6610..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,44 +0,0 @@ -language: cpp -cache: - bundler: true - directories: - - $HOME/.ccache - - $HOME/.cache/pip - - $HOME/docker - - $TRAVIS_BUILD_DIR/external/Paddle/build/third_party - -sudo: required -dist: trusty -services: - - docker -os: - - linux - -addons: - apt: - packages: - - git - - python - - python-pip - - python2.7-dev - ssh_known_hosts: 13.229.163.131 -before_install: - - sudo pip install pylint pytest astroid isort - -before_install: - - sudo pip install pylint pytest astroid isort - # Force the script to be timed out after certain duration - - function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; } - -jobs: - include: - # Force the deploy_docs.sh to time out after 40 minutes. - # Travis CI will terminate the build completely after 50 minutes and won't allow caching to happen. - # Time out the build preemptively to cache built libraries. - - script: timeout 2400 scripts/deploy_docs.sh full - name: Generate Docs - -notifications: - email: - on_success: change - on_failure: always diff --git a/docs/faq/install_cn.md b/docs/faq/install_cn.md index 439a9b22dc2..eabd50dae60 100644 --- a/docs/faq/install_cn.md +++ b/docs/faq/install_cn.md @@ -29,13 +29,7 @@ + 操作步骤： -1. Python2 情况下，使用如下命令安装 PaddlePaddle。 - - ```bash - pip install paddlepaddle -i https://mirror.baidu.com/pypi/simple/ - ``` - -2. Python3 情况下，使用如下命令安装 PaddlePaddle。 +1. 使用如下命令安装 PaddlePaddle。 ```bash pip3 install paddlepaddle -i https://mirror.baidu.com/pypi/simple/ diff --git a/docs/guides/advanced/visualdl_en.md b/docs/guides/advanced/visualdl_en.md index 8a54dd631d8..6aa671f8a3b 100755 --- a/docs/guides/advanced/visualdl_en.md +++ b/docs/guides/advanced/visualdl_en.md @@ -111,7 +111,6 @@ sudo apt-get install python3-pip python3-dev python-virtualenv Then create a Virtualenv environment by one of following command: ``` -virtualenv ~/vdl # for Python2.7 virtualenv -p python3 ~/vdl for Python 3.x ``` diff --git a/docs/guides/hardware_support/xpu_docs/paddle_install_cn.md b/docs/guides/hardware_support/xpu_docs/paddle_install_cn.md index b9f41c30ed3..671ab76f733 100644 --- a/docs/guides/hardware_support/xpu_docs/paddle_install_cn.md +++ b/docs/guides/hardware_support/xpu_docs/paddle_install_cn.md @@ -157,24 +157,6 @@ cmake .. -DPY_VERSION=3.6 \ make -j20 ``` -Python2 - -``` -cmake .. -DPY_VERSION=2.7 \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_GPU=OFF \ - -DWITH_XPU=ON \ - -DON_INFER=ON \ - -DWITH_PYTHON=ON \ - -DWITH_AVX=ON \ - -DWITH_MKL=ON \ - -DWITH_MKLDNN=ON \ - -DWITH_XPU_BKCL=ON \ - -DWITH_DISTRIBUTE=ON \ - -DWITH_NCCL=OFF - -make -j20 -``` **飞腾 CPU+昆仑 XPU+麒麟 V10 系统** diff --git a/docs/install/FAQ.md b/docs/install/FAQ.md index 2b3bb22f7b1..707cb3d6e16 100644 --- a/docs/install/FAQ.md +++ b/docs/install/FAQ.md @@ -5,13 +5,6 @@ > 请[安装 nccl2](https://developer.nvidia.com/nccl/nccl-download) -- CentOS6 下如何编译 python2.7 为共享库? - - > 使用以下指令： - - ./configure --prefix=/usr/local/python2.7 --enable-shared - make && make install - - Ubuntu18.04 下 libidn11 找不到？ diff --git a/docs/install/FAQ_en.md b/docs/install/FAQ_en.md index 3aae1e0abbb..1713555e57b 100644 --- a/docs/install/FAQ_en.md +++ b/docs/install/FAQ_en.md @@ -3,16 +3,6 @@ # **FAQ** -- How to compile python2.7 as a shared library under CentOS6? - - > Use the following instructions: - - - - ./configure --prefix=/usr/local/python2.7 --enable-shared - make && make install - - - Ubuntu18.04 under libidn11 can not be found? > Use the following instructions: diff --git a/docs/install/compile/arm-compile.md b/docs/install/compile/arm-compile.md index d80b30a6c8b..2e0459c16f1 100644 --- a/docs/install/compile/arm-compile.md +++ b/docs/install/compile/arm-compile.md @@ -86,11 +86,6 @@ >具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile) - For Python2: - ``` - cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_ARM=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_XBYAK=OFF - ``` - For Python3: ``` cmake .. -DPY_VERSION=3 -DPYTHON_EXECUTABLE=`which python3` -DWITH_ARM=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_XBYAK=OFF diff --git a/docs/install/compile/mips-compile.md b/docs/install/compile/mips-compile.md index d77220916cc..c10c6c5c2c7 100644 --- a/docs/install/compile/mips-compile.md +++ b/docs/install/compile/mips-compile.md @@ -101,11 +101,6 @@ >具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile) - For Python2: - ``` - 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 - ``` - For Python3: ``` 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 diff --git a/docs/install/compile/sw-compile.md b/docs/install/compile/sw-compile.md index a85da8d4130..06f76731c41 100644 --- a/docs/install/compile/sw-compile.md +++ b/docs/install/compile/sw-compile.md @@ -66,10 +66,6 @@ >具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile) - For Python2: - ``` - 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 - ``` For Python3: ``` 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 @@ 11. 在当前机器或目标机器安装编译好的`.whl`包： ``` - python2 -m pip install -U（whl 包的名字）`或`python3 -m pip install -U（whl 包的名字） + python3 -m pip install -U（whl 包的名字） ``` 恭喜，至此您已完成 PaddlePaddle 在 FT 环境下的编译安装。 diff --git a/docs/install/compile/zhaoxin-compile.md b/docs/install/compile/zhaoxin-compile.md index 3f2f7b437f1..38ebc120309 100644 --- a/docs/install/compile/zhaoxin-compile.md +++ b/docs/install/compile/zhaoxin-compile.md @@ -90,10 +90,6 @@ >具体编译选项含义请参见[编译选项表](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/install/Tables.html#Compile) - For Python2: - ``` - cmake .. -DPY_VERSION=2 -DPYTHON_EXECUTABLE=`which python2` -DWITH_MKL=ON -DWITH_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DON_INFER=ON -DWITH_PYTHON=ON - ``` For Python3: ``` 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 @@ 11. 在当前机器或目标机器安装编译好的`.whl`包： ``` - python2 -m pip install -U（whl 包的名字）`或`python3 -m pip install -U（whl 包的名字） + python3 -m pip install -U（whl 包的名字） ``` 恭喜，至此您已完成 PaddlePaddle 在 FT 环境下的编译安装。 diff --git a/docs/install/install_Kunlun_en.md b/docs/install/install_Kunlun_en.md index 3bfbc0121b5..5c226961bc6 100644 --- a/docs/install/install_Kunlun_en.md +++ b/docs/install/install_Kunlun_en.md @@ -173,24 +173,6 @@ cmake .. -DPY_VERSION=3.6 \ make -j20 ``` -For Python2 - -``` -cmake .. -DPY_VERSION=2.7 \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_GPU=OFF \ - -DWITH_XPU=ON \ - -DON_INFER=ON \ - -DWITH_PYTHON=ON \ - -DWITH_AVX=ON \ - -DWITH_MKL=ON \ - -DWITH_MKLDNN=ON \ - -DWITH_XPU_BKCL=ON \ - -DWITH_DISTRIBUTE=ON \ - -DWITH_NCCL=OFF - -make -j20 -``` **Phytium CPU+Kunlun XPU+Kylin release V10**