File tree 7 files changed +28
-33
lines changed
7 files changed +28
-33
lines changed Original file line number Diff line number Diff line change 51
51
endif ()
52
52
53
53
ov_dependent_option (ENABLE_INTEL_NPU "NPU plugin for OpenVINO runtime" ${ENABLE_INTEL_NPU_DEFAULT} "X86 OR X86_64;NOT APPLE" OFF )
54
+ ov_dependent_option (ENABLE_INTEL_NPU_INTERNAL "NPU plugin internal components for OpenVINO runtime" ON "ENABLE_INTEL_NPU" OFF )
54
55
55
56
ov_option (ENABLE_DEBUG_CAPS "enable OpenVINO debug capabilities at runtime" OFF )
56
57
ov_dependent_option (ENABLE_NPU_DEBUG_CAPS "enable NPU debug capabilities at runtime" ON "ENABLE_DEBUG_CAPS;ENABLE_INTEL_NPU" OFF )
Original file line number Diff line number Diff line change @@ -30,8 +30,10 @@ add_subdirectory(src)
30
30
31
31
if (ENABLE_TESTS)
32
32
add_subdirectory (tests)
33
- add_subdirectory (tools)
34
33
endif ()
35
34
35
+ if (ENABLE_INTEL_NPU_INTERNAL)
36
+ add_subdirectory (tools)
36
37
37
- ov_cpack_add_component(${NPU_INTERNAL_COMPONENT} HIDDEN)
38
+ ov_cpack_add_component(${NPU_INTERNAL_COMPONENT} HIDDEN)
39
+ endif ()
Original file line number Diff line number Diff line change 5
5
6
6
set (TARGET_NAME "npu_tools_utils" )
7
7
8
- #
9
- # Define the target
10
- #
11
-
12
- ov_add_target(ADD_CPPLINT
13
- TYPE STATIC
14
- NAME ${TARGET_NAME}
15
- ROOT ${CMAKE_CURRENT_SOURCE_DIR}
16
- INCLUDES
17
- PUBLIC
18
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include>"
19
- LINK_LIBRARIES
20
- PRIVATE
21
- openvino::runtime)
8
+ file (GLOB_RECURSE SOURCES "*.cpp" "*.hpp" )
9
+ source_group (TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} )
22
10
11
+ add_library (${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES} )
23
12
set_target_properties (${TARGET_NAME} PROPERTIES
24
13
FOLDER ${CMAKE_CURRENT_SOURCE_DIR}
25
14
CXX_STANDARD 17)
26
15
16
+ target_include_directories (${TARGET_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include>" )
17
+ target_link_libraries (${TARGET_NAME} PUBLIC openvino::runtime)
18
+
27
19
if (CMAKE_COMPILER_IS_GNUCXX)
28
20
target_compile_options (${TARGET_NAME} PRIVATE -Wall)
29
21
endif ()
Original file line number Diff line number Diff line change @@ -30,10 +30,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES
30
30
FOLDER ${CMAKE_CURRENT_SOURCE_DIR}
31
31
CXX_STANDARD 17)
32
32
33
- if (CMAKE_COMPILER_IS_GNUCXX)
34
- target_compile_options (${TARGET_NAME} PRIVATE -Wall)
35
- endif ()
36
-
37
33
# TODO: fix warnings and remove this exception
38
34
if (CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
39
35
ov_add_compiler_flags(-Wno-missing-declarations)
Original file line number Diff line number Diff line change @@ -33,15 +33,15 @@ set(DEPENDENCIES
33
33
openvino::runtime
34
34
)
35
35
36
- if (CMAKE_COMPILER_IS_GNUCXX)
37
- target_compile_options (${TARGET_NAME} PRIVATE -Wall)
38
- endif ()
39
-
40
36
file (GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR} /*.cpp" )
41
37
42
38
add_executable (${TARGET_NAME} ${SOURCES} )
43
39
target_link_libraries (${TARGET_NAME} ${DEPENDENCIES} )
44
40
41
+ if (CMAKE_COMPILER_IS_GNUCXX)
42
+ target_compile_options (${TARGET_NAME} PRIVATE -Wall)
43
+ endif ()
44
+
45
45
install (TARGETS ${TARGET_NAME}
46
46
DESTINATION "tools/${TARGET_NAME} "
47
47
COMPONENT npu_tools)
Original file line number Diff line number Diff line change @@ -41,21 +41,18 @@ ov_add_target(ADD_CPPLINT
41
41
LINK_LIBRARIES
42
42
PRIVATE
43
43
openvino::runtime
44
- TBB::tbb
45
44
opencv_core
46
45
opencv_imgproc
47
46
opencv_imgcodecs
48
47
npu_tools_utils
49
48
gflags)
50
49
50
+ ov_set_threading_interface_for(${TARGET_NAME} )
51
+
51
52
set_target_properties (${TARGET_NAME} PROPERTIES
52
53
FOLDER ${CMAKE_CURRENT_SOURCE_DIR}
53
54
CXX_STANDARD 17)
54
55
55
- if (CMAKE_COMPILER_IS_GNUCXX)
56
- target_compile_options (${TARGET_NAME} PRIVATE -Wall)
57
- endif ()
58
-
59
56
# TODO: fix warnings and remove this exception
60
57
if (CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
61
58
ov_add_compiler_flags(-Wno-missing-declarations)
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ endif()
18
18
19
19
find_package (Threads REQUIRED)
20
20
find_package (OpenVINO REQUIRED COMPONENTS Runtime)
21
- find_package (TBB REQUIRED )
21
+ find_package (TBB QUIET )
22
22
find_package (OpenCV REQUIRED COMPONENTS core imgproc imgcodecs)
23
23
24
24
add_subdirectory ("${CMAKE_CURRENT_SOURCE_DIR} /../common" common EXCLUDE_FROM_ALL )
@@ -37,21 +37,28 @@ set(DEPENDENCIES
37
37
Threads::Threads
38
38
gflags
39
39
openvino::runtime
40
- TBB::tbb
41
40
opencv_core
42
41
opencv_imgproc
43
42
opencv_imgcodecs
44
43
npu_tools_utils
45
44
)
46
45
47
- if (CMAKE_COMPILER_IS_GNUCXX)
48
- target_compile_options (${TARGET_NAME} PRIVATE -Wall)
46
+ if (TBB_FOUND)
47
+ list (APPEND DEPENDENCIES TBB::tbb)
48
+ else ()
49
+ message (WARNING
50
+ "TBB not found. We will try to build SIT without TBB. "
51
+ "If OpenVINO was built with TBB, you'll likely get a linking error. "
52
+ "Make sure you have called setupvars or have specified TBB_DIR." )
49
53
endif ()
50
54
51
55
file (GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR} /*.cpp" )
52
56
53
57
add_executable (${TARGET_NAME} ${SOURCES} )
54
58
target_link_libraries (${TARGET_NAME} PRIVATE ${DEPENDENCIES} )
59
+ if (CMAKE_COMPILER_IS_GNUCXX)
60
+ target_compile_options (${TARGET_NAME} PRIVATE -Wall)
61
+ endif ()
55
62
56
63
install (TARGETS ${TARGET_NAME}
57
64
DESTINATION "tools/${TARGET_NAME} "
You can’t perform that action at this time.
0 commit comments