From 5830e71c3540513b6de29ec716a5c434a7d19431 Mon Sep 17 00:00:00 2001 From: whhuang Date: Mon, 5 Sep 2022 11:21:19 +0800 Subject: [PATCH 1/4] fix mmdet showresult --- mmdeploy/codebase/mmdet/deploy/object_detection_model.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py index 26f7185cf9..e4c555ef2d 100644 --- a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py +++ b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py @@ -281,12 +281,18 @@ def show_result(self, win_name: str = '', show: bool = True, score_thr: float = 0.3, + bbox_color=(72, 101, 241), + text_color=(72, 101, 241), + mask_color=None, out_file=None): return BaseDetector.show_result( self, img=img, result=result, score_thr=score_thr, + bbox_color=bbox_color, + text_color=text_color, + mask_color=mask_color, show=show, win_name=win_name, out_file=out_file) From 93ef8a36b27b56e8af2e6c71b7f3e0010d0c77da Mon Sep 17 00:00:00 2001 From: whhuang Date: Mon, 5 Sep 2022 12:03:04 +0800 Subject: [PATCH 2/4] Consider compatibility --- .../codebase/mmdet/deploy/object_detection_model.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py index e4c555ef2d..e89d7af0eb 100644 --- a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py +++ b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py @@ -281,21 +281,17 @@ def show_result(self, win_name: str = '', show: bool = True, score_thr: float = 0.3, - bbox_color=(72, 101, 241), - text_color=(72, 101, 241), - mask_color=None, - out_file=None): + out_file=None, + **kwargs): return BaseDetector.show_result( self, img=img, result=result, score_thr=score_thr, - bbox_color=bbox_color, - text_color=text_color, - mask_color=mask_color, show=show, win_name=win_name, - out_file=out_file) + out_file=out_file, + **kwargs) @__BACKEND_MODEL.register_module('single_stage') From 82265a31cf910618a1dff4aab65e9dc793a623c4 Mon Sep 17 00:00:00 2001 From: whhuang Date: Mon, 5 Sep 2022 12:12:17 +0800 Subject: [PATCH 3/4] mmdet showresult add *args --- mmdeploy/codebase/mmdet/deploy/object_detection_model.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py index e89d7af0eb..94f52638f8 100644 --- a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py +++ b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py @@ -276,6 +276,7 @@ def forward_test(self, imgs: torch.Tensor, *args, **kwargs) -> \ return outputs def show_result(self, + *args, img: np.ndarray, result: list, win_name: str = '', @@ -285,6 +286,7 @@ def show_result(self, **kwargs): return BaseDetector.show_result( self, + *args, img=img, result=result, score_thr=score_thr, From f1db19a08e676886a6f6c2d5110775449a0e8de9 Mon Sep 17 00:00:00 2001 From: whhuang Date: Mon, 5 Sep 2022 13:03:08 +0800 Subject: [PATCH 4/4] Revert "mmdet showresult add *args" This reverts commit 82265a31cf910618a1dff4aab65e9dc793a623c4. --- mmdeploy/codebase/mmdet/deploy/object_detection_model.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py index 94f52638f8..e89d7af0eb 100644 --- a/mmdeploy/codebase/mmdet/deploy/object_detection_model.py +++ b/mmdeploy/codebase/mmdet/deploy/object_detection_model.py @@ -276,7 +276,6 @@ def forward_test(self, imgs: torch.Tensor, *args, **kwargs) -> \ return outputs def show_result(self, - *args, img: np.ndarray, result: list, win_name: str = '', @@ -286,7 +285,6 @@ def show_result(self, **kwargs): return BaseDetector.show_result( self, - *args, img=img, result=result, score_thr=score_thr,