1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
From a8b6a2e251c42a393218174c6737208760d2e1c1 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Wed, 10 Jun 2020 09:43:55 +0800
Subject: [PATCH] inference-engine: use system installed packages
Use installed versions of ade, protobuf and tbb.
Upstream-Status: Pending
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
cmake/dependencies.cmake | 18 ------------------
inference-engine/CMakeLists.txt | 2 +-
inference-engine/cmake/ie_parallel.cmake | 7 +------
.../src/inference_engine/CMakeLists.txt | 19 -------------------
.../common_test_utils/CMakeLists.txt | 4 +---
.../unit_test_utils/CMakeLists.txt | 3 +--
inference-engine/thirdparty/CMakeLists.txt | 5 ++---
7 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 6a44c8769e..a128eb63a1 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -13,25 +13,7 @@ if(CMAKE_CROSSCOMPILING AND NGRAPH_ONNX_IMPORT_ENABLE)
set(protoc_version "3.7.1")
if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux)
- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64")
- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
else()
message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation")
endif()
-
- reset_deps_cache(SYSTEM_PROTOC)
-
- message("${SYSTEM_PROTOC_ROOT}/bin")
- find_program(
- SYSTEM_PROTOC
- NAMES protoc
- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
- NO_DEFAULT_PATH)
- if(NOT SYSTEM_PROTOC)
- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
- endif()
-
- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
endif()
diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
index a3e4f74c40..76b09683dd 100644
--- a/inference-engine/CMakeLists.txt
+++ b/inference-engine/CMakeLists.txt
@@ -56,7 +56,7 @@ function(ie_developer_export)
APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
# Custom target to build only Inference Engine Developer Package targets
- add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags
+ add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets}
inference_engine_ir_reader inference_engine_ir_v7_reader)
endfunction()
diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
index f8988aa105..28e79417f4 100644
--- a/inference-engine/cmake/ie_parallel.cmake
+++ b/inference-engine/cmake/ie_parallel.cmake
@@ -67,13 +67,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
- if (TBB_FOUND)
set(IE_THREAD_DEFINE "IE_THREAD_TBB")
- ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS})
- else ()
- ext_message(WARNING "TBB was not found by the configured TBB_DIR path.\
- SEQ method will be used for ${TARGET_NAME}")
- endif ()
+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
elseif (THREADING STREQUAL "OMP")
if (WIN32)
set(omp_lib_name libiomp5md)
diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
index f012a038a2..3bba22215e 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
+++ b/inference-engine/src/inference_engine/CMakeLists.txt
@@ -216,25 +216,6 @@ list(APPEND core_components ngraph)
if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
ie_cpack_add_component(tbb REQUIRED)
list(APPEND core_components tbb)
-
- install(DIRECTORY "${TBB}/include"
- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
- COMPONENT tbb)
- install(DIRECTORY "${TBB}/lib"
- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
- COMPONENT tbb)
- if(EXISTS "${TBB}/bin")
- install(DIRECTORY "${TBB}/bin"
- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
- COMPONENT tbb)
- endif()
- install(FILES "${TBB}/LICENSE"
- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
- COMPONENT tbb)
- install(FILES "${TBB}/cmake/TBBConfig.cmake"
- "${TBB}/cmake/TBBConfigVersion.cmake"
- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
- COMPONENT tbb)
endif()
ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
index ca58264bd5..11df150845 100644
--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
@@ -26,7 +26,7 @@ function(add_gtest_libraries)
PROPERTIES FOLDER thirdparty)
endfunction()
-add_gtest_libraries()
+#add_gtest_libraries()
if (MSVC)
set(PUGI pugixml_mt)
@@ -37,8 +37,6 @@ endif ()
list(APPEND EXPORT_DEPENDENCIES
${PUGI}
${NGRAPH_LIBRARIES}
- gtest
- gtest_main
)
set(TARGET_NAME commonTestUtils)
diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
index 5413d13895..3f2803750f 100644
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
list(APPEND EXPORT_DEPENDENCIES
commonTestUtils_s
- inference_engine_s
- gmock)
+ inference_engine_s)
addIeTarget(
NAME ${TARGET_NAME}
diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
index fa2a4d02d8..67d3b7ad05 100644
--- a/inference-engine/thirdparty/CMakeLists.txt
+++ b/inference-engine/thirdparty/CMakeLists.txt
@@ -62,14 +62,13 @@ else()
endif()
add_subdirectory(stb_lib)
-add_subdirectory(ade)
add_subdirectory(fluid/modules/gapi)
-set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty)
+set_target_properties(fluid stb_image PROPERTIES FOLDER thirdparty)
# developer package
-ie_developer_export_targets(ade fluid)
+ie_developer_export_targets(fluid)
if (NOT USE_SYSTEM_PUGIXML)
set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
--
2.29.2
|
