refactor configuration and tests: replace BuildConfig with OpenVINOConfig for enhanced flexibility and support of multiple OpenVINO distribution modes (build, install, link); update schema validations, experiment YAML, and add dedicated tests

Author: allnes

experiments/android_example.yaml

@@ -3,11 +3,27 @@ project:
   run_id: "android_benchmark_001"
   description: "OpenVINO benchmark on Android device"
 
-build:
-  enabled: true
-  openvino_repo: "/path/to/openvino"  # UPDATE THIS PATH
-  openvino_commit: "HEAD"
+# OpenVINO distribution configuration
+# Chooses one of three modes: build, install, or link
+openvino:
+  # Mode 1: Build from source
+  mode: "build"
+  source_dir: "/path/to/openvino"  # UPDATE THIS PATH
+  commit: "HEAD"
   build_type: "Release"
+
+  # Mode 2: Use existing install (uncomment to use)
+  # mode: "install"
+  # install_dir: "/path/to/openvino/install" # UPDATE THIS PATH
+
+  # Mode 3: Download from URL (uncomment to use)
+  # mode: "link"
+  # archive_url: "https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/\
+  #   2025.4.0-19820-4671c012da0/openvino_toolkit_ubuntu22_2025.4.0.dev20250820_arm64.tgz"
+  # Or use 'latest' for auto-detection:
+  # archive_url: "latest"
+
+  # Build configuration (for build mode)
   toolchain:
     android_ndk: "/path/to/android-ndk-r26d"  # UPDATE THIS PATH
     abi: "arm64-v8a"

experiments/raspberry_pi_example.yaml

@@ -34,16 +34,34 @@ device:
   # port: 22
   push_dir: /home/pi/ovmobilebench  # Remote directory for benchmark files
 
-# Build configuration for ARM cross-compilation
-build:
-  enabled: true
-  openvino_repo: /path/to/openvino  # UPDATE THIS PATH
-  # ARM-specific build settings
-  cmake_args:
-    - -DCMAKE_BUILD_TYPE=Release
-    - -DENABLE_SAMPLES=ON
-    - -DENABLE_TESTS=OFF
-    - -DTARGET_ARM=ON
+# OpenVINO distribution configuration for ARM
+openvino:
+  # Mode 1: Build from source for ARM
+  mode: "build"
+  source_dir: "/path/to/openvino"  # UPDATE THIS PATH
+  commit: "HEAD"
+  build_type: "Release"
+
+  # Mode 2: Use pre-built ARM install (uncomment to use)
+  # mode: "install"
+  # install_dir: "/path/to/openvino/arm64/install"  # UPDATE THIS PATH
+
+  # Mode 3: Download from URL (uncomment to use)
+  # mode: "link"
+  # archive_url: "https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/\
+  #   2025.4.0-19820-4671c012da0/openvino_toolkit_rhel8_2025.4.0.dev20250820_aarch64.tgz"
+  # Or use 'latest' for auto-detection:
+  # archive_url: "latest"
+
+  # ARM build options (for build mode)
+  toolchain:
+    cmake: "cmake"
+    ninja: "ninja"
+  options:
+    ENABLE_INTEL_GPU: "OFF"
+    ENABLE_ONEDNN_FOR_ARM: "ON"
+    ENABLE_PYTHON: "OFF"
+    BUILD_SHARED_LIBS: "ON"
 
 # Model configuration with directory scanning
 models:

experiments/ssh_test_ci.yaml

@@ -10,10 +10,10 @@ device:
   username: testuser
   push_dir: /tmp/ovmobilebench
 
-# Build configuration (disabled for CI)
-build:
-  enabled: false
-  openvino_repo: /tmp/openvino
+# OpenVINO configuration (using pre-installed for CI)
+openvino:
+  mode: "install"
+  install_dir: "/opt/openvino/install"  # Pre-installed OpenVINO in CI
 
 # Dummy models for testing
 models:

ovmobilebench/builders/openvino.py

@@ -3,7 +3,7 @@
 import logging
 from pathlib import Path
 
-from ovmobilebench.config.schema import BuildConfig
+from ovmobilebench.config.schema import OpenVINOConfig
 from ovmobilebench.core.errors import BuildError
 from ovmobilebench.core.fs import ensure_dir
 from ovmobilebench.core.shell import run
@@ -14,18 +14,22 @@
 class OpenVINOBuilder:
     """Build OpenVINO runtime and benchmark_app for target platform."""
 
-    def __init__(self, config: BuildConfig, build_dir: Path, verbose: bool = False):
+    def __init__(self, config: OpenVINOConfig, build_dir: Path, verbose: bool = False):
         self.config = config
         self.build_dir = ensure_dir(build_dir)
         self.verbose = verbose
 
     def build(self) -> Path:
         """Build OpenVINO and return path to build artifacts."""
-        if not self.config.enabled:
-            logger.info("Build disabled, using prebuilt binaries")
-            return Path(self.config.openvino_repo) / "bin"
+        if self.config.mode != "build":
+            raise ValueError(
+                f"OpenVINOBuilder can only be used with mode='build', got '{self.config.mode}'"
+            )
+
+        if not self.config.source_dir:
+            raise ValueError("source_dir must be specified for build mode")
 
-        logger.info(f"Building OpenVINO from {self.config.openvino_repo}")
+        logger.info(f"Building OpenVINO from {self.config.source_dir}")
 
         # Checkout specific commit
         self._checkout_commit()
@@ -40,21 +44,21 @@ def build(self) -> Path:
 
     def _checkout_commit(self):
         """Checkout specific commit if needed."""
-        if self.config.openvino_commit != "HEAD":
+        if self.config.commit != "HEAD":
             run(
-                f"git checkout {self.config.openvino_commit}",
-                cwd=Path(self.config.openvino_repo),
+                f"git checkout {self.config.commit}",
+                cwd=Path(self.config.source_dir),
                 check=True,
                 verbose=self.verbose,
             )
-            logger.info(f"Checked out commit: {self.config.openvino_commit}")
+            logger.info(f"Checked out commit: {self.config.commit}")
 
     def _configure_cmake(self):
         """Configure CMake for Android build."""
         cmake_args = [
             "cmake",
             "-S",
-            self.config.openvino_repo,
+            self.config.source_dir,
             "-B",
             str(self.build_dir),
             "-GNinja",

ovmobilebench/config/__init__.py

@@ -1,11 +1,11 @@
 """Configuration module for OVMobileBench."""
 
 from .loader import load_experiment
-from .schema import BuildConfig, DeviceConfig, Experiment, ReportConfig, RunConfig
+from .schema import DeviceConfig, Experiment, OpenVINOConfig, ReportConfig, RunConfig
 
 __all__ = [
     "Experiment",
-    "BuildConfig",
+    "OpenVINOConfig",
     "DeviceConfig",
     "RunConfig",
     "ReportConfig",

ovmobilebench/config/schema.py

@@ -24,20 +24,50 @@ class BuildOptions(BaseModel):
     BUILD_SHARED_LIBS: Literal["ON", "OFF"] = "ON"
 
 
-class BuildConfig(BaseModel):
-    """Build configuration."""
+class OpenVINOConfig(BaseModel):
+    """OpenVINO distribution configuration."""
 
-    enabled: bool = Field(True, description="Whether to build from source")
-    openvino_repo: str = Field(..., description="Path to OpenVINO repository")
-    openvino_commit: str = Field("HEAD", description="Git commit/tag to build")
+    mode: Literal["build", "install", "link"] = Field(
+        "build",
+        description="How to obtain OpenVINO: build from source, use install dir, or download archive",
+    )
+
+    # For 'build' mode
+    source_dir: str | None = Field(
+        None, description="Path to OpenVINO source code (for build mode)"
+    )
+    commit: str = Field("HEAD", description="Git commit/tag to build (for build mode)")
     build_type: Literal["Release", "RelWithDebInfo", "Debug"] = "RelWithDebInfo"
+
+    # For 'install' mode
+    install_dir: str | None = Field(
+        None, description="Path to OpenVINO install directory (for install mode)"
+    )
+
+    # For 'link' mode
+    archive_url: str | None = Field(
+        None, description="URL to OpenVINO archive (for link mode). Use 'latest' for auto-detection"
+    )
+
+    # Common build options (for build mode)
     toolchain: Toolchain = Field(
         default_factory=lambda: Toolchain(
             android_ndk=None, abi="arm64-v8a", api_level=24, cmake="cmake", ninja="ninja"
         )
     )
     options: BuildOptions = Field(default_factory=lambda: BuildOptions())
 
+    @model_validator(mode="after")
+    def validate_mode_config(self):
+        """Validate that required fields are set based on mode."""
+        if self.mode == "build" and not self.source_dir:
+            raise ValueError("source_dir is required when mode is 'build'")
+        elif self.mode == "install" and not self.install_dir:
+            raise ValueError("install_dir is required when mode is 'install'")
+        elif self.mode == "link" and not self.archive_url:
+            raise ValueError("archive_url is required when mode is 'link'")
+        return self
+
 
 class PackageConfig(BaseModel):
     """Package configuration."""
@@ -187,7 +217,7 @@ class Experiment(BaseModel):
     """Complete experiment configuration."""
 
     project: ProjectConfig
-    build: BuildConfig
+    openvino: OpenVINOConfig
     package: PackageConfig = Field(default_factory=lambda: PackageConfig())
     device: DeviceConfig
     models: ModelsConfig | list[ModelItem]