Merge pull request #50 from RapidAI/copilot/review-pr-38

Fix OpenVINO inference engine integration issues from PR #38

Author: SWHL

rapid_layout/configs/engine_cfg.yaml

@@ -26,11 +26,11 @@ onnxruntime:
         enable_cann_graph: true
 
 openvino:
-  device: "CPU"
-  inference_num_threads: -1
-  performance_hint: "LATENCY"
-  performance_num_requests: -1
-  enable_cpu_pinning: null
-  num_streams: -1
-  enable_hyper_threading: null
-  scheduling_core_type: null
+    device: "CPU"
+    inference_num_threads: -1
+    performance_hint: "LATENCY"
+    performance_num_requests: -1
+    enable_cpu_pinning: null
+    num_streams: -1
+    enable_hyper_threading: null
+    scheduling_core_type: null

rapid_layout/inference_engine/openvino/__init__.py

@@ -1 +1 @@
-from .main import OpenVINOInferSession
+from .main import OpenVINOInferSession

rapid_layout/inference_engine/openvino/main.py

@@ -1,3 +1,4 @@
+import os
 import traceback
 from pathlib import Path
 from typing import Any, Dict, List
@@ -51,28 +52,29 @@ def __init__(self, cfg: RapidLayoutInput):
 
     def _init_config(self, cfg: DictConfig) -> Dict[str, str]:
         config = {}
-        engine_cfg = cfg.get("engine_cfg", {})
 
         def _set(k, v, *, cast=str):
             if v is not None and v != -1:
-                config[k] = cast(v)
-
-        _set("INFERENCE_NUM_THREADS",
-             engine_cfg.get("inference_num_threads", -1),
-             cast=lambda x: str(min(x, os.cpu_count())) if x > 0 else None)
-
-        _set("PERFORMANCE_HINT",
-             engine_cfg.get("performance_hint"))
-        _set("PERFORMANCE_HINT_NUM_REQUESTS",
-             engine_cfg.get("performance_num_requests"))
-        _set("ENABLE_CPU_PINNING",
-             engine_cfg.get("enable_cpu_pinning"))
-        _set("NUM_STREAMS",
-             engine_cfg.get("num_streams"))
-        _set("ENABLE_HYPER_THREADING",
-             engine_cfg.get("enable_hyper_threading"))
-        _set("SCHEDULING_CORE_TYPE",
-             engine_cfg.get("scheduling_core_type"))
+                casted_value = cast(v)
+                if casted_value is not None:
+                    config[k] = casted_value
+
+        inference_num_threads = cfg.get("inference_num_threads", -1)
+        if inference_num_threads > 0:
+            cpu_count = os.cpu_count()
+            if cpu_count is not None:
+                _set(
+                    "INFERENCE_NUM_THREADS",
+                    inference_num_threads,
+                    cast=lambda x: str(min(x, cpu_count)),
+                )
+
+        _set("PERFORMANCE_HINT", cfg.get("performance_hint"))
+        _set("PERFORMANCE_HINT_NUM_REQUESTS", cfg.get("performance_num_requests"))
+        _set("ENABLE_CPU_PINNING", cfg.get("enable_cpu_pinning"))
+        _set("NUM_STREAMS", cfg.get("num_streams"))
+        _set("ENABLE_HYPER_THREADING", cfg.get("enable_hyper_threading"))
+        _set("SCHEDULING_CORE_TYPE", cfg.get("scheduling_core_type"))
 
         if config:
             self.logger.info("OpenVINO runtime config: %s", config)
@@ -107,14 +109,22 @@ def characters(self):
         return self.get_character_list()
 
     def get_character_list(self, key: str = "character") -> List[str]:
-        val = self.model.get_rt_info()["framework"][key]
-        return val.value.splitlines()
+        rt_info = self.model.get_rt_info()
+        framework_info = rt_info.get("framework", {})
+        val = framework_info.get(key)
+        if val is None or not hasattr(val, "value"):
+            return []
+        value = getattr(val, "value", None)
+        if value is None:
+            return []
+        return value.splitlines()
 
     def have_key(self, key: str = "character") -> bool:
         try:
             rt_info = self.model.get_rt_info()
-            return key in rt_info
-        except:
+            framework_info = rt_info.get("framework", {})
+            return key in framework_info
+        except (AttributeError, TypeError, KeyError):
             return False