未验证 提交 06a71983 编写于 作者: W wangguanzhong 提交者: GitHub

update en doc and version check (#6876)

上级 9f5d141b
README_cn.md README_en.md
\ No newline at end of file \ No newline at end of file
...@@ -22,7 +22,7 @@ Dependency of PaddleDetection and PaddlePaddle: ...@@ -22,7 +22,7 @@ Dependency of PaddleDetection and PaddlePaddle:
| PaddleDetection version | PaddlePaddle version | tips | | 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.5 | >= 2.2.2 | Dygraph mode is set as default |
| release/2.4 | >= 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 | | release/2.3 | >= 2.2.0rc | Dygraph mode is set as default |
......
...@@ -18,7 +18,7 @@ PaddleDetection 依赖 PaddlePaddle 版本关系: ...@@ -18,7 +18,7 @@ PaddleDetection 依赖 PaddlePaddle 版本关系:
| PaddleDetection版本 | PaddlePaddle版本 | 备注 | | PaddleDetection版本 | PaddlePaddle版本 | 备注 |
| :------------------: | :---------------: | :-------: | | :------------------: | :---------------: | :-------: |
| develop | >= 2.2.2 | 默认使用动态图模式 | | develop | develop | 默认使用动态图模式 |
| release/2.5 | >= 2.2.2 | 默认使用动态图模式 | | release/2.5 | >= 2.2.2 | 默认使用动态图模式 |
| release/2.4 | >= 2.2.2 | 默认使用动态图模式 | | release/2.4 | >= 2.2.2 | 默认使用动态图模式 |
| release/2.3 | >= 2.2.0rc | 默认使用动态图模式 | | release/2.3 | >= 2.2.0rc | 默认使用动态图模式 |
......
...@@ -87,7 +87,7 @@ def check_gpu(use_gpu): ...@@ -87,7 +87,7 @@ def check_gpu(use_gpu):
pass pass
def check_version(version='2.0'): def check_version(version='2.2'):
""" """
Log error and exit when the installed version of paddlepaddle is Log error and exit when the installed version of paddlepaddle is
not satisfied. not satisfied.
...@@ -100,8 +100,19 @@ def check_version(version='2.0'): ...@@ -100,8 +100,19 @@ def check_version(version='2.0'):
paddle_version.major, paddle_version.minor, paddle_version.patch, paddle_version.major, paddle_version.minor, paddle_version.patch,
paddle_version.rc 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']: if version_installed == ['0', '0', '0', '0']:
return return
if version == 'develop':
raise Exception("PaddlePaddle develop version is required!")
version_split = version.split('.') version_split = version.split('.')
length = min(len(version_installed), len(version_split)) length = min(len(version_installed), len(version_split))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册