UD2025.32

.github/workflows/job_build_mlir_linux.yml

@@ -211,7 +211,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \
             -DOpenVINODeveloperPackage_DIR=$(realpath ${OPENVINO_BUILD_DIR}) \
             -DENABLE_TESTS=${{ env.ENABLE_TESTS_FLAG }} \
-            -DENABLE_DEVELOPER_BUILD=OFF \
+            -DENABLE_DEVELOPER_BUILD=ON \
             -DENABLE_MLIR_COMPILER=ON \
             -DBUILD_COMPILER_FOR_DRIVER=OFF \
             -DENABLE_DRIVER_COMPILER_ADAPTER=ON \

.github/workflows/job_tests_unit_mlir_linux.yml

@@ -55,10 +55,7 @@ jobs:
           echo "VPUX_TRANSLATE_PATH=$(realpath "${OPENVINO_INSTALL_DIR}/tools/vpux-translate")" >> $GITHUB_ENV
           chmod +x ${OPENVINO_INSTALL_DIR}/setupvars.sh
           chmod +x ${OPENVINO_INSTALL_DIR}/tests/FileCheck
-          chmod +x ${OPENVINO_INSTALL_DIR}/tests/flatc
-          chmod +x ${OPENVINO_INSTALL_DIR}/tests/not
           chmod +x ${OPENVINO_INSTALL_DIR}/tools/prof_parser/prof_parser
-          chmod +x ${OPENVINO_INSTALL_DIR}/tools/npu-lsp-server/npu-lsp-server
           chmod +x ${OPENVINO_INSTALL_DIR}/tools/vpux-opt/vpux-opt
           chmod +x ${OPENVINO_INSTALL_DIR}/tools/vpux-translate/vpux-translate
 

CMakeLists.txt

@@ -24,44 +24,29 @@ cmake_policy(SET CMP0063 NEW)
 # Set PROJECT_VERSION* variables by project command only.
 cmake_policy(SET CMP0048 NEW)
 
-project(InferenceEngineVPUXPlugin)
+project(VPUX)
 
 #
 # Build properties
 #
 
 set(NPU_DEVICE_NAME "NPU")
-string(TOLOWER "${NPU_DEVICE_NAME}" VPUX_PLUGIN_COMPONENT)
-set(VPUX_INTERNAL_COMPONENT "${VPUX_PLUGIN_COMPONENT}_internal")
-set(VPUX_TESTS_COMPONENT "${VPUX_PLUGIN_COMPONENT}_tests")
+set(VPUX_PLUGIN_COMPONENT "npu")
+set(VPUX_INTERNAL_COMPONENT "npu_internal")
+set(VPUX_TESTS_COMPONENT "npu_tests")
 
 set(NPU_CPACK_COMPONENTS_ALL ${VPUX_PLUGIN_COMPONENT} ${VPUX_INTERNAL_COMPONENT})
 
-set(IE_MAIN_VPUX_PLUGIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
 if (CMAKE_BUILD_TYPE STREQUAL "")
     message(STATUS "CMAKE_BUILD_TYPE not defined, 'Release' will be used")
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${MAIN_VPUX_PLUGIN_BINARY_DIR})
-    set(CMAKE_PDB_OUTPUT_DIRECTORY ${MAIN_VPUX_PLUGIN_BINARY_DIR})
-endif()
-
-if(DEFINED ENV{THIRDPARTY_SERVER_PATH})
-    set(THIRDPARTY_SERVER_PATH "$ENV{THIRDPARTY_SERVER_PATH}")
-elseif(DEFINED THIRDPARTY_SERVER_PATH)
-    set(THIRDPARTY_SERVER_PATH "${THIRDPARTY_SERVER_PATH}")
-endif()
-
-include(FetchContent)
-
 # TODO remove after migration
 option(ENABLE_NPU_MONO "Please turn it on if you work under `npu_mono` environment" OFF)
 if (ENABLE_NPU_MONO)
     message(AUTHOR_WARNING "Experimental option ENABLE_NPU_MONO enabled")
-    set (NPU_MONO_ROOT ${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/..)
+    set (NPU_MONO_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
 endif()
 
 find_package(OpenVINODeveloperPackage REQUIRED)
@@ -82,7 +67,6 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/dependencies.cmake")
     include(cmake/dependencies.cmake)
 endif()
 
-include(cmake/cross_compilation.cmake)
 include(cmake/flatbuffers.cmake)
 include(cmake/bundle_static_library.cmake)
 include(cmake/embed_bin_file.cmake)
@@ -179,14 +163,6 @@ if(ENABLE_SOURCE_PACKAGE)
     include(cmake/source_package.cmake)
 endif()
 
-if(CMAKE_SOURCE_DIR STREQUAL OpenVINO_SOURCE_DIR)
-    # NPU plugin public headers should be a part of common OpenVINO headers
-    set(dev_component ${OV_CPACK_COMP_CORE_DEV})
-else()
-    # compatibility mode while NPU plugin is not part of OpenVINO repository and can be built separately
-    set(dev_component ${VPUX_PLUGIN_COMPONENT})
-endif()
-
 #
 # CPack
 #

CMakePresets.json

@@ -92,7 +92,7 @@
 
         {
             "name": "vpuxDeveloper",
-            "description": "Default configuration preset for VPUX Compiler development. Enables VPUX compiler and generic OV tests, and disables plugin specific builds. Also, enables IMD backend",
+            "description": "Default configuration preset for VPUX Compiler development. Enables VPUX compiler and generic OV tests, and disables plugin specific builds.",
             "inherits": ["BuildOptimization", "EnableTests", "Disabler"],
             "binaryDir": "${sourceDir}/build-x86_64/Debug",
             "displayName": "vpuxDeveloper",
@@ -118,7 +118,7 @@
         },
         {
             "name": "vpuxRelWithDebInfoDeveloper",
-            "description": "Release with debug info configuration preset for VPUX Compiler development. Enables VPUX compiler and generic OV tests, and disables plugin specific builds. Also, enables IMD backend",
+            "description": "Release with debug info configuration preset for VPUX Compiler development. Enables VPUX compiler and generic OV tests, and disables plugin specific builds.",
             "inherits": ["BuildOptimization", "EnableTests", "Disabler"],
             "binaryDir": "${sourceDir}/build-x86_64/RelWithDebInfo",
             "displayName": "vpuxRelWithDebInfoDeveloper",
@@ -217,7 +217,7 @@
         {
             "name": "cid",
             "hidden": true,
-            "description": "cid build necessary options. Please note the path of NPU plugin when use.",
+            "description": "Default configuration for NPU driver compiler. Make sure NPU_PLUGIN_HOME environment variable is set to the VPUX plugin root directory.",
             "cacheVariables": {
                 "BUILD_SHARED_LIBS": false,
                 "ENABLE_OV_IR_FRONTEND": true,
@@ -235,15 +235,15 @@
            }
         },
         {
-            "name": "npuCidReleaseLinux",
-            "description": "Default configuration for NPU Driver Compiler target build on Linux. Please note: 1) Please make sure that NPU_PLUGIN_HOME environment variable is set to NPU plugin path. 2) build Cid is a static build which only build related targets and not include other unrelated options and targets to avoid getting big generated files.",
-            "binaryDir": "${sourceDir}/build-x86_64/Release",
-            "displayName": "npuCidRelease",
+            "name": "npuCidLinux",
+            "description": "Default CMake configuration to build NPU-CiD targets on Linux. Note: (1) Make sure NPU_PLUGIN_HOME and CONFIG environment variables are set. (2) CiD is a static build that includes only the necessary targets. Irrelevant targets/components are excluded to minimize the size of the build output.",
+            "binaryDir": "${sourceDir}/build_$env{CONFIG}",
+            "displayName": "npuCid",
             "inherits": ["cid", "BuildOptimization", "Disabler"],
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
-                    "value": "Release"
+                    "value": "$env{CONFIG}"
                 },
 
                 "ENABLE_LTO": false,
@@ -291,15 +291,15 @@
             }
         },
         {
-            "name": "npuCidReleaseWindows",
-            "description": "Default configuration for NPU Driver Compiler target build on Windows. Please note: 1) Please make sure that NPU_PLUGIN_HOME environment variable is set to NPU plugin path. 2) build Cid is a static build which only build related targets and not include other unrelated options and targets to avoid getting big generated files.",
-            "binaryDir": "${sourceDir}/build-x86_64/Release",
-            "displayName": "npuCidRelease",
+            "name": "npuCidWindows",
+            "description": "Default CMake configuration to build NPU-CiD targets on Windows. Note: (1) Make sure NPU_PLUGIN_HOME and CONFIG environment variables are set. (2) CiD is a static build that includes only the necessary targets. Irrelevant targets/components are excluded to minimize the size of the build output.",
+            "binaryDir": "${sourceDir}/build_$env{CONFIG}",
+            "displayName": "npuCid",
             "inherits": ["cid", "BuildOptimization", "Disabler"],
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
-                    "value": "Release"
+                    "value": "$env{CONFIG}"
                 },
                 "CMAKE_TOOLCHAIN_FILE":"${sourceDir}\\cmake\\toolchains\\onecoreuap.toolchain.cmake",
                 "ENABLE_LTO": false,
@@ -392,22 +392,6 @@
                 "VPUX_PLUGIN_HOME": "${sourceDir}"
             }
         },
-        {
-            "name": "Simulator",
-            "hidden": true,
-            "environment": {
-                "IE_NPU_USE_IMD_BACKEND": "1",
-                "IE_NPU_IMD_LAUNCH_MODE": "VPUX_IMD_SIMULATOR"
-            }
-        },
-        {
-            "name": "Silicon",
-            "hidden": true,
-            "environment": {
-                "IE_NPU_USE_IMD_BACKEND": "1",
-                "IE_NPU_IMD_LAUNCH_MODE": "VPUX_IMD_MOVI_DEBUG"
-            }
-        },
         {
             "name": "NPU3720/Simulator",
             "hidden": true,

cmake/dependencies.cmake

@@ -8,9 +8,9 @@ cmake_policy(SET CMP0054 NEW)
 include(ExternalProject)
 
 if(NOT BUILD_SHARED_LIBS)
-    set(TEMP "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/temp")
+    set(TEMP "${PROJECT_SOURCE_DIR}/temp")
 else()
-    ov_set_temp_directory(TEMP "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}")
+    ov_set_temp_directory(TEMP "${PROJECT_SOURCE_DIR}")
 endif()
 
 # FIXME: Create empty file to avoid errors on CI

cmake/embed_bin_file.cmake

@@ -1,9 +1,8 @@
 #
-# Copyright (C) 2022-2025 Intel Corporation.
+# Copyright (C) 2025 Intel Corporation.
 # SPDX-License-Identifier: Apache-2.0
 #
 
-
 function(vpux_embed_bin_file)
     set(options)
     set(oneValueArgs SOURCE_FILE HEADER_FILE VARIABLE_NAME)

cmake/features.cmake

@@ -20,7 +20,7 @@ ov_dependent_option(ENABLE_NPU_FUZZ_TESTS "NPU Fuzz tests" OFF "ENABLE_TESTS" OF
 if(NOT ENABLE_LTO)
     set(ENABLE_LTO OFF)
 endif()
-ov_dependent_option(ENABLE_LTO "Enable Link Time Optimization" ${ENABLE_LTO} "LINUX OR WIN32;NOT CMAKE_CROSSCOMPILING" OFF)
+ov_dependent_option(ENABLE_LTO "Enable Link Time Optimization" ${ENABLE_LTO} "LINUX OR WIN32" OFF)
 
 if(NOT ENABLE_FASTER_BUILD)
     set(ENABLE_FASTER_BUILD OFF)
@@ -56,12 +56,8 @@ if(ENABLE_PRIVATE_COMPILER_OPTIONS)
     add_definitions(-DPRIVATE_COMPILER_OPTIONS_ENABLED)
 endif()
 
-if(NOT DEFINED MV_TOOLS_PATH AND DEFINED ENV{MV_TOOLS_DIR} AND DEFINED ENV{MV_TOOLS_VERSION})
-    set(MV_TOOLS_PATH $ENV{MV_TOOLS_DIR}/$ENV{MV_TOOLS_VERSION})
-endif()
-
 ov_option(ENABLE_NPU_LOADER "Enable npu-loader" OFF)
-ov_option(ENABLE_NPU_LSP_SERVER "Enable npu-lsp-server" ON)
+ov_option(ENABLE_NPU_LSP_SERVER "Enable npu-lsp-server" OFF)
 
 get_target_property(ov_linked_libs openvino::runtime IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE)
 if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" OR "TBB::tbb" IN_LIST ov_linked_libs)
@@ -87,8 +83,8 @@ ov_option(ENABLE_NPU_MICRO_BENCHMARKS "NPU micro benchmarks" OFF)
 if(ENABLE_VPUX_DOCS)
     find_package(Doxygen)
     if(DOXYGEN_FOUND)
-        set(DOXYGEN_IN ${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/docs/VPUX_DG/Doxyfile.in)
-        set(DOXYGEN_OUT ${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/docs/VPUX_DG/generated/Doxyfile)
+        set(DOXYGEN_IN ${PROJECT_SOURCE_DIR}/docs/VPUX_DG/Doxyfile.in)
+        set(DOXYGEN_OUT ${PROJECT_SOURCE_DIR}/docs/VPUX_DG/generated/Doxyfile)
 
         configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
         message("Doxygen build started")