diff --git a/docs/tutorials/INSTALL.md b/docs/tutorials/INSTALL.md index c41d96e0c7a06da575278cf7e346205a8ca4b96d..cb3aca93d4cc6ccbb3599fe6aa29de7f85004c90 100644 --- a/docs/tutorials/INSTALL.md +++ b/docs/tutorials/INSTALL.md @@ -60,7 +60,7 @@ PaddleDetection can be installed in the following two ways: ``` # install paddledet via pip -pip install paddledet==2.0 -i https://pypi.tuna.tsinghua.edu.cn/simple +pip install paddledet==2.0.0 -i https://pypi.tuna.tsinghua.edu.cn/simple # Download and use the configuration files and code examples in the source code git clone https://github.com/PaddlePaddle/PaddleDetection.git diff --git a/docs/tutorials/INSTALL_cn.md b/docs/tutorials/INSTALL_cn.md index c5d105adece35191f2ebbb40809a53084fc8f9c1..1f84350e6ec3497b95028892385636e3cd28a545 100644 --- a/docs/tutorials/INSTALL_cn.md +++ b/docs/tutorials/INSTALL_cn.md @@ -57,7 +57,7 @@ python -c "import paddle; print(paddle.__version__)" ``` # pip安装paddledet -pip install paddledet==2.0 -i https://pypi.tuna.tsinghua.edu.cn/simple +pip install paddledet==2.0.0 -i https://pypi.tuna.tsinghua.edu.cn/simple # 下载使用源码中的配置文件和代码示例 git clone https://github.com/PaddlePaddle/PaddleDetection.git diff --git a/ppdet/modeling/proposal_generator/target_layer.py b/ppdet/modeling/proposal_generator/target_layer.py index a64a2e8d11ce0443daab67489b474d84cfd8693d..cdf405e3e8c0b7e1136dd56e82ce1ed2e4e138d8 100644 --- a/ppdet/modeling/proposal_generator/target_layer.py +++ b/ppdet/modeling/proposal_generator/target_layer.py @@ -322,7 +322,9 @@ class RBoxAssigner(object): try: from rbox_iou_ops import rbox_iou except Exception as e: - print('import custom_ops error', e) + print("import custom_ops error, try install rbox_iou_ops " \ + "following ppdet/ext_op/README.md", e) + sys.stdout.flush() sys.exit(-1) iou = rbox_iou(gt_bboxes_xc_yc, anchors_xc_yc) diff --git a/requirements.txt b/requirements.txt index 59187a3e077ab7104afec6984710c50d969b4b99..8ce34b5f06700535e9753504bb0f0d7df30a6df9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,3 @@ scipy terminaltables pycocotools setuptools>=42.0.0 - -# extension OPs for rotation bbox -rbox_iou_ops diff --git a/setup.py b/setup.py index cb050222074460e22026896d1d00b2e99f951614..23cdb590e41be1b479bc0658995aadd44ff486ae 100644 --- a/setup.py +++ b/setup.py @@ -65,20 +65,12 @@ packages = [ ] if __name__ == "__main__": - # install extension APIs for rotation bbox - from paddle.utils import cpp_extension - cpp_extension.setup( - name='rbox_iou_ops', - ext_modules=cpp_extension.CUDAExtension(sources=[ - 'ppdet/ext_op/rbox_iou_op.cc', 'ppdet/ext_op/rbox_iou_op.cu' - ])) - setup( name='paddledet', packages=find_packages(exclude=("configs", "tools", "deploy")), package_data={'ppdet.model_zoo': package_model_zoo()}, author='PaddlePaddle', - version='2.0', + version='2.0.0', install_requires=parse_requirements('./requirements.txt'), description='Object detection and instance segmentation toolkit based on PaddlePaddle', long_description=readme(),