summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-09-27 14:55:27 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2019-09-30 07:34:44 (GMT)
commit90b225ce8a00aafd94d0aef5f85e73adce91d5f2 (patch)
tree2325156bd0cd0c4ab837e946181345d7d8c88ddb /dynamic-layers
parent096598691de246c23902d49d228c7562ba2c9cc5 (diff)
downloadmeta-intel-90b225ce8a00aafd94d0aef5f85e73adce91d5f2.tar.gz
dldt-inference-engine: upgrade 2019r1.1 -> 2019r2
* Release notes: https://software.intel.com/en-us/articles/OpenVINO-RelNotes * Enable unit tests to be built and tested using ptest mechanism. * Include patches from Clear Linux for build fixes. * Switch to using python3 and threading to using TBB. Switch ENABLE_OPENCV to off so opencv from system is used. * Remove do_install and patch Makefiles instead to install libraries correctly. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r1.1.bb75
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb88
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch236
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch40
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-fix-openmp-checking.patch61
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch33
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch259
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch32
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Supply-firmware-at-build-time.patch)23
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch81
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-werror.patch)53
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch39
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-sample-apps-and-format_reader-library.patch130
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest5
14 files changed, 751 insertions, 404 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r1.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r1.1.bb
deleted file mode 100644
index 7010811..0000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r1.1.bb
+++ /dev/null
@@ -1,75 +0,0 @@
1SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
2HOMEPAGE = "https://github.com/opencv/dldt"
3DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
4deep learning models through a high-level C++ Inference Engine API \
5integrated with application logic."
6
7SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \
8 https://download.01.org/opencv/2019/openvinotoolkit/R1/inference_engine/firmware_ma2450_491.zip;name=ma2450 \
9 https://download.01.org/opencv/2019/openvinotoolkit/R1/inference_engine/firmware_ma2480_mdk_R7_9.zip;name=ma2480 \
10 file://0001-Supply-firmware-at-build-time.patch;patchdir=../ \
11 file://0001-use-provided-paths.patch;patchdir=../ \
12 file://0001-disable-tests.patch;patchdir=../ \
13 file://0001-disable-werror.patch;patchdir=../ \
14 file://0001-fix-openmp-checking.patch;patchdir=../ \
15 file://0002-use-ade-and-pugixml-from-system.patch;patchdir=../ \
16 file://0007-Install-sample-apps-and-format_reader-library.patch;patchdir=../ \
17 "
18SRCREV = "0ef92871b6dd9a9ceed16d184c4595d2618d526f"
19
20SRC_URI[ma2450.md5sum] = "2886778e21ff3713b3ac69e3f43a1da8"
21SRC_URI[ma2450.sha256sum] = "070c57192fa1d4c17c5b2ebf98ebc35323c5617d1d6ccc454308b33a7476c45b"
22
23SRC_URI[ma2480.md5sum] = "a65e0ceab3a33bfe6eff58f2291cecec"
24SRC_URI[ma2480.sha256sum] = "a8231f4f68a1f8eab99d003a43756a23079699be379b64dacf66ad4912a607b3"
25
26LICENSE = "Apache-2.0"
27LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
28
29inherit cmake
30
31S = "${WORKDIR}/git/inference-engine"
32
33EXTRA_OECMAKE += " \
34 -DVPU_FIRMWARE_MA2450_FILE=../mvnc/MvNCAPI-ma2450.mvcmd \
35 -DVPU_FIRMWARE_MA2480_FILE=../mvnc/MvNCAPI-ma2480.mvcmd \
36 -DENABLE_INTEL_OMP=0 \
37 -DENABLE_OPENCV=1 \
38 -DENABLE_SAMPLES_CORE=1 \
39 -DENABLE_PLUGIN_RPATH=0 \
40 -DENABLE_GNA=0 \
41 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python2 \
42 -DTHREADING=OMP \
43 -DCMAKE_INSTALL_LOCAL_ONLY=OFF \
44 -DCMAKE_BUILD_TYPE=DebugWithRelInfo \
45 "
46
47DEPENDS += "libusb1 ade mkl-dnn opencv pugixml"
48
49PACKAGECONFIG ?= ""
50PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime"
51
52do_install_append () {
53 # Workaround cmake build issue where the libraries are not properly
54 # installed, eventually these should be fixed in inference engine's
55 # cmake build.
56
57 install ${B}/src/extension/libcpu_extension.so ${D}${libdir}
58 install ${B}/src/vpu/myriad_plugin/libmyriadPlugin.so ${D}${libdir}
59 install ${B}/src/inference_engine/libinference_engine.so ${D}${libdir}
60 install ${B}/src/hetero_plugin/libHeteroPlugin.so ${D}${libdir}
61 install ${B}/src/mkldnn_plugin/libMKLDNNPlugin.so ${D}${libdir}
62
63 # libclDNNPlugin.so only exists when PACKAGECONFIG intel-compute-runtime
64 # is set (-DENABLE_CLDNN=1)
65 if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then
66 install ${B}/src/cldnn_engine/libclDNNPlugin.so ${D}${libdir}
67 fi
68}
69
70# Move inference engine samples into a separate package
71PACKAGES =+ "${PN}-samples"
72
73FILES_${PN}-dev = "${includedir}"
74FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
75FILES_${PN}-samples = "${bindir}"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
new file mode 100644
index 0000000..207b206
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
@@ -0,0 +1,88 @@
1SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
2HOMEPAGE = "https://github.com/opencv/dldt"
3DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
4deep learning models through a high-level C++ Inference Engine API \
5integrated with application logic."
6
7SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \
8 https://download.01.org/opencv/2019/openvinotoolkit/R2/inference_engine/firmware_ma2450_676.zip;name=ma2450 \
9 https://download.01.org/opencv/2019/openvinotoolkit/R2/inference_engine/firmware_ma2x8x_mdk_R8_9.zip;name=ma2x8x \
10 file://0001-R2-Build-fixes.patch;patchdir=../ \
11 file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=../ \
12 file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=../ \
13 file://0003-Supply-firmware-at-build-time.patch;patchdir=../ \
14 file://0004-disable-werror.patch;patchdir=../ \
15 file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \
16 file://run-ptest \
17 "
18SRCREV = "ba6e22b1b5ee4cbefcc30e8d9493cddb0bb3dfdf"
19
20SRC_URI[ma2450.md5sum] = "a241a063db7eaa3de70ebf89817960e0"
21SRC_URI[ma2450.sha256sum] = "7fb1aa10c0fde8315fe2af65356a00f09f030d811adddc98731ec28b35368786"
22
23SRC_URI[ma2x8x.md5sum] = "cebebec8d05c70c3d69ed5ceaa11a06b"
24SRC_URI[ma2x8x.sha256sum] = "93640eb13e235d3f71a83cd503c36ff8a63235349e1f528d9030eca417ba8c1e"
25
26LICENSE = "Apache-2.0"
27LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
28
29inherit cmake ptest
30
31S = "${WORKDIR}/git/inference-engine"
32
33EXTRA_OECMAKE += " \
34 -DVPU_FIRMWARE_MA2450_FILE=../mvnc/MvNCAPI-ma2450.mvcmd \
35 -DVPU_FIRMWARE_MA2X8X_FILE=../mvnc/MvNCAPI-ma2x8x.mvcmd \
36 -DENABLE_OPENCV=0 \
37 -DENABLE_SAMPLES_CORE=1 \
38 -DENABLE_PLUGIN_RPATH=0 \
39 -DENABLE_GNA=0 \
40 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
41 -DTHREADING=TBB \
42 -DCMAKE_INSTALL_LOCAL_ONLY=OFF \
43 -DCMAKE_BUILD_TYPE=DebugWithRelInfo \
44 -DNGRAPH_INCLUDES=${STAGING_INCDIR}/ngraph \
45 -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \
46 -DBUILD_GMOCK=1 \
47 -DBUILD_GTEST=0 \
48 -DINSTALL_GMOCK=0 \
49 -DINSTALL_GTEST=0 \
50 "
51
52DEPENDS += "libusb1 \
53 ade \
54 mkl-dnn \
55 opencv \
56 pugixml \
57 ngraph \
58 tbb \
59 ${@bb.utils.contains('PTEST_ENABLED', '1', 'gflags', '0', d)} \
60 "
61
62COMPATIBLE_HOST = '(x86_64).*-linux'
63COMPATIBLE_HOST_libc-musl = "null"
64
65PACKAGECONFIG ?= ""
66PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime"
67
68do_install_ptest_base_prepend() {
69 # While not a Makefile based project that strictly falls into the category of
70 # what ptest helps with, adding the unit tests here as ptest would help.
71 # Create a dummy Makefile so installation doesn't fail.
72 touch ${WORKDIR}/Makefile
73 mv ${D}${bindir}/InferenceEngineUnitTests ${D}${PTEST_PATH}/
74}
75
76# Move inference engine samples into a separate package
77PACKAGES =+ "${PN}-samples"
78
79FILES_${PN}-dev = "${includedir} \
80 ${libdir}/cmake \
81 ${libdir}/libinference_engine.so \
82 "
83
84FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \
85 ${datadir}/openvino \
86 "
87
88FILES_${PN}-samples = "${bindir}"
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 0000000..38de10f
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
@@ -0,0 +1,236 @@
1From 3d7373487eacf4e3283183bbc9a771cb4b97c7ab Mon Sep 17 00:00:00 2001
2From: Erin Park <erin.park@intel.com>
3Date: Wed, 11 Sep 2019 09:04:23 -0700
4Subject: [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
11Upstream-Status: Pending [Taken from Clear Linux]
12Signed-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
24diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
25index 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
39diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
40index 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)
103diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake
104index 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
126diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
127index 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 ()
154diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake
155index 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]*\"")
167diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
168index 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()
180diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
181index 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
208diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
209index 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--
2352.23.0
236
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch
deleted file mode 100644
index af6febd..0000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 888db5ced39bba933753c7f8b0b0ef4f900578a9 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 27 Aug 2019 08:06:46 +0800
4Subject: [PATCH] disable tests
5
6Disable tests for now since they build a local copy of gflags etc.
7
8Upstream-Status: Inappropriate [Configuration]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11
12---
13 inference-engine/CMakeLists.txt | 1 -
14 inference-engine/samples/CMakeLists.txt | 1 -
15 2 files changed, 2 deletions(-)
16
17diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
18index 9e15382..bdf874e 100644
19--- a/inference-engine/CMakeLists.txt
20+++ b/inference-engine/CMakeLists.txt
21@@ -131,7 +131,6 @@ include(CheckCXXCompilerFlag)
22 include(cpplint)
23
24 add_subdirectory(src)
25-add_subdirectory(tests)
26 add_subdirectory(thirdparty)
27 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
28
29diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
30index 4e13c11..a8a9946 100644
31--- a/inference-engine/samples/CMakeLists.txt
32+++ b/inference-engine/samples/CMakeLists.txt
33@@ -93,7 +93,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE)
34 set (HAVE_SYS_STAT_H 1)
35 set (HAVE_INTTYPES_H 1)
36
37-add_subdirectory(thirdparty/gflags)
38
39 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
40 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-fix-openmp-checking.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-fix-openmp-checking.patch
deleted file mode 100644
index 6053a31..0000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-fix-openmp-checking.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 46520b6fa766aabcb8c8bc0ead485d30bae965ea Mon Sep 17 00:00:00 2001
2From: Chin Huat Ang <chin.huat.ang@intel.com>
3Date: Tue, 20 Aug 2019 12:20:33 +0800
4Subject: [PATCH] fix openmp checking
5
6Make sure that we supply -fopenmp when using OpenMP supplied by compiler
7and dont look for it locally.
8
9Upstream-Status: Submitted
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
12---
13 inference-engine/cmake/dependencies.cmake | 6 +-----
14 inference-engine/cmake/ie_parallel.cmake | 4 ++--
15 inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 +
16 3 files changed, 4 insertions(+), 7 deletions(-)
17
18diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
19index d3cdf95..64435ca 100644
20--- a/inference-engine/cmake/dependencies.cmake
21+++ b/inference-engine/cmake/dependencies.cmake
22@@ -86,11 +86,7 @@ if (WIN32)
23 ENVIRONMENT "OMP"
24 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
25 elseif(LINUX)
26- RESOLVE_DEPENDENCY(OMP
27- ARCHIVE_LIN "iomp.tgz"
28- TARGET_PATH "${TEMP}/omp"
29- ENVIRONMENT "OMP"
30- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
31+ set(OMP "-fopenmp")
32 else(APPLE)
33 RESOLVE_DEPENDENCY(OMP
34 ARCHIVE_MAC "iomp_20190130_mac.tgz"
35diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
36index 18ccdf0..2738ee5 100644
37--- a/inference-engine/cmake/ie_parallel.cmake
38+++ b/inference-engine/cmake/ie_parallel.cmake
39@@ -68,8 +68,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
40 endif ()
41
42 if (NOT OMP_LIBRARIES_RELEASE OR NOT OMP_LIBRARIES_DEBUG)
43- find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH)
44- find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH)
45+ find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name})
46+ find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name})
47 ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}")
48 ext_message(STATUS "OMP Debug lib: ${OMP_LIBRARIES_DEBUG}")
49 endif ()
50diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
51index df81a5a..96c7f1c 100644
52--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
53+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
54@@ -50,6 +50,7 @@ if (THREADING STREQUAL "TBB")
55 set(MKLDNN_THR MKLDNN_THR_TBB)
56 elseif (THREADING STREQUAL "OMP")
57 set(MKLDNN_THR MKLDNN_THR_OMP)
58+ target_link_options(${TARGET_NAME} PRIVATE -fopenmp)
59 else()
60 set(MKLDNN_THR MKLDNN_THR_SEQ)
61 endif()
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch
deleted file mode 100644
index d20ea11..0000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 3700b244d0906f339f33bcdbfc198f3ba97bf1a0 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 20 Aug 2019 15:58:04 +0800
4Subject: [PATCH] use provided paths
5
6Use the CMake paths provided by environment instead of hardcoding them here.
7
8Upstream-Status: Pending
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
11---
12 inference-engine/CMakeLists.txt | 8 --------
13 1 file changed, 8 deletions(-)
14
15diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
16index 1c3d6ea..9e15382 100644
17--- a/inference-engine/CMakeLists.txt
18+++ b/inference-engine/CMakeLists.txt
19@@ -99,14 +99,6 @@ if(NOT(UNIX))
20 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
21 set (LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
22 set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
23-else ()
24- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
25- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
26- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
27- set (CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
28- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
29- set (LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
30- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
31 endif()
32
33 if (APPLE)
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 0000000..01b6ade
--- /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})
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch
deleted file mode 100644
index 8af9527..0000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 6e225e85d5763e883128ee7b8a97ac247c46b465 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 20 Aug 2019 12:40:09 +0800
4Subject: [PATCH] use ade and pugixml from system
5
6Don't build a local copy and use the one from sysroot.
7
8Upstream-Status: Submitted
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 inference-engine/thirdparty/CMakeLists.txt | 5 ++---
13 1 file changed, 2 insertions(+), 3 deletions(-)
14
15diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
16index f65f38c..7f23e8f 100644
17--- a/inference-engine/thirdparty/CMakeLists.txt
18+++ b/inference-engine/thirdparty/CMakeLists.txt
19@@ -7,11 +7,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
20 set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed")
21 endif()
22
23-add_subdirectory(pugixml)
24-export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
25+# add_subdirectory(pugixml)
26+# export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
27
28 add_subdirectory(stb_lib)
29-add_subdirectory(ade)
30
31 if (ENABLE_CLDNN)
32 set(CLDNN__OUTPUT_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Supply-firmware-at-build-time.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch
index dcc65ed..0910739 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Supply-firmware-at-build-time.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch
@@ -1,6 +1,6 @@
1From e58226a399be7cf2cc6d91b66facb65d7dfb5018 Mon Sep 17 00:00:00 2001 1From f4533f5bfce9daee08a4fea61736315fbe4ad6db Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 20 Aug 2019 15:40:18 +0800 3Date: Fri, 27 Sep 2019 11:34:36 +0800
4Subject: [PATCH] Supply firmware at build time 4Subject: [PATCH] Supply firmware at build time
5 5
6We'd like to supply firmware when fetching the sources. Disable runtime 6We'd like to supply firmware when fetching the sources. Disable runtime
@@ -9,22 +9,21 @@ fetching and point to fetched firmware instead.
9Upstream-Status: Submitted 9Upstream-Status: Submitted
10 10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12
13--- 12---
14 inference-engine/cmake/dependencies.cmake | 18 ------------------ 13 inference-engine/cmake/dependencies.cmake | 18 ------------------
15 1 file changed, 18 deletions(-) 14 1 file changed, 18 deletions(-)
16 15
17diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake 16diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
18index 64435ca..217fbc9 100644 17index d493426..666ace6 100644
19--- a/inference-engine/cmake/dependencies.cmake 18--- a/inference-engine/cmake/dependencies.cmake
20+++ b/inference-engine/cmake/dependencies.cmake 19+++ b/inference-engine/cmake/dependencies.cmake
21@@ -37,24 +37,6 @@ else() 20@@ -22,24 +22,6 @@ if(COMMAND get_linux_name)
22 set(MODELS_BRANCH "master") 21 get_linux_name(LINUX_OS_NAME)
23 endif() 22 endif()
24 23
25-if (ENABLE_MYRIAD) 24-if (ENABLE_MYRIAD)
26- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450 25- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450
27- ARCHIVE_UNIFIED firmware_ma2450_491.zip 26- ARCHIVE_UNIFIED firmware_ma2450_676.zip
28- TARGET_PATH "${TEMP}/vpu/firmware/ma2450" 27- TARGET_PATH "${TEMP}/vpu/firmware/ma2450"
29- ENVIRONMENT "VPU_FIRMWARE_MA2450" 28- ENVIRONMENT "VPU_FIRMWARE_MA2450"
30- FOLDER) 29- FOLDER)
@@ -32,12 +31,12 @@ index 64435ca..217fbc9 100644
32-endif () 31-endif ()
33- 32-
34-if (ENABLE_MYRIAD) 33-if (ENABLE_MYRIAD)
35- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2480 34- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2X8X
36- ARCHIVE_UNIFIED firmware_ma2480_mdk_R7_9.zip 35- ARCHIVE_UNIFIED firmware_ma2x8x_mdk_R8_9.zip
37- TARGET_PATH "${TEMP}/vpu/firmware/ma2480" 36- TARGET_PATH "${TEMP}/vpu/firmware/ma2x8x"
38- ENVIRONMENT "VPU_FIRMWARE_MA2480" 37- ENVIRONMENT "VPU_FIRMWARE_MA2X8X"
39- FOLDER) 38- FOLDER)
40- debug_message(STATUS "ma2480=" ${VPU_FIRMWARE_MA2480}) 39- debug_message(STATUS "ma2x8x=" ${VPU_FIRMWARE_MA2X8X})
41-endif () 40-endif ()
42- 41-
43 ## enable cblas_gemm from OpenBLAS package 42 ## enable cblas_gemm from OpenBLAS package
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
new file mode 100644
index 0000000..ec8b9fe
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
@@ -0,0 +1,81 @@
1From 970443ce6bf31128c3517374e2890a93518d988e Mon Sep 17 00:00:00 2001
2From: Kevron Rees <kevron.m.rees@intel.com>
3Date: Wed, 3 Apr 2019 09:20:48 -0700
4Subject: [PATCH] use GNUInstallDirs on *nix
5
6Upstream-Status: Submitted [Patch taken from Clear Linux and has been submitted
7upstream]
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 .../thirdparty/clDNN/CMakeLists.txt | 3 +-
11 .../thirdparty/clDNN/src/CMakeLists.txt | 36 +++++++++++++++----
12 2 files changed, 31 insertions(+), 8 deletions(-)
13
14diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
15index 624d95c..5957791 100644
16--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
17+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
18@@ -93,7 +93,8 @@ set(CLDNN__GTEST_DIR "${CLDNN__COMMON_DIR}/googletest-fused")
19 # Build targets settings.
20
21 # Path which points to default root directory for compilation output.
22-set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/build/out")
23+set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_BINARY_DIR}")
24+set(CLDNN__OUTPUT_DIR, "${CMAKE_BINARY_DIR}")
25
26 # Prefix for all targets in internal pass.
27 set(CLDNN_BUILD__PROJ_NAME_PREFIX "")
28diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
29index 132c6e4..cc88535 100644
30--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
31+++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
32@@ -247,17 +247,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR
33
34 # ========================================== Installation ==============================================
35
36+if(UNIX)
37+ include(GNUInstallDirs)
38+endif(UNIX)
39+
40+
41 # API headers.
42-install(DIRECTORY "${CLDNN__API_DIR}/"
43+if(UNIX)
44+ install(DIRECTORY "${CLDNN__API_DIR}/"
45+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN"
46+ FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
47+ )
48+else()
49+ install(DIRECTORY "${CLDNN__API_DIR}/"
50 DESTINATION "include/clDNN"
51 FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
52 )
53+endif(UNIX)
54+
55 # Binaries.
56-install(TARGETS "${CLDNN_BUILD__PROJ}"
57- ARCHIVE DESTINATION "lib"
58- LIBRARY DESTINATION "lib"
59- RUNTIME DESTINATION "bin"
60- INCLUDES DESTINATION "include/clDNN"
61- )
62+if(UNIX)
63+ install(TARGETS "${CLDNN_BUILD__PROJ}"
64+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
65+ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
66+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
67+ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN"
68+ )
69+else()
70+ install(TARGETS "${CLDNN_BUILD__PROJ}"
71+ ARCHIVE DESTINATION "lib"
72+ LIBRARY DESTINATION "lib"
73+ RUNTIME DESTINATION "bin"
74+ INCLUDES DESTINATION "include/clDNN"
75+ )
76+endif(UNIX)
77
78 # ======================================================================================================
79--
802.23.0
81
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
index 5ba1e76..b5f52d5 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-werror.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
@@ -1,40 +1,40 @@
1From 434cf332e8c368b626d230b79e8dccecf2b0525b Mon Sep 17 00:00:00 2001 1From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 20 Aug 2019 19:39:37 +0800 3Date: Fri, 27 Sep 2019 20:32:08 +0800
4Subject: [PATCH] disable werror 4Subject: [PATCH] disable werror
5 5
6This shouldn't be enabled and leads to multiple errors when compiling cldnn. 6This shouldn't be enabled and leads to multiple errors when compiling
7cldnn and samples.
7 8
8Upstream-Status: Submitted 9Upstream-Status: Pending
9 10
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11
12--- 12---
13 inference-engine/cmake/os_flags.cmake | 2 +- 13 inference-engine/cmake/os_flags.cmake | 1 -
14 inference-engine/samples/CMakeLists.txt | 1 - 14 inference-engine/samples/CMakeLists.txt | 1 -
15 inference-engine/src/extension/CMakeLists.txt | 1 -
15 inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 -- 16 inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 --
16 inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 - 17 inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 -
17 inference-engine/tools/CMakeLists.txt | 2 -- 18 inference-engine/tools/CMakeLists.txt | 1 -
18 5 files changed, 1 insertion(+), 7 deletions(-) 19 6 files changed, 7 deletions(-)
19 20
20diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake 21diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake
21index 29608ea..2c189d8 100644 22index 6a5442f..a14a1ae 100644
22--- a/inference-engine/cmake/os_flags.cmake 23--- a/inference-engine/cmake/os_flags.cmake
23+++ b/inference-engine/cmake/os_flags.cmake 24+++ b/inference-engine/cmake/os_flags.cmake
24@@ -28,7 +28,7 @@ if (WIN32) 25@@ -48,7 +48,6 @@ if (WIN32)
26 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}")
25 endif() 27 endif()
26
27 else() 28 else()
28- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ") 29- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ")
29+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type ")
30 if (APPLE) 30 if (APPLE)
31 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") 31 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
32 elseif(UNIX) 32 elseif(UNIX)
33diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 33diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
34index a8a9946..8ac5454 100644 34index dd7b679..828abe6 100644
35--- a/inference-engine/samples/CMakeLists.txt 35--- a/inference-engine/samples/CMakeLists.txt
36+++ b/inference-engine/samples/CMakeLists.txt 36+++ b/inference-engine/samples/CMakeLists.txt
37@@ -68,7 +68,6 @@ if (WIN32) 37@@ -59,7 +59,6 @@ if (WIN32)
38 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings 38 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
39 endif() 39 endif()
40 else() 40 else()
@@ -42,11 +42,23 @@ index a8a9946..8ac5454 100644
42 if (APPLE) 42 if (APPLE)
43 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") 43 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
44 elseif(UNIX) 44 elseif(UNIX)
45diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
46index fb14ebe..228bb8c 100644
47--- a/inference-engine/src/extension/CMakeLists.txt
48+++ b/inference-engine/src/extension/CMakeLists.txt
49@@ -25,7 +25,6 @@ if (WIN32)
50 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
51 endif()
52 else()
53- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
54 endif()
55
56 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
45diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt 57diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
46index 624d95c..5646ff1 100644 58index 5957791..6007be4 100644
47--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt 59--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
48+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt 60+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
49@@ -757,8 +757,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") 61@@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
50 MultiProcessorCompilation 62 MultiProcessorCompilation
51 DeadCodeEliminate 63 DeadCodeEliminate
52 ExtensionsEnabled 64 ExtensionsEnabled
@@ -68,15 +80,14 @@ index a541215..bed8a59 100644
68 append(CMAKE_C_FLAGS "-std=c99") 80 append(CMAKE_C_FLAGS "-std=c99")
69 append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden") 81 append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden")
70diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt 82diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt
71index 13ab365..feacf33 100644 83index fddfa28..a714fc1 100644
72--- a/inference-engine/tools/CMakeLists.txt 84--- a/inference-engine/tools/CMakeLists.txt
73+++ b/inference-engine/tools/CMakeLists.txt 85+++ b/inference-engine/tools/CMakeLists.txt
74@@ -23,8 +23,6 @@ endif() 86@@ -24,7 +24,6 @@ endif()
75
76 if (WIN32) 87 if (WIN32)
77 # add_compile_options("/WX") 88 # add_compile_options("/WX")
78-else() 89 else()
79- add_compile_options("-Werror") 90- add_compile_options("-Werror")
80 endif() 91 endif()
81 92
82 add_subdirectory(vpu) 93 if (ENABLE_OPENCV)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
new file mode 100644
index 0000000..f335d24
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
@@ -0,0 +1,39 @@
1From 8335bac5c53b6cfe611a1c4987ca47aa6a60549f Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 27 Sep 2019 23:06:18 +0800
4Subject: [PATCH] point to correct location of ngraph headers
5
6Upstream-Status: Pending
7Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
8---
9 inference-engine/src/inference_engine/CMakeLists.txt | 2 +-
10 inference-engine/tests/unit/CMakeLists.txt | 3 ++-
11 2 files changed, 3 insertions(+), 2 deletions(-)
12
13diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
14index c0c803d..a4425fd 100644
15--- a/inference-engine/src/inference_engine/CMakeLists.txt
16+++ b/inference-engine/src/inference_engine/CMakeLists.txt
17@@ -99,7 +99,7 @@ target_include_directories(${TARGET_NAME} PUBLIC
18 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
19 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
20 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv")
21-include_directories(${TARGET_NAME} "/usr/include/ngraph")
22+include_directories(${TARGET_NAME} "${NGRAPH_INCLUDES}")
23
24 if(ENABLE_MKL_DNN)
25 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak")
26diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
27index d83e088..29115d2 100644
28--- a/inference-engine/tests/unit/CMakeLists.txt
29+++ b/inference-engine/tests/unit/CMakeLists.txt
30@@ -85,7 +85,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
31 ${IE_MAIN_SOURCE_DIR}/src/extension
32 ${IE_MAIN_SOURCE_DIR}/src/extension/common
33 ${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src
34- "${CMAKE_CURRENT_SOURCE_DIR}/mocks")
35+ "${CMAKE_CURRENT_SOURCE_DIR}/mocks"
36+ ${NGRAPH_INCLUDES})
37
38 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
39
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-sample-apps-and-format_reader-library.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-sample-apps-and-format_reader-library.patch
deleted file mode 100644
index 6f0eb51..0000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-sample-apps-and-format_reader-library.patch
+++ /dev/null
@@ -1,130 +0,0 @@
1From d96a9413face4e8540400848d9a25a5458bad74a Mon Sep 17 00:00:00 2001
2From: "Brett T. Warden" <brett.t.warden@intel.com>
3Date: Mon, 28 Jan 2019 13:58:03 -0800
4Subject: [PATCH] Install sample apps and format_reader library
5
6Make sure that we install format_reader library as well.
7
8Upstream-Status: Submitted
9
10Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
11---
12 inference-engine/samples/classification_sample/CMakeLists.txt | 1 +
13 inference-engine/samples/classification_sample_async/CMakeLists.txt | 1 +
14 inference-engine/samples/common/format_reader/CMakeLists.txt | 1 +
15 inference-engine/samples/hello_autoresize_classification/CMakeLists.txt | 1 +
16 inference-engine/samples/hello_classification/CMakeLists.txt | 1 +
17 inference-engine/samples/hello_request_classification/CMakeLists.txt | 1 +
18 inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt | 1 +
19 inference-engine/samples/style_transfer_sample/CMakeLists.txt | 1 +
20 inference-engine/samples/validation_app/CMakeLists.txt | 1 +
21 9 files changed, 9 insertions(+)
22
23diff --git a/inference-engine/samples/classification_sample/CMakeLists.txt b/inference-engine/samples/classification_sample/CMakeLists.txt
24index 1dab0c9..b2c67ea 100644
25--- a/inference-engine/samples/classification_sample/CMakeLists.txt
26+++ b/inference-engine/samples/classification_sample/CMakeLists.txt
27@@ -16,6 +16,7 @@ link_directories(${LIB_FOLDER})
28
29 # Create library file from sources.
30 add_executable(${TARGET_NAME} ${SRC})
31+install(TARGETS ${TARGET_NAME} DESTINATION bin)
32
33 set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
34 COMPILE_PDB_NAME ${TARGET_NAME})
35diff --git a/inference-engine/samples/classification_sample_async/CMakeLists.txt b/inference-engine/samples/classification_sample_async/CMakeLists.txt
36index 9e37440..3fc0082 100644
37--- a/inference-engine/samples/classification_sample_async/CMakeLists.txt
38+++ b/inference-engine/samples/classification_sample_async/CMakeLists.txt
39@@ -16,6 +16,7 @@ link_directories(${LIB_FOLDER})
40
41 # Create library file from sources.
42 add_executable(${TARGET_NAME} ${SRC})
43+install(TARGETS ${TARGET_NAME} DESTINATION bin)
44
45 set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
46 COMPILE_PDB_NAME ${TARGET_NAME})
47diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
48index e3ecd58..cc30fec 100644
49--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
50+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
51@@ -35,6 +35,7 @@ source_group("include" FILES ${LIBRARY_HEADERS})
52
53 # Create library file from sources.
54 add_library(${TARGET_NAME} SHARED ${MAIN_SRC} ${LIBRARY_HEADERS})
55+install(TARGETS ${TARGET_NAME} DESTINATION lib)
56 target_link_libraries(${TARGET_NAME} ${OpenCV_LIBRARIES})
57
58 if(CMAKE_VERSION VERSION_LESS "2.8.11")
59diff --git a/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt b/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt
60index 01deda6..5ef2900 100644
61--- a/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt
62+++ b/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt
63@@ -21,6 +21,7 @@ link_directories(${LIB_FOLDER})
64
65 # Create library file from sources.
66 add_executable(${TARGET_NAME} ${SRC})
67+install(TARGETS ${TARGET_NAME} DESTINATION bin)
68
69 set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
70 COMPILE_PDB_NAME ${TARGET_NAME})
71diff --git a/inference-engine/samples/hello_classification/CMakeLists.txt b/inference-engine/samples/hello_classification/CMakeLists.txt
72index 845f7e9..276be87 100644
73--- a/inference-engine/samples/hello_classification/CMakeLists.txt
74+++ b/inference-engine/samples/hello_classification/CMakeLists.txt
75@@ -23,6 +23,7 @@ link_directories(${LIB_FOLDER})
76
77 # Create library file from sources.
78 add_executable(${TARGET_NAME} ${SRC})
79+install(TARGETS ${TARGET_NAME} DESTINATION bin)
80
81 if(WIN32)
82 # This target supports UNICODE on Windows
83diff --git a/inference-engine/samples/hello_request_classification/CMakeLists.txt b/inference-engine/samples/hello_request_classification/CMakeLists.txt
84index c7dbb1e..3e5ab8f 100644
85--- a/inference-engine/samples/hello_request_classification/CMakeLists.txt
86+++ b/inference-engine/samples/hello_request_classification/CMakeLists.txt
87@@ -23,6 +23,7 @@ link_directories(${LIB_FOLDER})
88
89 # Create library file from sources.
90 add_executable(${TARGET_NAME} ${SRC})
91+install(TARGETS ${TARGET_NAME} DESTINATION bin)
92
93 set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
94 COMPILE_PDB_NAME ${TARGET_NAME})
95diff --git a/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt b/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt
96index 436edc2..adba758 100644
97--- a/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt
98+++ b/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt
99@@ -21,6 +21,7 @@ link_directories(${LIB_FOLDER})
100
101 # Create library file from sources.
102 add_executable(${TARGET_NAME} ${MAIN_SRC} ${MAIN_HEADERS})
103+install(TARGETS ${TARGET_NAME} DESTINATION bin)
104
105 add_dependencies(${TARGET_NAME} gflags)
106
107diff --git a/inference-engine/samples/style_transfer_sample/CMakeLists.txt b/inference-engine/samples/style_transfer_sample/CMakeLists.txt
108index ac2a170..d8e624b 100644
109--- a/inference-engine/samples/style_transfer_sample/CMakeLists.txt
110+++ b/inference-engine/samples/style_transfer_sample/CMakeLists.txt
111@@ -22,6 +22,7 @@ link_directories(${LIB_FOLDER})
112
113 # Create library file from sources.
114 add_executable(${TARGET_NAME} ${MAIN_SRC} ${MAIN_HEADERS})
115+install(TARGETS ${TARGET_NAME} DESTINATION bin)
116
117 add_dependencies(${TARGET_NAME} gflags)
118
119diff --git a/inference-engine/samples/validation_app/CMakeLists.txt b/inference-engine/samples/validation_app/CMakeLists.txt
120index 87b337c..07f48b7 100644
121--- a/inference-engine/samples/validation_app/CMakeLists.txt
122+++ b/inference-engine/samples/validation_app/CMakeLists.txt
123@@ -36,6 +36,7 @@ link_directories(${LIB_FOLDER})
124
125 # Create library file from sources.
126 add_executable(${TARGET_NAME} ${MAIN_SRC} ${MAIN_HEADERS})
127+install(TARGETS ${TARGET_NAME} DESTINATION bin)
128
129 set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
130 COMPILE_PDB_NAME ${TARGET_NAME})
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
new file mode 100644
index 0000000..77310f9
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
@@ -0,0 +1,5 @@
1#!/bin/sh
2
3./InferenceEngineUnitTests |sed \
4 -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \
5 -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|'