[Enhancement]: Update configs for OpenVINO (open-mmlab#306)

* Update config for OpenVINO

* Update test

* Update better test

* Update instance-seg config of OpenVINO

configs/mmcls/classification_openvino_dynamic-224x224.py

@@ -0,0 +1,6 @@
+_base_ = ['./classification_dynamic.py', '../_base_/backends/openvino.py']
+
+onnx_config = dict(input_shape=None)
+
+backend_config = dict(
+    model_inputs=[dict(opt_shapes=dict(input=[1, 3, 224, 224]))])

configs/mmdet/_base_/base_openvino_dynamic-800x1344.py

@@ -0,0 +1,6 @@
+_base_ = ['./base_dynamic.py', '../../_base_/backends/openvino.py']
+
+onnx_config = dict(input_shape=None)
+
+backend_config = dict(
+    model_inputs=[dict(opt_shapes=dict(input=[1, 3, 800, 1344]))])

configs/mmdet/detection/detection_openvino_dynamic-800x1344.py

@@ -0,0 +1 @@
+_base_ = ['../_base_/base_openvino_dynamic-800x1344.py']

configs/mmdet/instance-seg/instance-seg_openvino_dynamic.py → configs/mmdet/instance-seg/instance-seg_openvino_dynamic-800x1344.py

@@ -3,4 +3,7 @@
     '../../_base_/backends/openvino.py'
 ]
 
+onnx_config = dict(input_shape=None)
+backend_config = dict(
+    model_inputs=[dict(opt_shapes=dict(input=[1, 3, 800, 1344]))])
 codebase_config = dict(post_processing=dict(export_postprocess_mask=False))

configs/mmedit/super-resolution/super-resolution_openvino_dynamic-256x256.py

@@ -0,0 +1,4 @@
+_base_ = ['./super-resolution_dynamic.py', '../../_base_/backends/openvino.py']
+
+backend_config = dict(
+    model_inputs=[dict(opt_shapes=dict(input=[1, 3, 256, 256]))])

configs/mmocr/text-detection/text-detection_openvino_dynamic-640x640.py

@@ -0,0 +1,6 @@
+_base_ = ['./text-detection_dynamic.py', '../../_base_/backends/openvino.py']
+
+onnx_config = dict(input_shape=None)
+
+backend_config = dict(
+    model_inputs=[dict(opt_shapes=dict(input=[1, 3, 640, 640]))])

configs/mmseg/segmentation_openvino_dynamic-1024x2048.py

@@ -0,0 +1,4 @@
+_base_ = ['./segmentation_dynamic.py', '../_base_/backends/openvino.py']
+
+backend_config = dict(
+    model_inputs=[dict(opt_shapes=dict(input=[1, 3, 1024, 2048]))])

docs/codebases/mmedit.md

@@ -9,19 +9,19 @@ Please refer to [official installation guide](https://mmediting.readthedocs.io/e
 ## MMEditing models support
 
 | Model       | Task             | ONNX Runtime | TensorRT | NCNN  | PPLNN | OpenVINO | Model Config File                                                                            |
-| :---------- | :--------------- | :----------: | :------: | :---: | :-----: | :------: | :------------------------------------------------------------------------------------------- |
-| SRCNN       | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/srcnn/srcnn_x4k915_g1_1000k_div2k.py                           |
-| ESRGAN      | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/esrgan/esrgan_x4c64b23g32_g1_400k_div2k.py                     |
-| ESRGAN      | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/esrgan/esrgan_psnr_x4c64b23g32_g1_1000k_div2k.py               |
-| SRGAN       | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/srresnet_srgan/srgan_x4c64b16_g1_1000k_div2k.py                |
-| SRResNet    | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/srresnet_srgan/srgan_x4c64b16_g1_1000k_div2k.py                |
-| Real-ESRGAN | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/real_esrgan/realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost.py |
-| EDSR        | super-resolution |      Y       |    Y     |   Y   |    N    |    N     | $MMEDIT_DIR/configs/restorers/edsr/edsr_x2c64b16_g1_300k_div2k.py                            |
-| EDSR        | super-resolution |      Y       |    Y     |   Y   |    N    |    N     | $MMEDIT_DIR/configs/restorers/edsr/edsr_x3c64b16_g1_300k_div2k.py                            |
-| EDSR        | super-resolution |      Y       |    Y     |   Y   |    N    |    N     | $MMEDIT_DIR/configs/restorers/edsr/edsr_x4c64b16_g1_300k_div2k.py                            |
-| RDN         | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/rdn/rdn_x2c64b16_g1_1000k_div2k.py                             |
-| RDN         | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/rdn/rdn_x3c64b16_g1_1000k_div2k.py                             |
-| RDN         | super-resolution |      Y       |    Y     |   Y   |    Y    |    N     | $MMEDIT_DIR/configs/restorers/rdn/rdn_x4c64b16_g1_1000k_div2k.py                             |
+| :---------- | :--------------- | :----------: | :------: | :---: | :---: | :------: | :------------------------------------------------------------------------------------------- |
+| SRCNN       | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/srcnn/srcnn_x4k915_g1_1000k_div2k.py                           |
+| ESRGAN      | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/esrgan/esrgan_x4c64b23g32_g1_400k_div2k.py                     |
+| ESRGAN      | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/esrgan/esrgan_psnr_x4c64b23g32_g1_1000k_div2k.py               |
+| SRGAN       | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/srresnet_srgan/srgan_x4c64b16_g1_1000k_div2k.py                |
+| SRResNet    | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/srresnet_srgan/srgan_x4c64b16_g1_1000k_div2k.py                |
+| Real-ESRGAN | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/real_esrgan/realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost.py |
+| EDSR        | super-resolution |      Y       |    Y     |   Y   |   N   |    Y     | $MMEDIT_DIR/configs/restorers/edsr/edsr_x2c64b16_g1_300k_div2k.py                            |
+| EDSR        | super-resolution |      Y       |    Y     |   Y   |   N   |    Y     | $MMEDIT_DIR/configs/restorers/edsr/edsr_x3c64b16_g1_300k_div2k.py                            |
+| EDSR        | super-resolution |      Y       |    Y     |   Y   |   N   |    Y     | $MMEDIT_DIR/configs/restorers/edsr/edsr_x4c64b16_g1_300k_div2k.py                            |
+| RDN         | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/rdn/rdn_x2c64b16_g1_1000k_div2k.py                             |
+| RDN         | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/rdn/rdn_x3c64b16_g1_1000k_div2k.py                             |
+| RDN         | super-resolution |      Y       |    Y     |   Y   |   Y   |    Y     | $MMEDIT_DIR/configs/restorers/rdn/rdn_x4c64b16_g1_1000k_div2k.py                             |
 
 ## Reminder
 

mmdeploy/apis/openvino/__init__.py

@@ -6,7 +6,7 @@
 if is_available():
     from mmdeploy.backend.openvino.onnx2openvino \
         import onnx2openvino, get_output_model_file
-    from .utils import get_input_shape_from_cfg
+    from .utils import get_input_info_from_cfg
     __all__ += [
-        'onnx2openvino', 'get_output_model_file', 'get_input_shape_from_cfg'
+        'onnx2openvino', 'get_output_model_file', 'get_input_info_from_cfg'
     ]

mmdeploy/apis/openvino/utils.py

@@ -1,40 +1,22 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from typing import List
+from typing import Dict, List
 
 import mmcv
 
-from mmdeploy.utils import get_input_shape
+from mmdeploy.utils import get_model_inputs
 
 
-def get_input_shape_from_cfg(deploy_cfg: mmcv.Config,
-                             model_cfg: mmcv.Config) -> List[int]:
-    """Get the input shape from the configs for OpenVINO Model Optimizer. The
-    value from config 'deploy_cfg' has the highest priority, then 'model_cfg'.
-    If there is no input shape in configs, then the default value will be used.
+def get_input_info_from_cfg(deploy_cfg: mmcv.Config) -> Dict[str, List]:
+    """Get the input names and shapes from the configs for OpenVINO Model
+    Optimizer.
 
     Args:
         deploy_cfg (mmcv.Config): Deployment config.
-        model_cfg (mmcv.Config): Model config.
+
     Returns:
-        List[int]: The input shape in [1, 3, H, W] format from config
-            or [1, 3, 800, 1344].
+        Dict[str, List]: A dict that stores the names and shapes of input.
     """
-    shape = [1, 3]
-    is_use_deploy_cfg = False
-    try:
-        input_shape = get_input_shape(deploy_cfg)
-        if input_shape is not None:
-            is_use_deploy_cfg = True
-    except KeyError:
-        is_use_deploy_cfg = False
-
-    if is_use_deploy_cfg:
-        shape += [input_shape[1], input_shape[0]]
-    else:
-        test_pipeline = model_cfg.get('test_pipeline', None)
-        if test_pipeline is not None:
-            img_scale = test_pipeline[1]['img_scale']
-            shape += [img_scale[1], img_scale[0]]
-        else:
-            shape += [800, 1344]
-    return shape
+    # The partition is not supported now. Set the id of model to 0.
+    model_inputs = get_model_inputs(deploy_cfg)[0]
+    input_info = model_inputs['opt_shapes']
+    return input_info

tests/test_apis/test_onnx2openvino.py

@@ -101,29 +101,23 @@ def test_can_not_run_onnx2openvino_without_mo():
 
 
 @backend_checker(Backend.OPENVINO)
-def test_get_input_shape_from_cfg():
-    from mmdeploy.apis.openvino import get_input_shape_from_cfg
+def test_get_input_info_from_cfg():
+    from mmdeploy.apis.openvino import get_input_info_from_cfg
 
-    # Test with default value
     deploy_cfg = mmcv.Config()
-    model_cfg = mmcv.Config()
-    input_shape = get_input_shape_from_cfg(deploy_cfg, model_cfg)
-    assert input_shape == [1, 3, 800, 1344], \
-        'The function returned a different default shape.'
-
-    # Test with model_cfg that contains the required data.
-    height, width = 800, 1200
-    model_cfg = mmcv.Config(
-        {'test_pipeline': [{}, {
-            'img_scale': (width, height)
-        }]})
-    input_shape = get_input_shape_from_cfg(deploy_cfg, model_cfg)
-    assert input_shape == [1, 3, height, width], \
-        'The shape in the model_cfg does not match the output shape.'
-
-    # Test with deploy_cfg that contains the required data.
+    with pytest.raises(KeyError):
+        get_input_info_from_cfg(deploy_cfg)
+
+    input_name = 'input'
     height, width = 600, 1000
-    deploy_cfg = mmcv.Config({'onnx_config': {'input_shape': (width, height)}})
-    input_shape = get_input_shape_from_cfg(deploy_cfg, model_cfg)
-    assert input_shape == [1, 3, height, width], \
-        'The shape in the deploy_cfg does not match the output shape.'
+    expected_input_info = {input_name: [1, 3, height, width]}
+    deploy_cfg = mmcv.Config({
+        'backend_config': {
+            'model_inputs': [{
+                'opt_shapes': expected_input_info
+            }]
+        }
+    })
+    input_info = get_input_info_from_cfg(deploy_cfg)
+    assert input_info == expected_input_info, \
+        'The expected value of \'input_info\' does not match the received one.'

tools/deploy.py

@@ -229,13 +229,11 @@ def main():
 
         from mmdeploy.apis.openvino import (onnx2openvino,
                                             get_output_model_file,
-                                            get_input_shape_from_cfg)
+                                            get_input_info_from_cfg)
         openvino_files = []
         for onnx_path in onnx_files:
             model_xml_path = get_output_model_file(onnx_path, args.work_dir)
-            input_name = deploy_cfg.onnx_config.input_names
-            input_shape = [get_input_shape_from_cfg(deploy_cfg, model_cfg)]
-            input_info = dict(zip(input_name, input_shape))
+            input_info = get_input_info_from_cfg(deploy_cfg)
             output_names = deploy_cfg.onnx_config.output_names
             create_process(
                 f'onnx2openvino with {onnx_path}',
@@ -257,8 +255,8 @@ def main():
         for onnx_path in onnx_files:
             algo_file = onnx_path.replace('.onnx', '.json')
             model_inputs = get_model_inputs(deploy_cfg)
-            assert 'opt_shape' in model_inputs, 'expect opt_shape '
-            'in deploy config for pplnn'
+            assert 'opt_shape' in model_inputs, 'Expect opt_shape ' \
+                'in deploy config for PPLNN'
             # PPLNN accepts only 1 input shape for optimization,
             # may get changed in the future
             input_shapes = [model_inputs.opt_shape]