Add support of models converted by OVC (#148)

* Support unnamed outputs in OV adapter

* Add a test to load a model with unnamed output

* Don't try to print a name of unnamed outputs

* Update load test

* Fix black

* Update precommit public scope

* Add data preparation for python precommit

Author: sovrasov

.github/workflows/test_precommit.yml

@@ -52,6 +52,10 @@ jobs:
         source venv/bin/activate
         python -m pip install --upgrade pip
         pip install model_api/python/[tests] --extra-index-url https://download.pytorch.org/whl/cpu
+    - name: Prepare test data
+      run: |
+        source venv/bin/activate
+        python tests/cpp/precommit/prepare_data.py -d data -p tests/cpp/precommit/public_scope.json
     - name: Run test
       run: |
         source venv/bin/activate

model_api/cpp/utils/include/utils/common.hpp

@@ -46,7 +46,7 @@ static inline void logBasicModelInfo(const std::shared_ptr<ov::Model>& model) {
 
     slog::info << "\tOutputs: " << slog::endl;
     for (const ov::Output<ov::Node>& output : outputs) {
-        const std::string name = output.get_any_name();
+        const std::string name = output.get_names().size() ? output.get_any_name() : "";
         const ov::element::Type type = output.get_element_type();
         const ov::PartialShape shape = output.get_partial_shape();
         const ov::Layout layout = ov::layout::get_layout(output);

model_api/python/openvino/model_api/adapters/openvino_adapter.py

@@ -271,13 +271,15 @@ def get_layout_for_input(self, input, shape=None) -> str:
 
     def get_output_layers(self):
         outputs = {}
-        for output in self.model.outputs:
+        for i, output in enumerate(self.model.outputs):
             output_shape = (
                 output.partial_shape.get_min_shape()
                 if self.model.is_dynamic()
                 else output.shape
             )
-            outputs[output.get_any_name()] = Metadata(
+
+            output_name = output.get_any_name() if output.get_names() else i
+            outputs[output_name] = Metadata(
                 output.get_names(),
                 list(output_shape),
                 precision=output.get_element_type().get_type_name(),

tests/cpp/precommit/prepare_data.py

@@ -18,7 +18,7 @@ def retrieve_otx_model(data_dir, model_name):
     )
 
 
-def parepare_model(
+def prepare_model(
     data_dir="./data",
     public_scope=Path(__file__).resolve().parent / "public_scope.json",
 ):
@@ -70,6 +70,7 @@ def prepare_data(data_dir="./data"):
 
     args = parser.parse_args()
 
-    parepare_model(args.data_dir, args.public_scope)
+    prepare_model(args.data_dir, args.public_scope)
     prepare_data(args.data_dir)
     retrieve_otx_model(args.data_dir, "mlc_mobilenetv3_large_voc")
+    retrieve_otx_model(args.data_dir, "tinynet_imagenet")

tests/cpp/precommit/public_scope.json

@@ -22,5 +22,9 @@
     {
         "name": "hrnet-v2-c1-segmentation",
         "type": "SegmentationModel"
+    },
+    {
+        "name": "otx_models/tinynet_imagenet.xml",
+        "type": "ClassificationModel"
     }
 ]

tests/python/precommit/test_load.py

@@ -0,0 +1,10 @@
+from openvino.model_api.models import Model
+
+
+def test_model_with_unnamed_output_load():
+    # the model's output doesn't have a name
+    _ = Model.create_model(
+        "data/otx_models/tinynet_imagenet.xml",
+        model_type="Classification",
+        preload=True,
+    )