From 0236db5063bd8be9bafc0a5669a46332b170d51f Mon Sep 17 00:00:00 2001
From: Kaipeng Deng <dengkaipeng@baidu.com>
Date: Wed, 21 Apr 2021 11:22:18 +0800
Subject: [PATCH] [cherry pick] remove rbox-iou-ops dependence (#2708)

* remove rbox-iou-ops dependence
---
 docs/tutorials/INSTALL.md                         |  2 +-
 docs/tutorials/INSTALL_cn.md                      |  2 +-
 ppdet/modeling/proposal_generator/target_layer.py |  4 +++-
 requirements.txt                                  |  3 ---
 setup.py                                          | 10 +---------
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/docs/tutorials/INSTALL.md b/docs/tutorials/INSTALL.md
index c41d96e0c..cb3aca93d 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 c5d105ade..1f84350e6 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 a64a2e8d1..cdf405e3e 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 59187a3e0..8ce34b5f0 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 cb0502220..23cdb590e 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(),
-- 
GitLab