From 5bc49c4fabf77c066c5b1e40a1b11903766faa00 Mon Sep 17 00:00:00 2001 From: Guanghua Yu <742925032@qq.com> Date: Mon, 17 May 2021 16:30:23 +0800 Subject: [PATCH] update install docs (#3038) * update install docs * fix slim doc,test=document_fix --- configs/slim/README.md | 13 +++++++++---- configs/solov2/README.md | 1 - docs/tutorials/INSTALL.md | 14 +++++++------- docs/tutorials/INSTALL_cn.md | 16 +++++++--------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/configs/slim/README.md b/configs/slim/README.md index e90537d53..a695f9bb7 100755 --- a/configs/slim/README.md +++ b/configs/slim/README.md @@ -12,12 +12,17 @@ ## 实验环境 - Python 3.7+ -- PaddlePaddle >= 2.0.1 +- PaddlePaddle >= 2.1.0 - PaddleSlim >= 2.0.0 -- CUDA 9.0+ -- cuDNN >=7.5 +- CUDA 10.1+ +- cuDNN >=7.6.5 + +**PaddleDetection、 PaddlePaddle与PaddleSlim 版本关系:** +| PaddleDetection版本 | PaddlePaddle版本 | PaddleSlim版本 | 备注 | +| :------------------: | :---------------: | :-------: |:---------------: | +| release/2.1 | >= 2.1.0 | 2.1 | -- | +| release/2.0 | >= 2.0.1 | 2.0 | 量化依赖Paddle 2.1及PaddleSlim 2.1 | -**注意：** 量化训练需要依赖Paddle develop分支，可在[PaddlePaddle每日版本](https://www.paddlepaddle.org.cn/documentation/docs/zh/install/Tables.html#whl-dev)中下载安装合适的PaddlePaddle版本。 #### 安装PaddleSlim - 方法一：直接安装： diff --git a/configs/solov2/README.md b/configs/solov2/README.md index e5bcc1c34..81d6cddfa 100644 --- a/configs/solov2/README.md +++ b/configs/solov2/README.md @@ -25,7 +25,6 @@ SOLOv2 (Segmenting Objects by Locations) is a fast instance segmentation framewo **Notes:** - SOLOv2 is trained on COCO train2017 dataset and evaluated on val2017 results of `mAP(IoU=0.5:0.95)`. -- SOLOv2 training performace is dependented on Paddle develop branch, performance reproduction shoule based on [Paddle daily version](https://www.paddlepaddle.org.cn/documentation/docs/zh/install/Tables.html#whl-dev) or Paddle 2.0.1(will be published on 2021.03), performace will loss slightly is training base on Paddle 2.0.0 ## Citations ``` diff --git a/docs/tutorials/INSTALL.md b/docs/tutorials/INSTALL.md index 3d4191dfc..e5c5a8479 100644 --- a/docs/tutorials/INSTALL.md +++ b/docs/tutorials/INSTALL.md @@ -10,11 +10,11 @@ For general information about PaddleDetection, please see [README.md](https://gi ## Requirements: -- PaddlePaddle 2.0.1 +- PaddlePaddle 2.1 - OS 64 bit -- Python 3(3.5.1+/3.6/3.7)，64 bit +- Python 3(3.5.1+/3.6/3.7/3.8/3.9)，64 bit - pip/pip3(9.0.1+), 64 bit -- CUDA >= 9.0 +- CUDA >= 10.1 - cuDNN >= 7.6 @@ -22,6 +22,7 @@ Dependency of PaddleDetection and PaddlePaddle: | PaddleDetection version | PaddlePaddle version | tips | | :----------------: | :---------------: | :-------: | +| release/2.1 | >= 2.1.0 | Dygraph mode is set as default | | release/2.0 | >= 2.0.1 | Dygraph mode is set as default | | release/2.0-rc | >= 2.0.1 | -- | | release/0.5 | >= 1.8.4 | Cascade R-CNN and SOLOv2 depends on 2.0.0.rc | @@ -34,17 +35,16 @@ Dependency of PaddleDetection and PaddlePaddle: ### 1. Install PaddlePaddle ``` -# CUDA9.0 -python -m pip install paddlepaddle-gpu==2.0.1.post90 -i https://mirror.baidu.com/pypi/simple # CUDA10.1 -python -m pip install paddlepaddle-gpu==2.0.1.post101 -f https://mirror.baidu.com/pypi/simple +python -m pip install paddlepaddle-gpu==2.1.0.post101 -f https://paddlepaddle.org.cn/whl/mkl/stable.html # CPU python -m pip install paddlepaddle -i https://mirror.baidu.com/pypi/simple ``` -For more installation methods such as conda or compile with source code, please refer to the [installation document](https://www.paddlepaddle.org.cn/documentation/docs/en/install/index_en.html) +- For more CUDA version or environment to quick install, please refer to the [PaddlePaddle Quick Installation document](https://www.paddlepaddle.org.cn/install/quick) +- For more installation methods such as conda or compile with source code, please refer to the [installation document](https://www.paddlepaddle.org.cn/documentation/docs/en/install/index_en.html) Please make sure that your PaddlePaddle is installed successfully and the version is not lower than the required version. Use the following command to verify. diff --git a/docs/tutorials/INSTALL_cn.md b/docs/tutorials/INSTALL_cn.md index b64b94762..ee9073c09 100644 --- a/docs/tutorials/INSTALL_cn.md +++ b/docs/tutorials/INSTALL_cn.md @@ -7,17 +7,18 @@ ## 环境要求 -- PaddlePaddle 2.0.1 +- PaddlePaddle 2.1 - OS 64位操作系统 -- Python 3(3.5.1+/3.6/3.7)，64位版本 +- Python 3(3.5.1+/3.6/3.7/3.8/3.9)，64位版本 - pip/pip3(9.0.1+)，64位版本 -- CUDA >= 9.0 +- CUDA >= 10.1 - cuDNN >= 7.6 PaddleDetection 依赖 PaddlePaddle 版本关系： | PaddleDetection版本 | PaddlePaddle版本 | 备注 | | :------------------: | :---------------: | :-------: | +| release/2.1 | >= 2.1.0 | 默认使用动态图模式 | | release/2.0 | >= 2.0.1 | 默认使用动态图模式 | | release/2.0-rc | >= 2.0.1 | -- | | release/0.5 | >= 1.8.4 | 大部分模型>=1.8.4即可运行，Cascade R-CNN系列模型与SOLOv2依赖2.0.0.rc版本 | @@ -29,17 +30,14 @@ PaddleDetection 依赖 PaddlePaddle 版本关系： ### 1. 安装PaddlePaddle ``` -# CUDA9.0 -python -m pip install paddlepaddle-gpu==2.0.1.post90 -i https://mirror.baidu.com/pypi/simple - # CUDA10.1 -python -m pip install paddlepaddle-gpu==2.0.1.post101 -f https://mirror.baidu.com/pypi/simple +python -m pip install paddlepaddle-gpu==2.1.0.post101 -f https://paddlepaddle.org.cn/whl/mkl/stable.html # CPU python -m pip install paddlepaddle -i https://mirror.baidu.com/pypi/simple ``` - -更多安装方式例如conda或源码编译安装方法，请参考PaddlePaddle[安装文档](https://www.paddlepaddle.org.cn/documentation/docs/zh/install/index_cn.html) +- 更多CUDA版本或环境快速安装，请参考[PaddlePaddle快速安装文档](https://www.paddlepaddle.org.cn/install/quick) +- 更多安装方式例如conda或源码编译安装方法，请参考[PaddlePaddle安装文档](https://www.paddlepaddle.org.cn/documentation/docs/zh/install/index_cn.html) 请确保您的PaddlePaddle安装成功并且版本不低于需求版本。使用以下命令进行验证。 -- GitLab