From b19c58d5cf8274906d7ab1b03f8c27291000ac23 Mon Sep 17 00:00:00 2001
From: wangruohui <12756472+wangruohui@users.noreply.github.com>
Date: Thu, 3 Jun 2021 11:46:58 +0800
Subject: [PATCH 1/2] update nms config in demo/faster_rccn

---
 demo/faster_rcnn_r50_fpn_2x_coco.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/demo/faster_rcnn_r50_fpn_2x_coco.py b/demo/faster_rcnn_r50_fpn_2x_coco.py
index 326258e935..124902d7f7 100644
--- a/demo/faster_rcnn_r50_fpn_2x_coco.py
+++ b/demo/faster_rcnn_r50_fpn_2x_coco.py
@@ -73,11 +73,9 @@
             pos_weight=-1,
             debug=False),
         rpn_proposal=dict(
-            nms_across_levels=False,
             nms_pre=2000,
-            nms_post=1000,
-            max_num=1000,
-            nms_thr=0.7,
+            max_per_img=1000,
+            nms=dict(type='nms', iou_threshold=0.7),
             min_bbox_size=0),
         rcnn=dict(
             assigner=dict(
@@ -97,16 +95,15 @@
             debug=False)),
     test_cfg=dict(
         rpn=dict(
-            nms_across_levels=False,
             nms_pre=1000,
-            nms_post=1000,
-            max_num=1000,
-            nms_thr=0.7,
+            max_per_img=1000,
+            nms=dict(type='nms', iou_threshold=0.7),
             min_bbox_size=0),
         rcnn=dict(
             score_thr=0.05,
             nms=dict(type='nms', iou_threshold=0.5),
-            max_per_img=100)))
+            max_per_img=100)
+    ))
 
 # dataset config
 dataset_type = 'CocoDataset'

From 3e5b432fd6a1d339513c72bd41b093f656eb953a Mon Sep 17 00:00:00 2001
From: wangruohui <12756472+wangruohui@users.noreply.github.com>
Date: Thu, 3 Jun 2021 12:26:52 +0800
Subject: [PATCH 2/2] fix lint

---
 demo/faster_rcnn_r50_fpn_2x_coco.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/demo/faster_rcnn_r50_fpn_2x_coco.py b/demo/faster_rcnn_r50_fpn_2x_coco.py
index 124902d7f7..33fc564507 100644
--- a/demo/faster_rcnn_r50_fpn_2x_coco.py
+++ b/demo/faster_rcnn_r50_fpn_2x_coco.py
@@ -102,8 +102,7 @@
         rcnn=dict(
             score_thr=0.05,
             nms=dict(type='nms', iou_threshold=0.5),
-            max_per_img=100)
-    ))
+            max_per_img=100)))
 
 # dataset config
 dataset_type = 'CocoDataset'