summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch259
1 files changed, 259 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
new file mode 100644
index 00000000..01b6ade5
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
@@ -0,0 +1,259 @@
1From d751c5330eb512c0deb49d640b50d921b7466f89 Mon Sep 17 00:00:00 2001
2From: Erin Park <erin.park@intel.com>
3Date: Wed, 11 Sep 2019 10:33:58 -0700
4Subject: [PATCH] R2 Install DLDT headers, libs, sample Apps
5
6-Libraries to /usr/lib64
7-Headers to /usr/include
8-Sample Apps executable to /usr/bin
9-Sample Apps source code to /usr/share/doc/inference_engine
10-Python library to /usr/lib/python3.7/site-packages
11-plugins.xml to /usr/share/openvino/inference-engine
12-Create targets_cpu_extension.cmake
13
14Upstream-Status: Pending [Taken from Clear Linux with changes to install
15libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64]
16Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
17
18---
19 inference-engine/CMakeLists.txt | 2 ++
20 inference-engine/cmake/config.cmake.in | 1 +
21 inference-engine/ie_bridges/python/CMakeLists.txt | 2 +-
22 .../src/openvino/inference_engine/CMakeLists.txt | 4 +++-
23 inference-engine/samples/CMakeLists.txt | 9 +--------
24 .../samples/common/format_reader/CMakeLists.txt | 2 ++
25 inference-engine/src/CMakeLists.txt | 4 +++-
26 inference-engine/src/extension/CMakeLists.txt | 5 ++++-
27 inference-engine/src/hetero_plugin/CMakeLists.txt | 1 +
28 .../src/inference_engine/CMakeLists.txt | 22 +++++++++++++++++++---
29 .../src/inference_engine/ie_util_internal.cpp | 7 ++++---
30 inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 +
31 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 ++
32 inference-engine/tests/unit/CMakeLists.txt | 2 ++
33 14 files changed, 46 insertions(+), 18 deletions(-)
34
35diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
36index 5ee8f53..734fb45 100644
37--- a/inference-engine/CMakeLists.txt
38+++ b/inference-engine/CMakeLists.txt
39@@ -67,3 +67,5 @@ if (ENABLE_PYTHON)
40 endif()
41
42 add_cpplint_report_target()
43+
44+install(DIRECTORY samples DESTINATION share/doc/inference_engine)
45diff --git a/inference-engine/cmake/config.cmake.in b/inference-engine/cmake/config.cmake.in
46index d9a6918..8e406be 100644
47--- a/inference-engine/cmake/config.cmake.in
48+++ b/inference-engine/cmake/config.cmake.in
49@@ -7,6 +7,7 @@ if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine)
50 set(InferenceEngine_LIBRARIES inference_engine)
51 else()
52 include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake")
53+ include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake")
54 get_target_property(InferenceEngine_INCLUDE_DIRS IE::inference_engine INTERFACE_INCLUDE_DIRECTORIES)
55 set(InferenceEngine_LIBRARIES IE::inference_engine)
56 endif()
57diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
58index 9fca214..1d21443 100644
59--- a/inference-engine/ie_bridges/python/CMakeLists.txt
60+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
61@@ -49,4 +49,4 @@ find_package (InferenceEngine REQUIRED)
62
63 set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
64 add_subdirectory (src/openvino/inference_engine)
65-add_subdirectory (src/openvino/tools/statistics_collector)
66+#add_subdirectory (src/openvino/tools/statistics_collector)
67diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
68index 1f46013..d6cd112 100644
69--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
70+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
71@@ -29,4 +29,6 @@ ADD_CUSTOM_COMMAND (TARGET ${TARGET_NAME}
72 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/inference_engine/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py
73 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/requirements.txt ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../../requirements.txt
74 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../__init__.py
75-)
76\ No newline at end of file
77+)
78+
79+install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION lib/${PYTHON_VERSION}/site-packages/)
80diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
81index 3802624..dd7b679 100644
82--- a/inference-engine/samples/CMakeLists.txt
83+++ b/inference-engine/samples/CMakeLists.txt
84@@ -39,14 +39,6 @@ if(NOT(UNIX))
85 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
86 set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
87 set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
88-else ()
89- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
90- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
91- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
92- set (CMAKE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
93- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
94- set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
95- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
96 endif()
97
98 if (WIN32)
99@@ -188,6 +180,7 @@ macro(ie_add_sample)
100 if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
101 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
102 endif()
103+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
104 endmacro()
105
106
107diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
108index c4011c4..2322c3c 100644
109--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
110+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
111@@ -43,3 +43,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
112
113 export(TARGETS ${TARGET_NAME} NAMESPACE IE::
114 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
115+
116+install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
117diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt
118index bd1793f..986040c 100644
119--- a/inference-engine/src/CMakeLists.txt
120+++ b/inference-engine/src/CMakeLists.txt
121@@ -37,8 +37,10 @@ set(InferenceEngine_SRC_DIRS ${CMAKE_SOURCE_DIR}/src)
122 function(set_target_cpu_flags TARGET_NAME)
123 endfunction()
124
125-add_subdirectory(extension EXCLUDE_FROM_ALL)
126+add_subdirectory(extension)
127 add_library(IE::ie_cpu_extension ALIAS ie_cpu_extension)
128
129 file(GLOB_RECURSE EXTENSION_SOURCES extension/*.cpp extension/*.hpp extension/*.h)
130 add_cpplint_target(ie_cpu_extension_cpplint FOR_SOURCES ${EXTENSION_SOURCES})
131+
132+install(DIRECTORY extension DESTINATION share/doc/inference_engine)
133diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
134index 799a62d..fb14ebe 100644
135--- a/inference-engine/src/extension/CMakeLists.txt
136+++ b/inference-engine/src/extension/CMakeLists.txt
137@@ -49,7 +49,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "cpu_extension")
138
139 target_link_libraries(${TARGET_NAME} PRIVATE ${InferenceEngine_LIBRARIES})
140
141-target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
142+target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
143 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
144
145 set_target_cpu_flags(${TARGET_NAME})
146@@ -61,3 +61,6 @@ if (IE_MAIN_SOURCE_DIR)
147 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
148 endif()
149
150+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
151+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
152+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets_cpu_extension.cmake)
153diff --git a/inference-engine/src/hetero_plugin/CMakeLists.txt b/inference-engine/src/hetero_plugin/CMakeLists.txt
154index 91eb189..abc0748 100644
155--- a/inference-engine/src/hetero_plugin/CMakeLists.txt
156+++ b/inference-engine/src/hetero_plugin/CMakeLists.txt
157@@ -21,3 +21,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)
158 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
159
160 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
161+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
162diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
163index 37a0744..c0c803d 100644
164--- a/inference-engine/src/inference_engine/CMakeLists.txt
165+++ b/inference-engine/src/inference_engine/CMakeLists.txt
166@@ -90,7 +90,9 @@ if(WIN32)
167 endif()
168
169 # Properties->C/C++->General->Additional Include Directories
170-target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
171+target_include_directories(${TARGET_NAME} PUBLIC
172+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
173+ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
174 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
175 "${IE_MAIN_SOURCE_DIR}/src/dumper")
176
177@@ -114,7 +116,9 @@ add_library(${TARGET_NAME}_s STATIC
178 set_ie_threading_interface_for(${TARGET_NAME}_s)
179
180 # Properties->C/C++->General->Additional Include Directories
181-target_include_directories(${TARGET_NAME}_s PUBLIC "${PUBLIC_HEADERS_DIR}"
182+target_include_directories(${TARGET_NAME}_s PUBLIC
183+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
184+ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
185 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
186 PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper")
187
188@@ -146,7 +150,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
189 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
190
191 ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
192- POSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
193+ P $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
194++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>OSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
195
196 # export targets
197 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: FILE "${CMAKE_BINARY_DIR}/targets.cmake")
198@@ -177,3 +182,14 @@ configure_file(
199 "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in"
200 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
201 COPYONLY)
202+
203+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
204+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
205+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets.cmake)
206+install(DIRECTORY ${PUBLIC_HEADERS_DIR}/ DESTINATION include/${TARGET_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
207+install(FILES
208+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
209+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
210+ DESTINATION ${ConfigPackageLocation})
211+
212+install(FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml" DESTINATION /usr/share/openvino/inference-engine)
213diff --git a/inference-engine/src/inference_engine/ie_util_internal.cpp b/inference-engine/src/inference_engine/ie_util_internal.cpp
214index 489ab24..2defd56 100644
215--- a/inference-engine/src/inference_engine/ie_util_internal.cpp
216+++ b/inference-engine/src/inference_engine/ie_util_internal.cpp
217@@ -755,9 +755,10 @@ std::string getIELibraryPath() {
218 GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path));
219 return getPathName(ie_library_path);
220 #else
221- Dl_info info;
222- dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
223- return getPathName(info.dli_fname);
224+ //Dl_info info;
225+ //dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
226+ //return getPathName(info.dli_fname);
227+ return "/usr/share/openvino/inference-engine";
228 #endif
229 }
230
231diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
232index d767724..80d33e6 100644
233--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
234+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
235@@ -69,3 +69,4 @@ target_compile_definitions(test_${TARGET_NAME} PUBLIC -DMKLDNN_THR=${MKLDNN_THR}
236 target_link_libraries(test_${TARGET_NAME} PRIVATE inference_engine_s mkldnn)
237
238 set_target_properties(test_${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME test_${TARGET_NAME})
239+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
240diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
241index b51f1a6..c005473 100644
242--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
243+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
244@@ -36,3 +36,5 @@ if (LINUX)
245 COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../vpu_custom_kernels
246 $<TARGET_FILE_DIR:${TARGET_NAME}>/vpu_custom_kernels)
247 endif()
248+
249+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
250diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
251index d83e088..641bef7 100644
252--- a/inference-engine/tests/unit/CMakeLists.txt
253+++ b/inference-engine/tests/unit/CMakeLists.txt
254@@ -116,3 +116,5 @@ add_test(NAME ${TARGET_NAME}
255 COMMAND ${TARGET_NAME})
256
257 add_dependencies(${TARGET_NAME} mock_engine)
258+
259+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-19 11:54:53 +0000