未验证 提交 0236db50 编写于 作者: K Kaipeng Deng 提交者: GitHub

[cherry pick] remove rbox-iou-ops dependence (#2708)

* remove rbox-iou-ops dependence
上级 37201655
...@@ -60,7 +60,7 @@ PaddleDetection can be installed in the following two ways: ...@@ -60,7 +60,7 @@ PaddleDetection can be installed in the following two ways:
``` ```
# install paddledet via pip # 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 # Download and use the configuration files and code examples in the source code
git clone https://github.com/PaddlePaddle/PaddleDetection.git git clone https://github.com/PaddlePaddle/PaddleDetection.git
......
...@@ -57,7 +57,7 @@ python -c "import paddle; print(paddle.__version__)" ...@@ -57,7 +57,7 @@ python -c "import paddle; print(paddle.__version__)"
``` ```
# pip安装paddledet # 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 git clone https://github.com/PaddlePaddle/PaddleDetection.git
......
...@@ -322,7 +322,9 @@ class RBoxAssigner(object): ...@@ -322,7 +322,9 @@ class RBoxAssigner(object):
try: try:
from rbox_iou_ops import rbox_iou from rbox_iou_ops import rbox_iou
except Exception as e: 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) sys.exit(-1)
iou = rbox_iou(gt_bboxes_xc_yc, anchors_xc_yc) iou = rbox_iou(gt_bboxes_xc_yc, anchors_xc_yc)
......
...@@ -8,6 +8,3 @@ scipy ...@@ -8,6 +8,3 @@ scipy
terminaltables terminaltables
pycocotools pycocotools
setuptools>=42.0.0 setuptools>=42.0.0
# extension OPs for rotation bbox
rbox_iou_ops
...@@ -65,20 +65,12 @@ packages = [ ...@@ -65,20 +65,12 @@ packages = [
] ]
if __name__ == "__main__": 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( setup(
name='paddledet', name='paddledet',
packages=find_packages(exclude=("configs", "tools", "deploy")), packages=find_packages(exclude=("configs", "tools", "deploy")),
package_data={'ppdet.model_zoo': package_model_zoo()}, package_data={'ppdet.model_zoo': package_model_zoo()},
author='PaddlePaddle', author='PaddlePaddle',
version='2.0', version='2.0.0',
install_requires=parse_requirements('./requirements.txt'), install_requires=parse_requirements('./requirements.txt'),
description='Object detection and instance segmentation toolkit based on PaddlePaddle', description='Object detection and instance segmentation toolkit based on PaddlePaddle',
long_description=readme(), long_description=readme(),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册