NPU Driver drop 1.2.0 release unified 2024WW8 (#23)

* Bumped level-zero to 1.16.1 * Fix building with external level-zero * Now level-zero can work with any Level Zero API * Compiler drop from mtl_npu_ud_2024_08_rc3 * Firmware drop from ci_tag_ud202408_vpu_rc_20240221_2101 * NPU test drop 1.2.0 release unified 2024WW8 Signed-off-by: Jakub Pawlak <[email protected]> Signed-off-by: Schulfer, Magdalena <[email protected]> Signed-off-by: Wludzik, Jozef <[email protected]> Signed-off-by: Krystian Pradzynski <[email protected]> Signed-off-by: Mateusz Tabaka <[email protected]>
intel · Mar 22, 2024 · 9d1dd3d · 9d1dd3d
1 parent 570918d
commit 9d1dd3d
Show file tree

Hide file tree

Showing 149 changed files with 6,043 additions and 3,159 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,29 +1,27 @@
 #
-# Copyright (C) 2022-2023 Intel Corporation
+# Copyright (C) 2022-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
-project(vpu-drv VERSION 1.1.0)
 
-if(NOT CMAKE_BUILD_TYPE)
-  message(STATUS "CMAKE_BUILD_TYPE not specified, using Release")
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type: [Release, Debug]" FORCE)
-endif()
+set(STACK_VERSION 1.2.0 CACHE STRING "Main project version")
+project(npu-linux-driver VERSION ${STACK_VERSION})
 
-string(TOLOWER ${CMAKE_BUILD_TYPE} BUILD_TYPE_LOWER)
-if (NOT ${BUILD_TYPE_LOWER} STREQUAL "debug" AND
-    NOT ${BUILD_TYPE_LOWER} STREQUAL "release")
-  message(FATAL_ERROR "Not supported CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}. "
-                      "Supported types: [Release, Debug]")
+set(BUILD_NUMBER "dev-0" CACHE STRING "Build number composed of name and unique number used as driver version")
+set(BUILD_VERSION ${PROJECT_NAME}-dev-${PROJECT_VERSION}.${BUILD_NUMBER} CACHE STRING "Build version")
+
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Supported build types: Release, Debug" FORCE)
 endif()
+string(TOLOWER ${CMAKE_BUILD_TYPE} BUILD_TYPE_LOWER)
 
-message(STATUS "Using CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
+message(STATUS "PROJECT_VERSION = ${PROJECT_VERSION}")
+message(STATUS "BUILD_NUMBER = ${BUILD_NUMBER}")
+message(STATUS "BUILD_VERSION = ${BUILD_VERSION}")
+message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
 
-if (NOT VPU_VERSION)
-  set(VPU_VERSION "dev-0")
-endif()
 configure_file(version.h.in ${CMAKE_BINARY_DIR}/include/version.h)
 include_directories(SYSTEM ${CMAKE_BINARY_DIR}/include)
 
@@ -32,13 +30,14 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+include(cmake/detect_linux_system.cmake)
+
 option(ENABLE_OPENVINO_PACKAGE "Enable building the OpenVINO + VPUX Plugin package" OFF)
 option(ENABLE_VPUX_COMPILER_BUILD "Enable building compiler in driver" OFF)
 
 message(STATUS "option ENABLE_OPENVINO_PACKAGE: ${ENABLE_OPENVINO_PACKAGE}")
 message(STATUS "option ENABLE_VPUX_COMPILER_BUILD: ${ENABLE_VPUX_COMPILER_BUILD}")
 
-
 include(cmake/sanitizer.cmake)
 
 # Add Intel CET flags for Indirect Branch Tracking and Shadow call-stack technologies.
@@ -50,7 +49,6 @@ add_subdirectory(third_party)
 add_subdirectory(umd)
 add_subdirectory(validation)
 
-include(cmake/detect_linux_system.cmake)
 include(cmake/packages.cmake)
 
 # You may your custom commands in .local.cmake, i.e. driver compilation, running tests.

diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -21,14 +21,17 @@ set(CPACK_GENERATOR DEB)
 set(CPACK_PACKAGE_NAME "intel")
 set(CPACK_PACKAGE_VENDOR "Intel")
 set(CPACK_PACKAGE_CONTACT "Intel Corporation")
-set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}.${VPU_VERSION})
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}.${BUILD_NUMBER})
 
 # Create package per component
 set(CPACK_DEB_COMPONENT_INSTALL ON)
 
 # Enable detection of component dependencies
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+list(APPEND SHLIBDEPS_PRIVATE_DIRS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+list(APPEND SHLIBDEPS_PRIVATE_DIRS ${CMAKE_BINARY_DIR}/_deps/openvino-src/runtime/lib/intel64/)
+list(APPEND SHLIBDEPS_PRIVATE_DIRS ${CMAKE_BINARY_DIR}/_deps/openvino-src/opencv/lib/)
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS ${SHLIBDEPS_PRIVATE_DIRS})
 
 # Component dependencies
 set(CPACK_DEBIAN_VALIDATION-NPU_PACKAGE_DEPENDS "level-zero (>=1.10.0) | intel-level-zero")
@@ -64,4 +67,15 @@ Library implements Level Zero API to interract with NPU hardware.")
 set(CPACK_COMPONENT_VALIDATION-NPU_DESCRIPTION "Intel(R) Validation applications for NPU\n\
 Set of application required for testing of Intel(R) Level Zero Driver for NPU hardware.")
 
+set(CPACK_DEBIAN_DEBUGINFO_PACKAGE OFF)
+if(${BUILD_TYPE_LOWER} STREQUAL "release")
+  set(CPACK_DEBIAN_DEBUGINFO_PACKAGE ON)
+
+  if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    FILE(WRITE "${CMAKE_BINARY_DIR}/post_package.cmake" "execute_process(COMMAND sh -c \"cp -r ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/intel-${CPACK_PACKAGE_VERSION}-Linux/level-zero-npu-dbgsym/usr/lib ${CMAKE_INSTALL_PREFIX}/\") \n")
+    FILE(APPEND "${CMAKE_BINARY_DIR}/post_package.cmake" "execute_process(COMMAND sh -c \"cp -r ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/intel-${CPACK_PACKAGE_VERSION}-Linux/level-zero-npu/usr/lib ${CMAKE_INSTALL_PREFIX}/\") \n")
+    LIST(APPEND CPACK_POST_BUILD_SCRIPTS "${CMAKE_BINARY_DIR}/post_package.cmake")
+  endif()
+endif()
+
 include(CPack)
diff --git a/compiler/compiler_source.cmake b/compiler/compiler_source.cmake
@@ -17,9 +17,9 @@ endif()
 include(ExternalProject)
 
 # OpenVINO + VPUX Plugin package options
-set(OPENVINO_REVISION 2023.0.2)
-set(VPUX_PLUGIN_REVISION cb47a12c7119238071e170e60154720657baa487)
-set(VPUX_PLUGIN_RELEASE 23ww42_snapshot)
+set(OPENVINO_REVISION 7e18bd074a2487a7a98adcd313abd09c58d88072)
+set(VPUX_PLUGIN_REVISION 1ba8c49601c1091b15ceb1ac758eeb99e58e7a8a)
+set(VPUX_PLUGIN_RELEASE mtl_npu_ud_2024_08_rc3)
 
 # Directories
 set(OPENVINO_PREFIX_DIR "${CMAKE_BINARY_DIR}/third_party/openvino")

diff --git a/compiler/include/vpux_driver_compiler.h b/compiler/include/vpux_driver_compiler.h
@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 #define VCL_COMPILER_VERSION_MAJOR 5
-#define VCL_COMPILER_VERSION_MINOR 0
+#define VCL_COMPILER_VERSION_MINOR 2
 #define VCL_PROFILING_VERSION_MAJOR 2
 #define VCL_PROFILING_VERSION_MINOR 0
 

diff --git a/compiler/openvino_modules/gflags-config.cmake b/compiler/openvino_modules/gflags-config.cmake
@@ -0,0 +1,13 @@
+# Copyright 2022-2023 Intel Corporation.
+#
+# This software and the related documents are Intel copyrighted materials, and
+# your use of them is governed by the express license under which they were
+# provided to you ("License"). Unless the License provides otherwise, you may
+# not use, modify, copy, publish, distribute, disclose or transmit this
+# software or the related documents without Intel's prior written permission.
+#
+# This software and the related documents are provided as is, with no express
+# or implied warranties, other than those that are expressly stated in
+# the License.
+
+message(WARNING "Ignoring system gflags")
diff --git a/compiler/openvino_package.cmake b/compiler/openvino_package.cmake
@@ -22,118 +22,128 @@ else()
   set(TARGET_DISTRO ${CMAKE_SYSTEM_NAME})
 endif()
 
-set(OPENCV_PREFIX_DIR "${CMAKE_BINARY_DIR}/third_party/opencv")
-set(OPENCV_SOURCE_DIR "${OPENCV_PREFIX_DIR}/src/opencv")
-file(MAKE_DIRECTORY ${OPENCV_SOURCE_DIR})
-
-set(OPENCV_BINARY_DIR "${OPENCV_PREFIX_DIR}/build")
-file(MAKE_DIRECTORY ${OPENCV_BINARY_DIR})
+set(OPENVINO_PACKAGE_NAME "openvino-vpu-drv-${TARGET_DISTRO}-${VPUX_PLUGIN_RELEASE}-${BUILD_NUMBER}")
+set(OPENVINO_PACKAGE_DIR "${CMAKE_BINARY_DIR}/third_party/openvino_package")
+file(MAKE_DIRECTORY ${OPENVINO_PACKAGE_DIR})
 
-set(OPENVINO_PACKAGE_NAME "openvino-vpu-drv-${TARGET_DISTRO}-${VPUX_PLUGIN_RELEASE}-${VPU_VERSION}")
+list(APPEND COMMON_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE})
+list(APPEND COMMON_CMAKE_ARGS -DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM})
 
+### OpenVINO ###
 set(OPENVINO_BINARY_DIR "${OPENVINO_PREFIX_DIR}/build")
 file(MAKE_DIRECTORY ${OPENVINO_BINARY_DIR})
 
-set(OPENVINO_PACKAGE_DIR "${CMAKE_BINARY_DIR}/third_party/openvino_package")
-file(MAKE_DIRECTORY ${OPENVINO_PACKAGE_DIR})
-
-set(SAMPLES_APPS_PACKAGE_DIR "${OPENVINO_PACKAGE_DIR}/tools/deployment_tools/inference_engine/bin")
-file(MAKE_DIRECTORY ${SAMPLES_APPS_PACKAGE_DIR})
+ExternalProject_Add(
+  openvino_build
+  DOWNLOAD_COMMAND ""
+  DEPENDS vpux_plugin_source openvino_source
+  PREFIX ${OPENVINO_PREFIX_DIR}
+  SOURCE_DIR ${OPENVINO_SOURCE_DIR}
+  BINARY_DIR ${OPENVINO_BINARY_DIR}
+  INSTALL_DIR ${OPENVINO_PACKAGE_DIR}
+  CMAKE_ARGS
+    ${COMMON_CMAKE_ARGS}
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX=${OPENVINO_PACKAGE_DIR})
 
-set(OPENVINO_BINARY_RELEASE_DIR "${OPENVINO_SOURCE_DIR}/bin/intel64/Release")
+### OpenCV ###
+set(OPENCV_PREFIX_DIR "${CMAKE_BINARY_DIR}/third_party/opencv")
+set(OPENCV_SOURCE_DIR "${OPENCV_PREFIX_DIR}/src/opencv")
+file(MAKE_DIRECTORY ${OPENCV_SOURCE_DIR})
 
-### OpenVINO flags
-list(APPEND OPENVINO_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release)
-list(APPEND OPENVINO_CMAKE_FLAGS -DCMAKE_INSTALL_PREFIX=${OPENVINO_PACKAGE_DIR})
-# To set BUILD_SHARED_LIBS to OFF the cmake 3.18 is required
-list(APPEND OPENVINO_CMAKE_FLAGS -DBUILD_SHARED_LIBS=ON)
-# OpenVINO Plugins
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_INTEL_CPU=ON)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_INTEL_GPU=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_INTEL_GNA=ON)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_HETERO=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_MULTI=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_AUTO=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_TEMPLATE=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_AUTO_BATCH=OFF)
-# OpenVINO Frontends
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_OV_IR_FRONTEND=ON)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_OV_TF_FRONTEND=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_OV_TF_LITE_FRONTEND=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_OV_ONNX_FRONTEND=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_OV_PADDLE_FRONTEND=OFF)
-# OpenVINO Other
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_PLUGINS_XML=ON)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_IR_V7_READER=ON)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_SAMPLES=ON)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_PYTHON=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_WHEEL=OFF)
-list(APPEND OPENVINO_CMAKE_FLAGS -DTHREADING=TBB)
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_TBBBIND_2_5=OFF)
-# OpenCV is required by single-image-test in vpux-plugin
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_OPENCV=ON)
-
-### VPUX plugin flags
-list(APPEND OPENVINO_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Release)
-list(APPEND OPENVINO_CMAKE_FLAGS -DIE_EXTRA_MODULES=${VPUX_PLUGIN_SOURCE_DIR})
-# MLIR can be used in compile_tool
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_MLIR_COMPILER=ON)
-# Enable using CiD from VPUX plugin
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_DRIVER_COMPILER_ADAPTER=ON)
-# Do not build CiD, the CiD is comes with driver
-list(APPEND OPENVINO_CMAKE_FLAGS -DBUILD_COMPILER_FOR_DRIVER=OFF)
-# To build CiD, ENABLE_TESTS has to be set to ON
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_TESTS=OFF)
-# Below flags add logs that can be enabled using "export IE_VPUX_LOG_LEVEL=LOG_INFO"
-list(APPEND OPENVINO_CMAKE_FLAGS -DENABLE_DEVELOPER_BUILD=OFF)
-
-# TODO: Temporary WA for building LLVM from plugin source
-list(APPEND OPENVINO_CMAKE_FLAGS -DLLVM_ENABLE_ZLIB=OFF)
-# TODO: Disable AVX512F instruction for MTL to exclude unsupported instructions
-list(APPEND OPENVINO_CMAKE_FLAGS -DCMAKE_CXX_FLAGS_INIT="-mno-avx512f")
-
-list(APPEND OPENVINO_CMAKE_FLAGS -DOpenCV_DIR=${OPENCV_BINARY_DIR})
+set(OPENCV_BINARY_DIR "${OPENCV_PREFIX_DIR}/build")
+file(MAKE_DIRECTORY ${OPENCV_BINARY_DIR})
 
 ExternalProject_Add(
   opencv_build
   GIT_REPOSITORY https://github.com/opencv/opencv.git
-  GIT_TAG 4.8.0
+  GIT_TAG 8e43c8f200b1b785df7f265dfa79ee97278977f0
+  DEPENDS openvino_build
   PREFIX ${OPENCV_PREFIX_DIR}
   SOURCE_DIR ${OPENCV_SOURCE_DIR}
   BINARY_DIR ${OPENCV_BINARY_DIR}
   INSTALL_DIR ${OPENVINO_PACKAGE_DIR}/opencv
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${OPENVINO_PACKAGE_DIR}/opencv
-             -DOPENCV_GENERATE_SETUPVARS=ON)
+  CMAKE_ARGS
+    ${COMMON_CMAKE_ARGS}
+    -DCMAKE_INSTALL_PREFIX=${OPENVINO_PACKAGE_DIR}/opencv
+    -DCMAKE_PREFIX_PATH=${OPENVINO_BINARY_DIR}
+    -DOPENCV_GENERATE_SETUPVARS=ON
+    -DWITH_OPENVINO=ON)
+
+### VPUX plugin ###
+set(VPUX_PLUGIN_BINARY_DIR ${VPUX_PLUGIN_PREFIX_DIR}/build)
+file(MAKE_DIRECTORY ${VPUX_PLUGIN_BINARY_DIR})
 
 ExternalProject_Add(
-  openvino_vpux_plugin_build
+  vpux_plugin_build
   DOWNLOAD_COMMAND ""
-  DEPENDS vpux_plugin_source openvino_source opencv_build
-  PREFIX ${OPENVINO_PREFIX_DIR}
-  SOURCE_DIR ${OPENVINO_SOURCE_DIR}
-  BINARY_DIR ${OPENVINO_BINARY_DIR}
+  DEPENDS openvino_build opencv_build
+  PREFIX ${VPUX_PLUGIN_PREFIX_DIR}
+  SOURCE_DIR ${VPUX_PLUGIN_SOURCE_DIR}
+  BINARY_DIR ${VPUX_PLUGIN_BINARY_DIR}
   INSTALL_DIR ${OPENVINO_PACKAGE_DIR}
-  CMAKE_ARGS ${OPENVINO_CMAKE_FLAGS})
+  CMAKE_ARGS
+    ${COMMON_CMAKE_ARGS}
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX=${OPENVINO_PACKAGE_DIR}
+    -DOpenCV_DIR=${OPENCV_BINARY_DIR}
+    -DInferenceEngineDeveloperPackage_DIR=${OPENVINO_BINARY_DIR})
+
+### Sample applications from OpenVINO (benchmark_app ...) ###
+set(SAMPLES_APPS_BUILD_DIR ${OPENVINO_PREFIX_DIR}/build-samples)
+file(MAKE_DIRECTORY ${SAMPLES_APPS_BUILD_DIR})
+
+set(SAMPLES_APPS_PACKAGE_DIR "${OPENVINO_PACKAGE_DIR}/tools/deployment_tools/inference_engine/bin")
+file(MAKE_DIRECTORY ${SAMPLES_APPS_PACKAGE_DIR})
+
+ExternalProject_Add(
+  sample_apps_build
+  DOWNLOAD_COMMAND ""
+  DEPENDS openvino_build opencv_build
+  PREFIX ${OPENVINO_PREFIX_DIR}
+  SOURCE_DIR ${OPENVINO_SOURCE_DIR}/samples/cpp
+  BINARY_DIR ${SAMPLES_APPS_BUILD_DIR}
+  INSTALL_DIR ${SAMPLES_APPS_BUILD_DIR}
+  CMAKE_ARGS
+    ${COMMON_CMAKE_ARGS}
+    -DCMAKE_INSTALL_PREFIX=${SAMPLES_APPS_PACKAGE_DIR}
+    -DCMAKE_PREFIX_PATH=${OPENVINO_BINARY_DIR}
+    -DOpenCV_DIR=${OPENCV_BINARY_DIR})
+
+### OV+VPUX plugin package ###
+set(COMPILE_TOOL_PACKAGE_DIR "${OPENVINO_PACKAGE_DIR}/tools/compile_tool")
+file(MAKE_DIRECTORY ${COMPILE_TOOL_PACKAGE_DIR})
+
+set(OPENVINO_BINARY_RELEASE_DIR "${OPENVINO_SOURCE_DIR}/bin/intel64/Release")
 
 add_custom_target(
   openvino_package ALL
   COMMAND
     cp -d ${OPENCV_BINARY_DIR}/setup_vars.sh ${OPENVINO_PACKAGE_DIR}/opencv/setupvars.sh &&
-    cp -d ${OPENVINO_BINARY_RELEASE_DIR}/benchmark_app ${SAMPLES_APPS_PACKAGE_DIR}/ &&
-    cp -d ${OPENVINO_BINARY_RELEASE_DIR}/classification_sample_async ${SAMPLES_APPS_PACKAGE_DIR}/ &&
-    cp -d ${OPENVINO_BINARY_RELEASE_DIR}/hello_classification ${SAMPLES_APPS_PACKAGE_DIR}/ &&
-    cp -d ${OPENVINO_BINARY_RELEASE_DIR}/hello_query_device ${SAMPLES_APPS_PACKAGE_DIR}/ &&
+    cp -d ${SAMPLES_APPS_BUILD_DIR}/intel64/benchmark_app ${SAMPLES_APPS_PACKAGE_DIR}/ &&
+    cp -d ${SAMPLES_APPS_BUILD_DIR}/intel64/classification_sample_async ${SAMPLES_APPS_PACKAGE_DIR}/ &&
+    cp -d ${SAMPLES_APPS_BUILD_DIR}/intel64/hello_classification ${SAMPLES_APPS_PACKAGE_DIR}/ &&
+    cp -d ${SAMPLES_APPS_BUILD_DIR}/intel64/hello_query_device ${SAMPLES_APPS_PACKAGE_DIR}/ &&
+    cp -d ${OPENVINO_BINARY_RELEASE_DIR}/protopipe ${SAMPLES_APPS_PACKAGE_DIR}/ &&
     cp -d ${OPENVINO_BINARY_RELEASE_DIR}/single-image-test ${SAMPLES_APPS_PACKAGE_DIR}/ &&
+    cp -d ${OPENVINO_BINARY_RELEASE_DIR}/compile_tool ${COMPILE_TOOL_PACKAGE_DIR}/ &&
+    git -C ${OPENCV_SOURCE_DIR} rev-list --max-count=1 HEAD > ${OPENVINO_PACKAGE_DIR}/opencv_sha &&
     git -C ${OPENVINO_SOURCE_DIR} rev-list --max-count=1 HEAD > ${OPENVINO_PACKAGE_DIR}/openvino_sha &&
     git -C ${VPUX_PLUGIN_SOURCE_DIR} rev-list --max-count=1 HEAD > ${OPENVINO_PACKAGE_DIR}/vpux_plugin_sha &&
     echo ${OPENVINO_PACKAGE_NAME} > ${OPENVINO_PACKAGE_DIR}/build_version &&
     echo `git -C ${OPENVINO_SOURCE_DIR} rev-parse HEAD` `git -C ${OPENVINO_SOURCE_DIR} config --local --get remote.origin.url` > ${OPENVINO_PACKAGE_DIR}/manifest.txt &&
     echo `git -C ${VPUX_PLUGIN_SOURCE_DIR} rev-parse HEAD` `git -C ${VPUX_PLUGIN_SOURCE_DIR} config --local --get remote.origin.url` >> ${OPENVINO_PACKAGE_DIR}/manifest.txt &&
     tar -C ${OPENVINO_PACKAGE_DIR} -czf ${CMAKE_BINARY_DIR}/${OPENVINO_PACKAGE_NAME}.tar.gz .
-  DEPENDS openvino_vpux_plugin_build
+  DEPENDS openvino_build opencv_build vpux_plugin_build sample_apps_build
   BYPRODUCTS ${CMAKE_BINARY_DIR}/${OPENVINO_PACKAGE_NAME}.tar.gz)
 
+install(
+  DIRECTORY ${OPENVINO_PACKAGE_DIR}
+  DESTINATION validation/openvino
+  COMPONENT openvino_driver_package)
+
 install(
   FILES ${CMAKE_BINARY_DIR}/${OPENVINO_PACKAGE_NAME}.tar.gz
   DESTINATION .
-  COMPONENT openvino_package)
+  COMPONENT openvino_standalone_package
+  EXCLUDE_FROM_ALL)
diff --git a/compiler/vpux_compiler.cmake b/compiler/vpux_compiler.cmake
@@ -11,19 +11,19 @@
 
 add_library(vpux_compiler INTERFACE)
 
-if(ENABLE_VPUX_COMPILER_CACHE OR ENABLE_VPUX_COMPILER_BUILD)
+if(ENABLE_VPUX_COMPILER_BUILD)
   if(ENABLE_VPUX_COMPILER_BUILD)
     include(vpux_compiler_build.cmake)
   endif()
 
   add_dependencies(vpux_compiler ${VPUX_COMPILER_DEPENDENCY})
-  install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libvpux_driver_compiler.so
+  install(FILES ${VPUX_COMPILER_LIBS}
           TYPE LIB
           COMPONENT driver-compiler-npu)
 elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/)
   set(VPUX_COMPILER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 else()
-  message(FATAL_ERROR "Missing compiler headers in path ${CMAKE_CURRENT_SOURCE_DIR}/include/")
+  message(FATAL_ERROR "Missing VPUXCompilerL0 headers in path ${CMAKE_CURRENT_SOURCE_DIR}/include/")
 endif()
 
 target_include_directories(vpux_compiler INTERFACE ${VPUX_COMPILER_INCLUDE_DIR})