Skip to content

Commit df25c78

Browse files
UD2025.32 (#145)
* UD2025.32 Update file batch #1 * UD2025.32 Update file batch #2 * UD2025.32 Update file batch #3 * UD2025.32 Update file batch #4 * UD2025.32 Update file batch #5 * UD2025.32 Update file batch #6 * UD2025.32 Update file batch #7 * UD2025.32 Update file batch #8 * UD2025.32 Update file batch #9 * UD2025.32 Update file batch #10 * UD2025.32 Update file batch #11 * UD2025.32 Update file batch #12 * UD2025.32 Update file batch #13 * UD2025.32 Update file batch #14 * UD2025.32 Update file batch #15 * UD2025.32 Update file batch #16 * UD2025.32 Update file batch #17 * UD2025.32 Update file batch #18 * UD2025.32 Update file batch #19 * UD2025.32 Update file batch #20 * UD2025.32 Update file batch #21 * UD2025.32 Update file batch #22 * UD2025.32 Update file batch #23 * UD2025.32 Update file batch #24 * UD2025.32 Update file batch #25 * UD2025.32 Update file batch #26 * UD2025.32 Update file batch #27 * UD2025.32 Update file batch #28 * UD2025.32 Update file batch #29 * UD2025.32 Update file batch #30 * UD2025.32 Update file batch #31 * UD2025.32 Update file batch #32 * UD2025.32 Update file batch #33 * UD2025.32 Update file batch #34 * UD2025.32 Update file batch #35 * UD2025.32 Update file batch #36 * UD2025.32 Update file batch #37 * UD2025.32 Update file batch #38 * UD2025.32 Update file batch #39 * UD2025.32 Update file batch #40 * UD2025.32 Update ELF * WA for GCC warning * Revert driver update * Test fixes
1 parent 90b6098 commit df25c78

File tree

1,937 files changed

+46801
-27888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,937 files changed

+46801
-27888
lines changed

.github/workflows/job_build_mlir_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ jobs:
211211
-DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \
212212
-DOpenVINODeveloperPackage_DIR=$(realpath ${OPENVINO_BUILD_DIR}) \
213213
-DENABLE_TESTS=${{ env.ENABLE_TESTS_FLAG }} \
214-
-DENABLE_DEVELOPER_BUILD=OFF \
214+
-DENABLE_DEVELOPER_BUILD=ON \
215215
-DENABLE_MLIR_COMPILER=ON \
216216
-DBUILD_COMPILER_FOR_DRIVER=OFF \
217217
-DENABLE_DRIVER_COMPILER_ADAPTER=ON \

.github/workflows/job_tests_unit_mlir_linux.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ jobs:
5555
echo "VPUX_TRANSLATE_PATH=$(realpath "${OPENVINO_INSTALL_DIR}/tools/vpux-translate")" >> $GITHUB_ENV
5656
chmod +x ${OPENVINO_INSTALL_DIR}/setupvars.sh
5757
chmod +x ${OPENVINO_INSTALL_DIR}/tests/FileCheck
58-
chmod +x ${OPENVINO_INSTALL_DIR}/tests/flatc
59-
chmod +x ${OPENVINO_INSTALL_DIR}/tests/not
6058
chmod +x ${OPENVINO_INSTALL_DIR}/tools/prof_parser/prof_parser
61-
chmod +x ${OPENVINO_INSTALL_DIR}/tools/npu-lsp-server/npu-lsp-server
6259
chmod +x ${OPENVINO_INSTALL_DIR}/tools/vpux-opt/vpux-opt
6360
chmod +x ${OPENVINO_INSTALL_DIR}/tools/vpux-translate/vpux-translate
6461

CMakeLists.txt

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,29 @@ cmake_policy(SET CMP0063 NEW)
2424
# Set PROJECT_VERSION* variables by project command only.
2525
cmake_policy(SET CMP0048 NEW)
2626

27-
project(InferenceEngineVPUXPlugin)
27+
project(VPUX)
2828

2929
#
3030
# Build properties
3131
#
3232

3333
set(NPU_DEVICE_NAME "NPU")
34-
string(TOLOWER "${NPU_DEVICE_NAME}" VPUX_PLUGIN_COMPONENT)
35-
set(VPUX_INTERNAL_COMPONENT "${VPUX_PLUGIN_COMPONENT}_internal")
36-
set(VPUX_TESTS_COMPONENT "${VPUX_PLUGIN_COMPONENT}_tests")
34+
set(VPUX_PLUGIN_COMPONENT "npu")
35+
set(VPUX_INTERNAL_COMPONENT "npu_internal")
36+
set(VPUX_TESTS_COMPONENT "npu_tests")
3737

3838
set(NPU_CPACK_COMPONENTS_ALL ${VPUX_PLUGIN_COMPONENT} ${VPUX_INTERNAL_COMPONENT})
3939

40-
set(IE_MAIN_VPUX_PLUGIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
41-
4240
if (CMAKE_BUILD_TYPE STREQUAL "")
4341
message(STATUS "CMAKE_BUILD_TYPE not defined, 'Release' will be used")
4442
set(CMAKE_BUILD_TYPE "Release")
4543
endif()
4644

47-
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
48-
set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${MAIN_VPUX_PLUGIN_BINARY_DIR})
49-
set(CMAKE_PDB_OUTPUT_DIRECTORY ${MAIN_VPUX_PLUGIN_BINARY_DIR})
50-
endif()
51-
52-
if(DEFINED ENV{THIRDPARTY_SERVER_PATH})
53-
set(THIRDPARTY_SERVER_PATH "$ENV{THIRDPARTY_SERVER_PATH}")
54-
elseif(DEFINED THIRDPARTY_SERVER_PATH)
55-
set(THIRDPARTY_SERVER_PATH "${THIRDPARTY_SERVER_PATH}")
56-
endif()
57-
58-
include(FetchContent)
59-
6045
# TODO remove after migration
6146
option(ENABLE_NPU_MONO "Please turn it on if you work under `npu_mono` environment" OFF)
6247
if (ENABLE_NPU_MONO)
6348
message(AUTHOR_WARNING "Experimental option ENABLE_NPU_MONO enabled")
64-
set (NPU_MONO_ROOT ${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/..)
49+
set (NPU_MONO_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
6550
endif()
6651

6752
find_package(OpenVINODeveloperPackage REQUIRED)
@@ -82,7 +67,6 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/dependencies.cmake")
8267
include(cmake/dependencies.cmake)
8368
endif()
8469

85-
include(cmake/cross_compilation.cmake)
8670
include(cmake/flatbuffers.cmake)
8771
include(cmake/bundle_static_library.cmake)
8872
include(cmake/embed_bin_file.cmake)
@@ -179,14 +163,6 @@ if(ENABLE_SOURCE_PACKAGE)
179163
include(cmake/source_package.cmake)
180164
endif()
181165

182-
if(CMAKE_SOURCE_DIR STREQUAL OpenVINO_SOURCE_DIR)
183-
# NPU plugin public headers should be a part of common OpenVINO headers
184-
set(dev_component ${OV_CPACK_COMP_CORE_DEV})
185-
else()
186-
# compatibility mode while NPU plugin is not part of OpenVINO repository and can be built separately
187-
set(dev_component ${VPUX_PLUGIN_COMPONENT})
188-
endif()
189-
190166
#
191167
# CPack
192168
#

CMakePresets.json

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292

9393
{
9494
"name": "vpuxDeveloper",
95-
"description": "Default configuration preset for VPUX Compiler development. Enables VPUX compiler and generic OV tests, and disables plugin specific builds. Also, enables IMD backend",
95+
"description": "Default configuration preset for VPUX Compiler development. Enables VPUX compiler and generic OV tests, and disables plugin specific builds.",
9696
"inherits": ["BuildOptimization", "EnableTests", "Disabler"],
9797
"binaryDir": "${sourceDir}/build-x86_64/Debug",
9898
"displayName": "vpuxDeveloper",
@@ -118,7 +118,7 @@
118118
},
119119
{
120120
"name": "vpuxRelWithDebInfoDeveloper",
121-
"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",
121+
"description": "Release with debug info configuration preset for VPUX Compiler development. Enables VPUX compiler and generic OV tests, and disables plugin specific builds.",
122122
"inherits": ["BuildOptimization", "EnableTests", "Disabler"],
123123
"binaryDir": "${sourceDir}/build-x86_64/RelWithDebInfo",
124124
"displayName": "vpuxRelWithDebInfoDeveloper",
@@ -217,7 +217,7 @@
217217
{
218218
"name": "cid",
219219
"hidden": true,
220-
"description": "cid build necessary options. Please note the path of NPU plugin when use.",
220+
"description": "Default configuration for NPU driver compiler. Make sure NPU_PLUGIN_HOME environment variable is set to the VPUX plugin root directory.",
221221
"cacheVariables": {
222222
"BUILD_SHARED_LIBS": false,
223223
"ENABLE_OV_IR_FRONTEND": true,
@@ -235,15 +235,15 @@
235235
}
236236
},
237237
{
238-
"name": "npuCidReleaseLinux",
239-
"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.",
240-
"binaryDir": "${sourceDir}/build-x86_64/Release",
241-
"displayName": "npuCidRelease",
238+
"name": "npuCidLinux",
239+
"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.",
240+
"binaryDir": "${sourceDir}/build_$env{CONFIG}",
241+
"displayName": "npuCid",
242242
"inherits": ["cid", "BuildOptimization", "Disabler"],
243243
"cacheVariables": {
244244
"CMAKE_BUILD_TYPE": {
245245
"type": "STRING",
246-
"value": "Release"
246+
"value": "$env{CONFIG}"
247247
},
248248

249249
"ENABLE_LTO": false,
@@ -291,15 +291,15 @@
291291
}
292292
},
293293
{
294-
"name": "npuCidReleaseWindows",
295-
"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.",
296-
"binaryDir": "${sourceDir}/build-x86_64/Release",
297-
"displayName": "npuCidRelease",
294+
"name": "npuCidWindows",
295+
"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.",
296+
"binaryDir": "${sourceDir}/build_$env{CONFIG}",
297+
"displayName": "npuCid",
298298
"inherits": ["cid", "BuildOptimization", "Disabler"],
299299
"cacheVariables": {
300300
"CMAKE_BUILD_TYPE": {
301301
"type": "STRING",
302-
"value": "Release"
302+
"value": "$env{CONFIG}"
303303
},
304304
"CMAKE_TOOLCHAIN_FILE":"${sourceDir}\\cmake\\toolchains\\onecoreuap.toolchain.cmake",
305305
"ENABLE_LTO": false,
@@ -392,22 +392,6 @@
392392
"VPUX_PLUGIN_HOME": "${sourceDir}"
393393
}
394394
},
395-
{
396-
"name": "Simulator",
397-
"hidden": true,
398-
"environment": {
399-
"IE_NPU_USE_IMD_BACKEND": "1",
400-
"IE_NPU_IMD_LAUNCH_MODE": "VPUX_IMD_SIMULATOR"
401-
}
402-
},
403-
{
404-
"name": "Silicon",
405-
"hidden": true,
406-
"environment": {
407-
"IE_NPU_USE_IMD_BACKEND": "1",
408-
"IE_NPU_IMD_LAUNCH_MODE": "VPUX_IMD_MOVI_DEBUG"
409-
}
410-
},
411395
{
412396
"name": "NPU3720/Simulator",
413397
"hidden": true,

cmake/cross_compilation.cmake

Lines changed: 0 additions & 152 deletions
This file was deleted.

cmake/dependencies.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ cmake_policy(SET CMP0054 NEW)
88
include(ExternalProject)
99

1010
if(NOT BUILD_SHARED_LIBS)
11-
set(TEMP "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/temp")
11+
set(TEMP "${PROJECT_SOURCE_DIR}/temp")
1212
else()
13-
ov_set_temp_directory(TEMP "${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}")
13+
ov_set_temp_directory(TEMP "${PROJECT_SOURCE_DIR}")
1414
endif()
1515

1616
# FIXME: Create empty file to avoid errors on CI

cmake/embed_bin_file.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#
2-
# Copyright (C) 2022-2025 Intel Corporation.
2+
# Copyright (C) 2025 Intel Corporation.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

6-
76
function(vpux_embed_bin_file)
87
set(options)
98
set(oneValueArgs SOURCE_FILE HEADER_FILE VARIABLE_NAME)

cmake/features.cmake

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ov_dependent_option(ENABLE_NPU_FUZZ_TESTS "NPU Fuzz tests" OFF "ENABLE_TESTS" OF
2020
if(NOT ENABLE_LTO)
2121
set(ENABLE_LTO OFF)
2222
endif()
23-
ov_dependent_option(ENABLE_LTO "Enable Link Time Optimization" ${ENABLE_LTO} "LINUX OR WIN32;NOT CMAKE_CROSSCOMPILING" OFF)
23+
ov_dependent_option(ENABLE_LTO "Enable Link Time Optimization" ${ENABLE_LTO} "LINUX OR WIN32" OFF)
2424

2525
if(NOT ENABLE_FASTER_BUILD)
2626
set(ENABLE_FASTER_BUILD OFF)
@@ -56,12 +56,8 @@ if(ENABLE_PRIVATE_COMPILER_OPTIONS)
5656
add_definitions(-DPRIVATE_COMPILER_OPTIONS_ENABLED)
5757
endif()
5858

59-
if(NOT DEFINED MV_TOOLS_PATH AND DEFINED ENV{MV_TOOLS_DIR} AND DEFINED ENV{MV_TOOLS_VERSION})
60-
set(MV_TOOLS_PATH $ENV{MV_TOOLS_DIR}/$ENV{MV_TOOLS_VERSION})
61-
endif()
62-
6359
ov_option(ENABLE_NPU_LOADER "Enable npu-loader" OFF)
64-
ov_option(ENABLE_NPU_LSP_SERVER "Enable npu-lsp-server" ON)
60+
ov_option(ENABLE_NPU_LSP_SERVER "Enable npu-lsp-server" OFF)
6561

6662
get_target_property(ov_linked_libs openvino::runtime IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE)
6763
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)
8783
if(ENABLE_VPUX_DOCS)
8884
find_package(Doxygen)
8985
if(DOXYGEN_FOUND)
90-
set(DOXYGEN_IN ${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/docs/VPUX_DG/Doxyfile.in)
91-
set(DOXYGEN_OUT ${IE_MAIN_VPUX_PLUGIN_SOURCE_DIR}/docs/VPUX_DG/generated/Doxyfile)
86+
set(DOXYGEN_IN ${PROJECT_SOURCE_DIR}/docs/VPUX_DG/Doxyfile.in)
87+
set(DOXYGEN_OUT ${PROJECT_SOURCE_DIR}/docs/VPUX_DG/generated/Doxyfile)
9288

9389
configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
9490
message("Doxygen build started")

0 commit comments

Comments
 (0)