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.patch267
1 files changed, 0 insertions, 267 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
deleted file mode 100644
index b89964b1..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
+++ /dev/null
@@ -1,267 +0,0 @@
1From 518cd8afb38810924371209416fd5b5d2c23a92e 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-Update to R3
7-Libraries to /usr/lib64
8-Headers to /usr/include
9-Sample Apps executable to /usr/bin
10-Sample Apps source code to /usr/share/doc/inference_engine
11-Python library to ${libdir}/python<version>/site-packages
12-plugins.xml to /usr/share/openvino/inference-engine
13-Create targets_cpu_extension.cmake
14
15Upstream-Status: Pending [Taken from Clear Linux with changes to install
16libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64 and update to R3]
17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
18Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
19---
20 inference-engine/CMakeLists.txt | 2 ++
21 inference-engine/cmake/config.cmake.in | 1 +
22 inference-engine/ie_bridges/python/CMakeLists.txt | 2 +-
23 .../src/openvino/inference_engine/CMakeLists.txt | 4 +++-
24 inference-engine/samples/CMakeLists.txt | 9 +-------
25 .../samples/common/format_reader/CMakeLists.txt | 2 ++
26 inference-engine/src/CMakeLists.txt | 4 +++-
27 inference-engine/src/extension/CMakeLists.txt | 5 ++++-
28 inference-engine/src/hetero_plugin/CMakeLists.txt | 2 ++
29 .../src/inference_engine/CMakeLists.txt | 25 ++++++++++++++++++----
30 .../src/inference_engine/ie_util_internal.cpp | 7 +++---
31 inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 +
32 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 ++
33 inference-engine/tests/unit/CMakeLists.txt | 2 ++
34 14 files changed, 49 insertions(+), 19 deletions(-)
35
36diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
37index a282cb4..abb4de4 100644
38--- a/inference-engine/CMakeLists.txt
39+++ b/inference-engine/CMakeLists.txt
40@@ -70,3 +70,5 @@ if (ENABLE_PYTHON)
41 endif()
42
43 add_cpplint_report_target()
44+
45+install(DIRECTORY samples DESTINATION share/doc/inference_engine)
46diff --git a/inference-engine/cmake/config.cmake.in b/inference-engine/cmake/config.cmake.in
47index ebe82ee..0d7e6a4 100644
48--- a/inference-engine/cmake/config.cmake.in
49+++ b/inference-engine/cmake/config.cmake.in
50@@ -7,6 +7,7 @@ if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine)
51 set(InferenceEngine_LIBRARIES inference_engine)
52 else()
53 include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake")
54+ include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake")
55 if(NOT WIN32)
56 set_target_properties(IE::inference_engine PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-error=deprecated-declarations")
57 endif()
58diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
59index bba853f..444cce9 100644
60--- a/inference-engine/ie_bridges/python/CMakeLists.txt
61+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
62@@ -53,4 +53,4 @@ endif()
63
64 set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
65 add_subdirectory (src/openvino/inference_engine)
66-add_subdirectory (src/openvino/tools/statistics_collector)
67+#add_subdirectory (src/openvino/tools/statistics_collector)
68diff --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
69index 1f46013..952c173 100644
70--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
71+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
72@@ -29,4 +29,6 @@ ADD_CUSTOM_COMMAND (TARGET ${TARGET_NAME}
73 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/inference_engine/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py
74 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/requirements.txt ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../../requirements.txt
75 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../__init__.py
76-)
77\ No newline at end of file
78+)
79+
80+install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/)
81diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
82index 884b0a6..25f9f23 100644
83--- a/inference-engine/samples/CMakeLists.txt
84+++ b/inference-engine/samples/CMakeLists.txt
85@@ -39,14 +39,6 @@ if(NOT(UNIX))
86 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
87 set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
88 set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
89-else ()
90- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
91- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
92- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
93- set (CMAKE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
94- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
95- set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
96- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
97 endif()
98
99 if (WIN32)
100@@ -188,6 +180,7 @@ macro(ie_add_sample)
101 if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
102 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
103 endif()
104+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
105 endmacro()
106
107
108diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
109index a8c9caf..dffa8cb 100644
110--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
111+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
112@@ -40,3 +40,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
113
114 export(TARGETS ${TARGET_NAME} NAMESPACE IE::
115 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
116+
117+install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
118diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt
119index 63fda2a..350e3f5 100644
120--- a/inference-engine/src/CMakeLists.txt
121+++ b/inference-engine/src/CMakeLists.txt
122@@ -37,8 +37,10 @@ set(InferenceEngine_SRC_DIRS ${CMAKE_SOURCE_DIR}/src)
123 function(set_target_cpu_flags TARGET_NAME)
124 endfunction()
125
126-add_subdirectory(extension EXCLUDE_FROM_ALL)
127+add_subdirectory(extension)
128 add_library(IE::ie_cpu_extension ALIAS ie_cpu_extension)
129
130 file(GLOB_RECURSE EXTENSION_SOURCES extension/*.cpp extension/*.hpp extension/*.h)
131 add_cpplint_target(ie_cpu_extension_cpplint FOR_SOURCES ${EXTENSION_SOURCES})
132+
133+install(DIRECTORY extension DESTINATION include/inference_engine)
134diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
135index 799a62d..fb14ebe 100644
136--- a/inference-engine/src/extension/CMakeLists.txt
137+++ b/inference-engine/src/extension/CMakeLists.txt
138@@ -49,7 +49,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "cpu_extension")
139
140 target_link_libraries(${TARGET_NAME} PRIVATE ${InferenceEngine_LIBRARIES})
141
142-target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
143+target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
144 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
145
146 set_target_cpu_flags(${TARGET_NAME})
147@@ -61,3 +61,6 @@ if (IE_MAIN_SOURCE_DIR)
148 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
149 endif()
150
151+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
152+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
153+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets_cpu_extension.cmake)
154diff --git a/inference-engine/src/hetero_plugin/CMakeLists.txt b/inference-engine/src/hetero_plugin/CMakeLists.txt
155index fdb1b0f..4955dc9 100644
156--- a/inference-engine/src/hetero_plugin/CMakeLists.txt
157+++ b/inference-engine/src/hetero_plugin/CMakeLists.txt
158@@ -21,3 +21,5 @@ target_include_directories(${TARGET_NAME} PRIVATE
159 )
160
161 target_link_libraries(${TARGET_NAME} PRIVATE inference_engine ade)
162+
163+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
164diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
165index 2604c32..54d3828 100644
166--- a/inference-engine/src/inference_engine/CMakeLists.txt
167+++ b/inference-engine/src/inference_engine/CMakeLists.txt
168@@ -110,8 +110,11 @@ if(WIN32)
169 endif()
170
171 # Properties->C/C++->General->Additional Include Directories
172-target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
173- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
174+target_include_directories(${TARGET_NAME} PUBLIC
175+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
176+ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
177+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
178+ "${IE_MAIN_SOURCE_DIR}/src/dumper")
179
180 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
181 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
182@@ -137,7 +140,9 @@ add_library(${TARGET_NAME}_s STATIC
183 set_ie_threading_interface_for(${TARGET_NAME}_s)
184
185 # Properties->C/C++->General->Additional Include Directories
186-target_include_directories(${TARGET_NAME}_s PUBLIC "${PUBLIC_HEADERS_DIR}"
187+target_include_directories(${TARGET_NAME}_s PUBLIC
188+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
189+ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
190 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
191 PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper")
192
193@@ -173,7 +178,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
194 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
195
196 ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
197- POSSIBLE_PLUGINS MultiDevicePlugin HeteroPlugin clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin HDDLPlugin)
198+ P $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
199++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>OSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
200
201 # export targets
202 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: FILE "${CMAKE_BINARY_DIR}/targets.cmake")
203@@ -204,3 +210,14 @@ configure_file(
204 "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in"
205 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
206 COPYONLY)
207+
208+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
209+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
210+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets.cmake)
211+install(DIRECTORY ${PUBLIC_HEADERS_DIR}/ DESTINATION include/${TARGET_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
212+install(FILES
213+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
214+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
215+ DESTINATION ${ConfigPackageLocation})
216+
217+install(FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml" DESTINATION /usr/share/openvino/inference-engine)
218diff --git a/inference-engine/src/inference_engine/ie_util_internal.cpp b/inference-engine/src/inference_engine/ie_util_internal.cpp
219index 1a2f078..b2668a9 100644
220--- a/inference-engine/src/inference_engine/ie_util_internal.cpp
221+++ b/inference-engine/src/inference_engine/ie_util_internal.cpp
222@@ -760,9 +760,10 @@ std::string getIELibraryPath() {
223 GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path));
224 return getPathName(ie_library_path);
225 #else
226- Dl_info info;
227- dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
228- return getPathName(info.dli_fname);
229+ //Dl_info info;
230+ //dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
231+ //return getPathName(info.dli_fname);
232+ return "/usr/share/openvino/inference-engine";
233 #endif
234 }
235
236diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
237index d767724..80d33e6 100644
238--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
239+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
240@@ -69,3 +69,4 @@ target_compile_definitions(test_${TARGET_NAME} PUBLIC -DMKLDNN_THR=${MKLDNN_THR}
241 target_link_libraries(test_${TARGET_NAME} PRIVATE inference_engine_s mkldnn)
242
243 set_target_properties(test_${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME test_${TARGET_NAME})
244+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
245diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
246index 7023513..b533f07 100644
247--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
248+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
249@@ -36,3 +36,5 @@ endif()
250 target_link_libraries(${TARGET_NAME}
251 PRIVATE
252 ${INTEL_ITT_LIBS} inference_engine vpu_graph_transformer mvnc)
253+
254+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
255diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
256index 8180802..2d37b1e 100644
257--- a/inference-engine/tests/unit/CMakeLists.txt
258+++ b/inference-engine/tests/unit/CMakeLists.txt
259@@ -122,3 +122,5 @@ add_test(NAME ${TARGET_NAME}
260 COMMAND ${TARGET_NAME})
261
262 add_dependencies(${TARGET_NAME} mock_engine)
263+
264+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
265--
2662.7.4
267
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 09:38:16 +0000