diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch | 236 |
1 files changed, 236 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch new file mode 100644 index 00000000..38de10f4 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch | |||
@@ -0,0 +1,236 @@ | |||
1 | From 3d7373487eacf4e3283183bbc9a771cb4b97c7ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Erin Park <erin.park@intel.com> | ||
3 | Date: Wed, 11 Sep 2019 09:04:23 -0700 | ||
4 | Subject: [PATCH] R2 Build fixes | ||
5 | |||
6 | -linux os-release name search | ||
7 | -Use system libraries for (OMP/TBB) | ||
8 | -Use system libraries for ngraph, ade, puigxml, gflags | ||
9 | -Turn on ENABLE_PYTHON | ||
10 | |||
11 | Upstream-Status: Pending [Taken from Clear Linux] | ||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | --- | ||
14 | inference-engine/CMakeLists.txt | 4 +++ | ||
15 | inference-engine/cmake/dependencies.cmake | 32 +++++++++++-------- | ||
16 | .../cmake/developer_package.cmake | 12 +++---- | ||
17 | inference-engine/cmake/ie_parallel.cmake | 10 +++--- | ||
18 | inference-engine/cmake/linux_name.cmake | 2 +- | ||
19 | inference-engine/samples/CMakeLists.txt | 2 -- | ||
20 | .../src/inference_engine/CMakeLists.txt | 5 +-- | ||
21 | inference-engine/thirdparty/CMakeLists.txt | 7 ---- | ||
22 | 8 files changed, 38 insertions(+), 36 deletions(-) | ||
23 | |||
24 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | ||
25 | index 0d449c9..5ee8f53 100644 | ||
26 | --- a/inference-engine/CMakeLists.txt | ||
27 | +++ b/inference-engine/CMakeLists.txt | ||
28 | @@ -59,6 +59,10 @@ add_cpplint_target(sample_cpplint | ||
29 | EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*") | ||
30 | |||
31 | if (ENABLE_PYTHON) | ||
32 | + set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | ||
33 | + | ||
34 | + #to be able to link | ||
35 | + set (LIB_FOLDER ${IE_MAIN_SOURCE_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib) | ||
36 | add_subdirectory(ie_bridges/python) | ||
37 | endif() | ||
38 | |||
39 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake | ||
40 | index 00a5b8e..d493426 100644 | ||
41 | --- a/inference-engine/cmake/dependencies.cmake | ||
42 | +++ b/inference-engine/cmake/dependencies.cmake | ||
43 | @@ -71,11 +71,11 @@ if (WIN32) | ||
44 | ENVIRONMENT "OMP" | ||
45 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | ||
46 | elseif(LINUX) | ||
47 | - RESOLVE_DEPENDENCY(OMP | ||
48 | - ARCHIVE_LIN "iomp.tgz" | ||
49 | - TARGET_PATH "${TEMP}/omp" | ||
50 | - ENVIRONMENT "OMP" | ||
51 | - VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | ||
52 | +# RESOLVE_DEPENDENCY(OMP | ||
53 | +# ARCHIVE_LIN "iomp.tgz" | ||
54 | +# TARGET_PATH "${TEMP}/omp" | ||
55 | +# ENVIRONMENT "OMP" | ||
56 | +# VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | ||
57 | else(APPLE) | ||
58 | RESOLVE_DEPENDENCY(OMP | ||
59 | ARCHIVE_MAC "iomp_20190130_mac.tgz" | ||
60 | @@ -83,8 +83,11 @@ else(APPLE) | ||
61 | ENVIRONMENT "OMP" | ||
62 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | ||
63 | endif() | ||
64 | -log_rpath_from_dir(OMP "${OMP}/lib") | ||
65 | -debug_message(STATUS "intel_omp=" ${OMP}) | ||
66 | + | ||
67 | +if (OMP) | ||
68 | + log_rpath_from_dir(OMP "${OMP}/lib") | ||
69 | + debug_message(STATUS "intel_omp=" ${OMP}) | ||
70 | +endif () | ||
71 | endif () | ||
72 | |||
73 | ## TBB package | ||
74 | @@ -97,10 +100,10 @@ if (WIN32) | ||
75 | ENVIRONMENT "TBBROOT" | ||
76 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | ||
77 | elseif(LINUX) | ||
78 | - RESOLVE_DEPENDENCY(TBB | ||
79 | - ARCHIVE_LIN "tbb2019_20181010_lin.tgz" | ||
80 | - TARGET_PATH "${TEMP}/tbb" | ||
81 | - ENVIRONMENT "TBBROOT") | ||
82 | +# RESOLVE_DEPENDENCY(TBB | ||
83 | +# ARCHIVE_LIN "tbb2019_20181010_lin.tgz" | ||
84 | +# TARGET_PATH "${TEMP}/tbb" | ||
85 | +# ENVIRONMENT "TBBROOT") | ||
86 | else(APPLE) | ||
87 | RESOLVE_DEPENDENCY(TBB | ||
88 | ARCHIVE_MAC "tbb2019_20190414_mac.tgz" | ||
89 | @@ -108,8 +111,11 @@ else(APPLE) | ||
90 | ENVIRONMENT "TBBROOT" | ||
91 | VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") | ||
92 | endif() | ||
93 | -log_rpath_from_dir(TBB "${TBB}/lib") | ||
94 | -debug_message(STATUS "tbb=" ${TBB}) | ||
95 | + | ||
96 | +if (TBB) | ||
97 | + log_rpath_from_dir(TBB "${TBB}/lib") | ||
98 | + debug_message(STATUS "tbb=" ${TBB}) | ||
99 | +endif () | ||
100 | endif () | ||
101 | |||
102 | if (ENABLE_OPENCV) | ||
103 | diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake | ||
104 | index 52e0fef..06ba167 100644 | ||
105 | --- a/inference-engine/cmake/developer_package.cmake | ||
106 | +++ b/inference-engine/cmake/developer_package.cmake | ||
107 | @@ -95,12 +95,12 @@ if(NOT UNIX) | ||
108 | set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) | ||
109 | set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY | ||
110 | else() | ||
111 | - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | ||
112 | - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | ||
113 | - set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | ||
114 | - set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | ||
115 | - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | ||
116 | - set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | ||
117 | + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | ||
118 | + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | ||
119 | + set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | ||
120 | + set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | ||
121 | + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) | ||
122 | + set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) | ||
123 | set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib) | ||
124 | endif() | ||
125 | |||
126 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | ||
127 | index 8265701..9d4a884 100644 | ||
128 | --- a/inference-engine/cmake/ie_parallel.cmake | ||
129 | +++ b/inference-engine/cmake/ie_parallel.cmake | ||
130 | @@ -22,9 +22,9 @@ function(set_ie_threading_interface_for TARGET_NAME) | ||
131 | endif () | ||
132 | |||
133 | if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE) | ||
134 | - find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH) | ||
135 | - find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH) | ||
136 | - find_library(TBB_LIBRARIES_DEBUG tbb_debug ${lib_dbg_path} NO_DEFAULT_PATH) | ||
137 | + find_path(TBB_INCLUDE_DIRS tbb/tbb.h) | ||
138 | + find_library(TBB_LIBRARIES_RELEASE tbb) | ||
139 | + find_library(TBB_LIBRARIES_DEBUG tbb) | ||
140 | ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}") | ||
141 | ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}") | ||
142 | ext_message(STATUS "TBB Debug lib: ${TBB_LIBRARIES_DEBUG}") | ||
143 | @@ -78,8 +78,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | ||
144 | endif () | ||
145 | |||
146 | if (NOT OMP_LIBRARIES_RELEASE) | ||
147 | - find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH) | ||
148 | - find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH) | ||
149 | + find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name}) | ||
150 | + find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name}) | ||
151 | ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}") | ||
152 | ext_message(STATUS "OMP Debug lib: ${OMP_LIBRARIES_DEBUG}") | ||
153 | endif () | ||
154 | diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake | ||
155 | index 6713808..7e5e47a 100644 | ||
156 | --- a/inference-engine/cmake/linux_name.cmake | ||
157 | +++ b/inference-engine/cmake/linux_name.cmake | ||
158 | @@ -5,7 +5,7 @@ | ||
159 | if (LINUX) | ||
160 | function(get_linux_name res_var) | ||
161 | if (NOT EXISTS "/etc/lsb-release") | ||
162 | - execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \; | ||
163 | + execute_process(COMMAND find /usr/lib/ /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \; | ||
164 | OUTPUT_VARIABLE release_data RESULT_VARIABLE result) | ||
165 | set(name_regex "NAME=\"([^ \"\n]*).*\"\n") | ||
166 | set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"") | ||
167 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | ||
168 | index d354f64..3802624 100644 | ||
169 | --- a/inference-engine/samples/CMakeLists.txt | ||
170 | +++ b/inference-engine/samples/CMakeLists.txt | ||
171 | @@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE) | ||
172 | set (HAVE_SYS_STAT_H 1) | ||
173 | set (HAVE_INTTYPES_H 1) | ||
174 | |||
175 | -add_subdirectory(thirdparty/gflags) | ||
176 | - | ||
177 | if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) | ||
178 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | ||
179 | endif() | ||
180 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
181 | index f3514ed..37a0744 100644 | ||
182 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
183 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
184 | @@ -97,12 +97,13 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} | ||
185 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") | ||
186 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") | ||
187 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv") | ||
188 | +include_directories(${TARGET_NAME} "/usr/include/ngraph") | ||
189 | |||
190 | if(ENABLE_MKL_DNN) | ||
191 | target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak") | ||
192 | endif() | ||
193 | |||
194 | -set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) | ||
195 | +set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} SOVERSION 1) | ||
196 | |||
197 | # Static library used for unit tests which are always built | ||
198 | |||
199 | @@ -132,7 +133,7 @@ if(WIN32) | ||
200 | target_compile_definitions(${TARGET_NAME}_s PRIVATE -DNOMINMAX) | ||
201 | endif() | ||
202 | |||
203 | -set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) | ||
204 | +set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s SOVERSION 1) | ||
205 | |||
206 | target_link_libraries(${TARGET_NAME}_s PRIVATE fluid | ||
207 | PRIVATE ngraph | ||
208 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | ||
209 | index 5a4b259..7208a0f 100644 | ||
210 | --- a/inference-engine/thirdparty/CMakeLists.txt | ||
211 | +++ b/inference-engine/thirdparty/CMakeLists.txt | ||
212 | @@ -7,12 +7,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") | ||
213 | set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed") | ||
214 | endif() | ||
215 | |||
216 | -add_subdirectory(pugixml) | ||
217 | -export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") | ||
218 | -export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | ||
219 | - | ||
220 | add_subdirectory(stb_lib) | ||
221 | -add_subdirectory(ade) | ||
222 | |||
223 | if (ENABLE_CLDNN) | ||
224 | set(CLDNN__OUTPUT_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) | ||
225 | @@ -40,8 +35,6 @@ if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") | ||
226 | add_definitions(-fvisibility=default) | ||
227 | endif() | ||
228 | |||
229 | -include(ngraph.cmake) | ||
230 | - | ||
231 | if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") | ||
232 | remove_definitions(-fvisibility=default) | ||
233 | add_definitions(-fvisibility=hidden) | ||
234 | -- | ||
235 | 2.23.0 | ||
236 | |||