From 7c41cb35c95b6ad26d6975cfc1d32f8b23135cd5 Mon Sep 17 00:00:00 2001 From: wangguanzhong Date: Tue, 6 Sep 2022 21:04:39 +0800 Subject: [PATCH] update en doc and version check (#6875) --- README.md | 2 +- docs/tutorials/INSTALL.md | 2 +- docs/tutorials/INSTALL_cn.md | 2 +- ppdet/utils/check.py | 13 ++++++++++++- tools/anchor_cluster.py | 2 +- tools/eval.py | 2 +- tools/eval_mot.py | 2 +- tools/export_model.py | 2 +- tools/infer.py | 2 +- tools/infer_mot.py | 2 +- tools/post_quant.py | 2 +- tools/train.py | 2 +- 12 files changed, 23 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 4015683cf..13c4f964b 120000 --- a/README.md +++ b/README.md @@ -1 +1 @@ -README_cn.md \ No newline at end of file +README_en.md \ No newline at end of file diff --git a/docs/tutorials/INSTALL.md b/docs/tutorials/INSTALL.md index 20018e891..c5af2092d 100644 --- a/docs/tutorials/INSTALL.md +++ b/docs/tutorials/INSTALL.md @@ -22,7 +22,7 @@ Dependency of PaddleDetection and PaddlePaddle: | PaddleDetection version | PaddlePaddle version | tips | | :----------------: | :---------------: | :-------: | -| develop | >= 2.2.2 | Dygraph mode is set as default | +| develop | develop | Dygraph mode is set as default | | release/2.5 | >= 2.2.2 | Dygraph mode is set as default | | release/2.4 | >= 2.2.2 | Dygraph mode is set as default | | release/2.3 | >= 2.2.0rc | Dygraph mode is set as default | diff --git a/docs/tutorials/INSTALL_cn.md b/docs/tutorials/INSTALL_cn.md index 0e13aeb05..970b53933 100644 --- a/docs/tutorials/INSTALL_cn.md +++ b/docs/tutorials/INSTALL_cn.md @@ -18,7 +18,7 @@ PaddleDetection 依赖 PaddlePaddle 版本关系： | PaddleDetection版本 | PaddlePaddle版本 | 备注 | | :------------------: | :---------------: | :-------: | -| develop | >= 2.2.2 | 默认使用动态图模式 | +| develop | develop | 默认使用动态图模式 | | release/2.5 | >= 2.2.2 | 默认使用动态图模式 | | release/2.4 | >= 2.2.2 | 默认使用动态图模式 | | release/2.3 | >= 2.2.0rc | 默认使用动态图模式 | diff --git a/ppdet/utils/check.py b/ppdet/utils/check.py index 58c48806c..6eb1e79b0 100644 --- a/ppdet/utils/check.py +++ b/ppdet/utils/check.py @@ -87,7 +87,7 @@ def check_gpu(use_gpu): pass -def check_version(version='2.0'): +def check_version(version='2.2'): """ Log error and exit when the installed version of paddlepaddle is not satisfied. @@ -100,8 +100,19 @@ def check_version(version='2.0'): paddle_version.major, paddle_version.minor, paddle_version.patch, paddle_version.rc ] + + # Paddledet develop version is only used on Paddle develop + if version_installed == ['0', '0', '0', '0'] and version != 'develop': + raise Exception( + "PaddlePaddle version {} or higher is required, and develop version is only used for PaddleDetection develop version!". + format(version)) + if version_installed == ['0', '0', '0', '0']: return + + if version == 'develop': + raise Exception("PaddlePaddle develop version is required!") + version_split = version.split('.') length = min(len(version_installed), len(version_split)) diff --git a/tools/anchor_cluster.py b/tools/anchor_cluster.py index ca4f7c094..5d9702852 100644 --- a/tools/anchor_cluster.py +++ b/tools/anchor_cluster.py @@ -217,7 +217,7 @@ def main(): # check if set use_gpu=True in paddlepaddle cpu version check_gpu(cfg.use_gpu) # check if paddlepaddle version is satisfied - check_version() + check_version('develop') # get dataset dataset = cfg['TrainDataset'] diff --git a/tools/eval.py b/tools/eval.py index 42a2fcafa..c2ba0c7ef 100755 --- a/tools/eval.py +++ b/tools/eval.py @@ -184,7 +184,7 @@ def main(): check_gpu(cfg.use_gpu) check_npu(cfg.use_npu) check_xpu(cfg.use_xpu) - check_version() + check_version('develop') run(FLAGS, cfg) diff --git a/tools/eval_mot.py b/tools/eval_mot.py index a9ca51703..6bf4d8645 100644 --- a/tools/eval_mot.py +++ b/tools/eval_mot.py @@ -125,7 +125,7 @@ def main(): check_gpu(cfg.use_gpu) check_npu(cfg.use_npu) check_xpu(cfg.use_xpu) - check_version() + check_version('develop') run(FLAGS, cfg) diff --git a/tools/export_model.py b/tools/export_model.py index 1eaac7a76..932f1352b 100644 --- a/tools/export_model.py +++ b/tools/export_model.py @@ -99,7 +99,7 @@ def main(): merge_config(FLAGS.opt) check_config(cfg) check_gpu(cfg.use_gpu) - check_version() + check_version('develop') run(FLAGS, cfg) diff --git a/tools/infer.py b/tools/infer.py index d9bf3166e..0be9a0198 100755 --- a/tools/infer.py +++ b/tools/infer.py @@ -217,7 +217,7 @@ def main(): check_gpu(cfg.use_gpu) check_npu(cfg.use_npu) check_xpu(cfg.use_xpu) - check_version() + check_version('develop') run(FLAGS, cfg) diff --git a/tools/infer_mot.py b/tools/infer_mot.py index ef13bff93..0f8f6b7bf 100644 --- a/tools/infer_mot.py +++ b/tools/infer_mot.py @@ -137,7 +137,7 @@ def main(): check_gpu(cfg.use_gpu) check_npu(cfg.use_npu) check_xpu(cfg.use_xpu) - check_version() + check_version('develop') run(FLAGS, cfg) diff --git a/tools/post_quant.py b/tools/post_quant.py index fe6f9c79b..7dc871eed 100644 --- a/tools/post_quant.py +++ b/tools/post_quant.py @@ -87,7 +87,7 @@ def main(): merge_config(FLAGS.opt) check_config(cfg) check_gpu(cfg.use_gpu) - check_version() + check_version('develop') run(FLAGS, cfg) diff --git a/tools/train.py b/tools/train.py index 43f883592..f6d5367c1 100755 --- a/tools/train.py +++ b/tools/train.py @@ -163,7 +163,7 @@ def main(): check.check_config(cfg) check.check_gpu(cfg.use_gpu) check.check_npu(cfg.use_npu) - check.check_version() + check.check_version('develop') run(FLAGS, cfg) -- GitLab