[FIX]fix with_mask to instance_seg (open-mmlab#181)

* fix with_mask to instance_seg * fix instance_cfg to instance-cfg
humu789 · Nov 9, 2021 · c05a839 · c05a839
1 parent cc4bfe1
commit c05a839
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 21 deletions.
diff --git a/configs/mmdet/_base_/mask_base_dynamic.py → ...mmdet/_base_/base_instance-seg_dynamic.py b/configs/mmdet/_base_/mask_base_dynamic.py → ...mmdet/_base_/base_instance-seg_dynamic.py
@@ -1,4 +1,4 @@
-_base_ = ['./mask_base_static.py']
+_base_ = ['./base_instance-seg_static.py']
 onnx_config = dict(
     dynamic_axes={
         'input': {

diff --git a/configs/mmdet/_base_/mask_base_static.py → .../mmdet/_base_/base_instance-seg_static.py b/configs/mmdet/_base_/mask_base_static.py → .../mmdet/_base_/base_instance-seg_static.py
diff --git a/configs/mmdet/instance-seg/instance-seg_onnxruntime_dynamic.py b/configs/mmdet/instance-seg/instance-seg_onnxruntime_dynamic.py
@@ -0,0 +1,4 @@
+_base_ = [
+    '../_base_/base_instance-seg_dynamic.py',
+    '../../_base_/backends/onnxruntime.py'
+]
diff --git a/configs/mmdet/instance-seg/instance-seg_onnxruntime_static.py b/configs/mmdet/instance-seg/instance-seg_onnxruntime_static.py
@@ -0,0 +1,4 @@
+_base_ = [
+    '../_base_/base_instance-seg_static.py',
+    '../../_base_/backends/onnxruntime.py'
+]
diff --git a/.../mmdet/with-mask/mask_openvino_dynamic.py → ...ance-seg/instance-seg_openvino_dynamic.py b/.../mmdet/with-mask/mask_openvino_dynamic.py → ...ance-seg/instance-seg_openvino_dynamic.py
@@ -1,5 +1,6 @@
 _base_ = [
-    '../_base_/mask_base_dynamic.py', '../../_base_/backends/openvino.py'
+    '../_base_/base_instance-seg_dynamic.py',
+    '../../_base_/backends/openvino.py'
 ]
 
 codebase_config = dict(post_processing=dict(export_postprocess_mask=False))
diff --git a/configs/mmdet/instance-seg/instance-seg_ppl_dynamic.py b/configs/mmdet/instance-seg/instance-seg_ppl_dynamic.py
@@ -0,0 +1,3 @@
+_base_ = [
+    '../_base_/base_instance-seg_dynamic.py', '../../_base_/backends/ppl.py'
+]
diff --git a/configs/mmdet/instance-seg/instance-seg_ppl_static.py b/configs/mmdet/instance-seg/instance-seg_ppl_static.py
@@ -0,0 +1,5 @@
+_base_ = [
+    '../_base_/base_instance-seg_static.py', '../../_base_/backends/ppl.py'
+]
+
+codebase_config = dict(post_processing=dict(export_postprocess_mask=True))
diff --git a/...ask_tensorrt_dynamic-320x320-1344x1344.py → ...seg_tensorrt_dynamic-320x320-1344x1344.py b/...ask_tensorrt_dynamic-320x320-1344x1344.py → ...seg_tensorrt_dynamic-320x320-1344x1344.py
@@ -1,5 +1,6 @@
 _base_ = [
-    '../_base_/mask_base_dynamic.py', '../../_base_/backends/tensorrt.py'
+    '../_base_/base_instance-seg_dynamic.py',
+    '../../_base_/backends/tensorrt.py'
 ]
 
 backend_config = dict(

diff --git a/...ensorrt_fp16_dynamic-320x320-1344x1344.py → ...ensorrt_fp16_dynamic-320x320-1344x1344.py b/...ensorrt_fp16_dynamic-320x320-1344x1344.py → ...ensorrt_fp16_dynamic-320x320-1344x1344.py
@@ -1,5 +1,6 @@
 _base_ = [
-    '../_base_/mask_base_dynamic.py', '../../_base_/backends/tensorrt_fp16.py'
+    '../_base_/base_instance-seg_dynamic.py',
+    '../../_base_/backends/tensorrt_fp16.py'
 ]
 
 backend_config = dict(

diff --git a/...ask/mask_tensorrt_fp16_static-800x1344.py → ...ance-seg_tensorrt_fp16_static-800x1344.py b/...ask/mask_tensorrt_fp16_static-800x1344.py → ...ance-seg_tensorrt_fp16_static-800x1344.py
@@ -1,5 +1,6 @@
 _base_ = [
-    '../_base_/mask_base_static.py', '../../_base_/backends/tensorrt_fp16.py'
+    '../_base_/base_instance-seg_static.py',
+    '../../_base_/backends/tensorrt_fp16.py'
 ]
 
 onnx_config = dict(input_shape=(1344, 800))

diff --git a/...ensorrt_int8_dynamic-320x320-1344x1344.py → ...ensorrt_int8_dynamic-320x320-1344x1344.py b/...ensorrt_int8_dynamic-320x320-1344x1344.py → ...ensorrt_int8_dynamic-320x320-1344x1344.py
@@ -1,5 +1,6 @@
 _base_ = [
-    '../_base_/mask_base_dynamic.py', '../../_base_/backends/tensorrt_int8.py'
+    '../_base_/base_instance-seg_dynamic.py',
+    '../../_base_/backends/tensorrt_int8.py'
 ]
 
 backend_config = dict(

diff --git a/...ith-mask/mask_tensorrt_static-800x1344.py → ...ance-seg_tensorrt_int8_static-800x1344.py b/...ith-mask/mask_tensorrt_static-800x1344.py → ...ance-seg_tensorrt_int8_static-800x1344.py
@@ -1,4 +1,7 @@
-_base_ = ['../_base_/mask_base_static.py', '../../_base_/backends/tensorrt.py']
+_base_ = [
+    '../_base_/base_instance-seg_static.py',
+    '../../_base_/backends/tensorrt_int8.py'
+]
 
 onnx_config = dict(input_shape=(1344, 800))
 backend_config = dict(

diff --git a/...ask/mask_tensorrt_int8_static-800x1344.py → .../instance-seg_tensorrt_static-800x1344.py b/...ask/mask_tensorrt_int8_static-800x1344.py → .../instance-seg_tensorrt_static-800x1344.py
@@ -1,5 +1,6 @@
 _base_ = [
-    '../_base_/mask_base_static.py', '../../_base_/backends/tensorrt_int8.py'
+    '../_base_/base_instance-seg_static.py',
+    '../../_base_/backends/tensorrt.py'
 ]
 
 onnx_config = dict(input_shape=(1344, 800))

diff --git a/configs/mmdet/with-mask/mask_onnxruntime_dynamic.py b/configs/mmdet/with-mask/mask_onnxruntime_dynamic.py
diff --git a/configs/mmdet/with-mask/mask_onnxruntime_static.py b/configs/mmdet/with-mask/mask_onnxruntime_static.py
diff --git a/configs/mmdet/with-mask/mask_ppl_dynamic.py b/configs/mmdet/with-mask/mask_ppl_dynamic.py
diff --git a/configs/mmdet/with-mask/mask_ppl_static.py b/configs/mmdet/with-mask/mask_ppl_static.py
diff --git a/tests/test_mmdet/test_mmdet_models.py b/tests/test_mmdet/test_mmdet_models.py
@@ -368,7 +368,7 @@ def test_single_roi_extractor(backend_type):
             model_output, backend_output, rtol=1e-03, atol=1e-05)
 
 
-def get_cascade_roi_head(is_with_masks=False):
+def get_cascade_roi_head(is_instance_seg=False):
     """CascadeRoIHead Config."""
     num_stages = 3
     stage_loss_weights = [1, 0.5, 0.25]
@@ -440,7 +440,7 @@ def get_cascade_roi_head(is_with_masks=False):
 
     args = [num_stages, stage_loss_weights, bbox_roi_extractor, bbox_head]
     kwargs = {'test_cfg': test_cfg}
-    if is_with_masks:
+    if is_instance_seg:
         args += [mask_roi_extractor, mask_head]
 
     from mmdet.models import CascadeRoIHead
@@ -739,7 +739,7 @@ def test_get_bboxes_of_atss_head(backend_type):
 def test_cascade_roi_head_with_mask(backend_type):
     pytest.importorskip(backend_type, reason=f'requires {backend_type}')
 
-    cascade_roi_head = get_cascade_roi_head(is_with_masks=True)
+    cascade_roi_head = get_cascade_roi_head(is_instance_seg=True)
     seed_everything(1234)
     x = [
         torch.rand((1, 64, 200, 304)),