OCV and MLIR-Plugin adjustments

Author: Maxim-Doronin

.github/actions/compile-models/action.yml

@@ -3,7 +3,7 @@ description: 'Compile models for NPU'
 
 inputs:
   compiler-type:
-    description: 'MLIR|DRIVER'
+    description: 'PLUGIN|DRIVER'
     type: string
     required: true
   npu-platform:
@@ -46,7 +46,7 @@ runs:
         python3 -m pip install --require-hashes -r ${{ github.action_path }}/requirements.txt
 
     - name: Prepare OpenVINO environment
-      if: ${{ inputs.compiler-type == 'MLIR' }}
+      if: ${{ inputs.compiler-type == 'PLUGIN' }}
       shell: bash
       run: |
         cat <<'EOF' > prepare_env.sh

.github/actions/compile-models/common/cli.py

@@ -15,8 +15,8 @@ def parse_arguments():
         "--compiler-type",
         type=str,
         required=True,
-        choices=["MLIR", "DRIVER"],
-        help="MLIR|DRIVER",
+        choices=["PLUGIN", "DRIVER"],
+        help="PLUGIN|DRIVER",
     )
     parser.add_argument(
         "--compile-tool",

.github/actions/compile-models/compile_models.py

@@ -12,9 +12,9 @@
         "repository_path": "path/to/model/in.repo",
         "framework": "onnx|pytorch",
         "model_type": "transormer",
-        "category": "MLIR/VPU4000/SILICON",
+        "category": "PLUGIN/VPU4000/SILICON",
         "extra_config": {
-            "NPU_COMPILER_TYPE": "MLIR",
+            "NPU_COMPILER_TYPE": "PLUGIN",
             "NPU_PLATFORM": "VPU4000",
             "DEVICE_ID": "4000",
             "PERFORMANCE_HINT": "LATENCY"

.github/actions/download-models/action.yml

@@ -3,7 +3,7 @@ description: 'Download models from different sources'
 
 inputs:
   compiler-type:
-    description: 'MLIR|DRIVER'
+    description: 'PLUGIN|DRIVER'
     type: string
     required: true
   models-config:

.github/actions/download-models/common/cli.py

@@ -13,8 +13,8 @@ def parse_arguments():
         "--compiler-type",
         type=str,
         required=True,
-        choices=["MLIR", "DRIVER"],
-        help="MLIR|DRIVER",
+        choices=["PLUGIN", "DRIVER"],
+        help="PLUGIN|DRIVER",
     )
     parser.add_argument(
         "--models-config",

.github/actions/download-models/download_models.py

@@ -11,7 +11,7 @@
       "repository_path": "path/to/model/in/repo",
       "framework": "pytorch|onnx",
       "extra_config": {
-        "NPU_COMPILER_TYPE": "MLIR|DRIVER"
+        "NPU_COMPILER_TYPE": "PLUGIN|DRIVER"
       }
     }
   ]

.github/actions/versions/action.yml

@@ -27,11 +27,17 @@ outputs:
     description: 'NPU Linux Driver commit SHA'
     value: ${{ steps.read-linux-npu-driver-sha.outputs.drv-sha }}
   omz-repository:
-    description: 'Open Model Zoo Repository full name: for/open_model_zoo'
+    description: 'Open Model Zoo Repository full name: fork/open_model_zoo'
     value: ${{ steps.read-omz-sha.outputs.omz-repository }}
   omz-sha:
     description: 'Open Model Zoo commit SHA'
     value: ${{ steps.read-omz-sha.outputs.omz-sha }}
+  opencv-repository:
+    description: 'OpenCV Repository full name: fork/opencv'
+    value: ${{ steps.read-ocv-sha.outputs.ocv-repository }}
+  opencv-sha:
+    description: 'OpenCV commit SHA'
+    value: ${{ steps.read-ocv-sha.outputs.ocv-sha }}
 
 runs:
   using: 'composite'
@@ -156,3 +162,20 @@ runs:
         echo "Open Model Zoo commit sha = $OMZ_SHA"
         echo "omz-repository=$OMZ_ORG/open_model_zoo" >> $GITHUB_OUTPUT
         echo "omz-sha=$OMZ_SHA" >> $GITHUB_OUTPUT
+
+    - name: Fetch and parse OpenCV config from OpenVINO
+      id: read-ocv-sha
+      shell: bash
+      run: |
+        OV_REPO=${{ steps.read-openvino-sha.outputs.openvino-repository }}
+        OV_SHA=${{ steps.read-openvino-sha.outputs.openvino-sha }}
+        JSON=$(curl -sS --fail --retry 5 --retry-delay 2 \
+          -H "Accept: application/vnd.github.v3.raw" \
+          https://api.github.com/repos/${OV_REPO}/contents/src/plugins/intel_npu/tools/opencv_version.json?ref=${OV_SHA} \
+        )
+        OCV_ORG=$(echo "$JSON" | jq -r 'to_entries[0].key')
+        OCV_SHA=$(echo "$JSON" | jq -r 'to_entries[0].value')
+        echo "OpenCV orgranization = $OCV_ORG"
+        echo "OpenCV commit sha = $OCV_SHA"
+        echo "ocv-repository=$OCV_ORG/opencv" >> $GITHUB_OUTPUT
+        echo "ocv-sha=$OCV_SHA" >> $GITHUB_OUTPUT

.github/workflows/codeql.yml

@@ -56,6 +56,6 @@ jobs:
     with:
       os: ubuntu_24_04
       build-runner: ubuntu-latest-32-cores
-      build-mlir: true
+      build-plugin: true
       build-driver: false
       with-codeql: true

.github/workflows/job_build_drv_linux.yml

@@ -108,6 +108,7 @@ jobs:
         run: |
           sed -i "s|^set(OPENVINO_REPOSITORY .*|set(OPENVINO_REPOSITORY https://github.com/${{ steps.versions.outputs.openvino-repository }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
           sed -i "s|^set(OPENVINO_REVISION .*|set(OPENVINO_REVISION ${{ steps.versions.outputs.openvino-sha }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
+          sed -i "s|^set(OPENCV_REVISION .*|set(OPENCV_REVISION ${{ steps.versions.outputs.opencv-sha }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
           sed -i '/GIT_REPOSITORY/{n;s|https://github.com/openvinotoolkit/npu_compiler.git|https://github.com/${{ steps.versions.outputs.npu-compiler-repository }}.git|}' ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
           sed -i "s|^set(NPU_COMPILER_TAG .*|set(NPU_COMPILER_TAG ${{ steps.versions.outputs.npu-compiler-tag }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake
           sed -i "s|^set(NPU_COMPILER_REVISION .*|set(NPU_COMPILER_REVISION ${{ steps.versions.outputs.npu-compiler-sha }})|" ${NPU_DRIVER_REPO}/compiler/compiler_source.cmake

…ithub/workflows/job_build_mlir_linux.yml …hub/workflows/job_build_plugin_linux.yml.github/workflows/job_build_mlir_linux.yml renamed to .github/workflows/job_build_plugin_linux.yml .github/workflows/job_build_mlir_linux.yml renamed to .github/workflows/job_build_plugin_linux.yml

@@ -1,4 +1,4 @@
-name: Linux MLIR Build
+name: Linux Plugin Build
 on:
   workflow_call:
     inputs: