[meta-intel] [PATCH] dldt-inference-engine: upgrade 2019r1.1 -> 2019r2
Anuj Mittal
anuj.mittal at intel.com
Sun Sep 29 16:47:18 PDT 2019
* 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 at intel.com>
---
.../opencv/dldt-inference-engine_2019r1.1.bb | 75 -----
.../opencv/dldt-inference-engine_2019r2.bb | 88 ++++++
.../opencv/files/0001-R2-Build-fixes.patch | 236 ++++++++++++++++
.../opencv/files/0001-disable-tests.patch | 40 ---
.../files/0001-fix-openmp-checking.patch | 61 -----
.../files/0001-use-provided-paths.patch | 33 ---
...nstall-DLDT-headers-libs-sample-Apps.patch | 259 ++++++++++++++++++
...0002-use-ade-and-pugixml-from-system.patch | 32 ---
... 0003-Supply-firmware-at-build-time.patch} | 23 +-
.../0003-use-GNUInstallDirs-on-nix.patch | 81 ++++++
...werror.patch => 0004-disable-werror.patch} | 53 ++--
...o-correct-location-of-ngraph-headers.patch | 39 +++
...ample-apps-and-format_reader-library.patch | 130 ---------
.../recipes-support/opencv/files/run-ptest | 5 +
14 files changed, 751 insertions(+), 404 deletions(-)
delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r1.1.bb
create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch
delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-fix-openmp-checking.patch
delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch
create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch
rename dynamic-layers/openembedded-layer/recipes-support/opencv/files/{0001-Supply-firmware-at-build-time.patch => 0003-Supply-firmware-at-build-time.patch} (66%)
create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
rename dynamic-layers/openembedded-layer/recipes-support/opencv/files/{0001-disable-werror.patch => 0004-disable-werror.patch} (67%)
create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-sample-apps-and-format_reader-library.patch
create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
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 7010811e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r1.1.bb
+++ /dev/null
@@ -1,75 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
-HOMEPAGE = "https://github.com/opencv/dldt"
-DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
-deep learning models through a high-level C++ Inference Engine API \
-integrated with application logic."
-
-SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \
- https://download.01.org/opencv/2019/openvinotoolkit/R1/inference_engine/firmware_ma2450_491.zip;name=ma2450 \
- https://download.01.org/opencv/2019/openvinotoolkit/R1/inference_engine/firmware_ma2480_mdk_R7_9.zip;name=ma2480 \
- file://0001-Supply-firmware-at-build-time.patch;patchdir=../ \
- file://0001-use-provided-paths.patch;patchdir=../ \
- file://0001-disable-tests.patch;patchdir=../ \
- file://0001-disable-werror.patch;patchdir=../ \
- file://0001-fix-openmp-checking.patch;patchdir=../ \
- file://0002-use-ade-and-pugixml-from-system.patch;patchdir=../ \
- file://0007-Install-sample-apps-and-format_reader-library.patch;patchdir=../ \
- "
-SRCREV = "0ef92871b6dd9a9ceed16d184c4595d2618d526f"
-
-SRC_URI[ma2450.md5sum] = "2886778e21ff3713b3ac69e3f43a1da8"
-SRC_URI[ma2450.sha256sum] = "070c57192fa1d4c17c5b2ebf98ebc35323c5617d1d6ccc454308b33a7476c45b"
-
-SRC_URI[ma2480.md5sum] = "a65e0ceab3a33bfe6eff58f2291cecec"
-SRC_URI[ma2480.sha256sum] = "a8231f4f68a1f8eab99d003a43756a23079699be379b64dacf66ad4912a607b3"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-inherit cmake
-
-S = "${WORKDIR}/git/inference-engine"
-
-EXTRA_OECMAKE += " \
- -DVPU_FIRMWARE_MA2450_FILE=../mvnc/MvNCAPI-ma2450.mvcmd \
- -DVPU_FIRMWARE_MA2480_FILE=../mvnc/MvNCAPI-ma2480.mvcmd \
- -DENABLE_INTEL_OMP=0 \
- -DENABLE_OPENCV=1 \
- -DENABLE_SAMPLES_CORE=1 \
- -DENABLE_PLUGIN_RPATH=0 \
- -DENABLE_GNA=0 \
- -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python2 \
- -DTHREADING=OMP \
- -DCMAKE_INSTALL_LOCAL_ONLY=OFF \
- -DCMAKE_BUILD_TYPE=DebugWithRelInfo \
- "
-
-DEPENDS += "libusb1 ade mkl-dnn opencv pugixml"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime"
-
-do_install_append () {
- # Workaround cmake build issue where the libraries are not properly
- # installed, eventually these should be fixed in inference engine's
- # cmake build.
-
- install ${B}/src/extension/libcpu_extension.so ${D}${libdir}
- install ${B}/src/vpu/myriad_plugin/libmyriadPlugin.so ${D}${libdir}
- install ${B}/src/inference_engine/libinference_engine.so ${D}${libdir}
- install ${B}/src/hetero_plugin/libHeteroPlugin.so ${D}${libdir}
- install ${B}/src/mkldnn_plugin/libMKLDNNPlugin.so ${D}${libdir}
-
- # libclDNNPlugin.so only exists when PACKAGECONFIG intel-compute-runtime
- # is set (-DENABLE_CLDNN=1)
- if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then
- install ${B}/src/cldnn_engine/libclDNNPlugin.so ${D}${libdir}
- fi
-}
-
-# Move inference engine samples into a separate package
-PACKAGES =+ "${PN}-samples"
-
-FILES_${PN}-dev = "${includedir}"
-FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
-FILES_${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 00000000..207b206e
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
@@ -0,0 +1,88 @@
+SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
+HOMEPAGE = "https://github.com/opencv/dldt"
+DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
+deep learning models through a high-level C++ Inference Engine API \
+integrated with application logic."
+
+SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \
+ https://download.01.org/opencv/2019/openvinotoolkit/R2/inference_engine/firmware_ma2450_676.zip;name=ma2450 \
+ https://download.01.org/opencv/2019/openvinotoolkit/R2/inference_engine/firmware_ma2x8x_mdk_R8_9.zip;name=ma2x8x \
+ file://0001-R2-Build-fixes.patch;patchdir=../ \
+ file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=../ \
+ file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=../ \
+ file://0003-Supply-firmware-at-build-time.patch;patchdir=../ \
+ file://0004-disable-werror.patch;patchdir=../ \
+ file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \
+ file://run-ptest \
+ "
+SRCREV = "ba6e22b1b5ee4cbefcc30e8d9493cddb0bb3dfdf"
+
+SRC_URI[ma2450.md5sum] = "a241a063db7eaa3de70ebf89817960e0"
+SRC_URI[ma2450.sha256sum] = "7fb1aa10c0fde8315fe2af65356a00f09f030d811adddc98731ec28b35368786"
+
+SRC_URI[ma2x8x.md5sum] = "cebebec8d05c70c3d69ed5ceaa11a06b"
+SRC_URI[ma2x8x.sha256sum] = "93640eb13e235d3f71a83cd503c36ff8a63235349e1f528d9030eca417ba8c1e"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+inherit cmake ptest
+
+S = "${WORKDIR}/git/inference-engine"
+
+EXTRA_OECMAKE += " \
+ -DVPU_FIRMWARE_MA2450_FILE=../mvnc/MvNCAPI-ma2450.mvcmd \
+ -DVPU_FIRMWARE_MA2X8X_FILE=../mvnc/MvNCAPI-ma2x8x.mvcmd \
+ -DENABLE_OPENCV=0 \
+ -DENABLE_SAMPLES_CORE=1 \
+ -DENABLE_PLUGIN_RPATH=0 \
+ -DENABLE_GNA=0 \
+ -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
+ -DTHREADING=TBB \
+ -DCMAKE_INSTALL_LOCAL_ONLY=OFF \
+ -DCMAKE_BUILD_TYPE=DebugWithRelInfo \
+ -DNGRAPH_INCLUDES=${STAGING_INCDIR}/ngraph \
+ -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \
+ -DBUILD_GMOCK=1 \
+ -DBUILD_GTEST=0 \
+ -DINSTALL_GMOCK=0 \
+ -DINSTALL_GTEST=0 \
+ "
+
+DEPENDS += "libusb1 \
+ ade \
+ mkl-dnn \
+ opencv \
+ pugixml \
+ ngraph \
+ tbb \
+ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gflags', '0', d)} \
+ "
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST_libc-musl = "null"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime"
+
+do_install_ptest_base_prepend() {
+ # While not a Makefile based project that strictly falls into the category of
+ # what ptest helps with, adding the unit tests here as ptest would help.
+ # Create a dummy Makefile so installation doesn't fail.
+ touch ${WORKDIR}/Makefile
+ mv ${D}${bindir}/InferenceEngineUnitTests ${D}${PTEST_PATH}/
+}
+
+# Move inference engine samples into a separate package
+PACKAGES =+ "${PN}-samples"
+
+FILES_${PN}-dev = "${includedir} \
+ ${libdir}/cmake \
+ ${libdir}/libinference_engine.so \
+ "
+
+FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \
+ ${datadir}/openvino \
+ "
+
+FILES_${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 00000000..38de10f4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
@@ -0,0 +1,236 @@
+From 3d7373487eacf4e3283183bbc9a771cb4b97c7ab Mon Sep 17 00:00:00 2001
+From: Erin Park <erin.park at intel.com>
+Date: Wed, 11 Sep 2019 09:04:23 -0700
+Subject: [PATCH] R2 Build fixes
+
+-linux os-release name search
+-Use system libraries for (OMP/TBB)
+-Use system libraries for ngraph, ade, puigxml, gflags
+-Turn on ENABLE_PYTHON
+
+Upstream-Status: Pending [Taken from Clear Linux]
+Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
+---
+ inference-engine/CMakeLists.txt | 4 +++
+ inference-engine/cmake/dependencies.cmake | 32 +++++++++++--------
+ .../cmake/developer_package.cmake | 12 +++----
+ inference-engine/cmake/ie_parallel.cmake | 10 +++---
+ inference-engine/cmake/linux_name.cmake | 2 +-
+ inference-engine/samples/CMakeLists.txt | 2 --
+ .../src/inference_engine/CMakeLists.txt | 5 +--
+ inference-engine/thirdparty/CMakeLists.txt | 7 ----
+ 8 files changed, 38 insertions(+), 36 deletions(-)
+
+diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
+index 0d449c9..5ee8f53 100644
+--- a/inference-engine/CMakeLists.txt
++++ b/inference-engine/CMakeLists.txt
+@@ -59,6 +59,10 @@ add_cpplint_target(sample_cpplint
+ EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*")
+
+ if (ENABLE_PYTHON)
++ set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
++
++ #to be able to link
++ set (LIB_FOLDER ${IE_MAIN_SOURCE_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
+ add_subdirectory(ie_bridges/python)
+ endif()
+
+diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
+index 00a5b8e..d493426 100644
+--- a/inference-engine/cmake/dependencies.cmake
++++ b/inference-engine/cmake/dependencies.cmake
+@@ -71,11 +71,11 @@ if (WIN32)
+ ENVIRONMENT "OMP"
+ VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
+ elseif(LINUX)
+- RESOLVE_DEPENDENCY(OMP
+- ARCHIVE_LIN "iomp.tgz"
+- TARGET_PATH "${TEMP}/omp"
+- ENVIRONMENT "OMP"
+- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
++# RESOLVE_DEPENDENCY(OMP
++# ARCHIVE_LIN "iomp.tgz"
++# TARGET_PATH "${TEMP}/omp"
++# ENVIRONMENT "OMP"
++# VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
+ else(APPLE)
+ RESOLVE_DEPENDENCY(OMP
+ ARCHIVE_MAC "iomp_20190130_mac.tgz"
+@@ -83,8 +83,11 @@ else(APPLE)
+ ENVIRONMENT "OMP"
+ VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
+ endif()
+-log_rpath_from_dir(OMP "${OMP}/lib")
+-debug_message(STATUS "intel_omp=" ${OMP})
++
++if (OMP)
++ log_rpath_from_dir(OMP "${OMP}/lib")
++ debug_message(STATUS "intel_omp=" ${OMP})
++endif ()
+ endif ()
+
+ ## TBB package
+@@ -97,10 +100,10 @@ if (WIN32)
+ ENVIRONMENT "TBBROOT"
+ VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
+ elseif(LINUX)
+- RESOLVE_DEPENDENCY(TBB
+- ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
+- TARGET_PATH "${TEMP}/tbb"
+- ENVIRONMENT "TBBROOT")
++# RESOLVE_DEPENDENCY(TBB
++# ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
++# TARGET_PATH "${TEMP}/tbb"
++# ENVIRONMENT "TBBROOT")
+ else(APPLE)
+ RESOLVE_DEPENDENCY(TBB
+ ARCHIVE_MAC "tbb2019_20190414_mac.tgz"
+@@ -108,8 +111,11 @@ else(APPLE)
+ ENVIRONMENT "TBBROOT"
+ VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
+ endif()
+-log_rpath_from_dir(TBB "${TBB}/lib")
+-debug_message(STATUS "tbb=" ${TBB})
++
++if (TBB)
++ log_rpath_from_dir(TBB "${TBB}/lib")
++ debug_message(STATUS "tbb=" ${TBB})
++endif ()
+ endif ()
+
+ if (ENABLE_OPENCV)
+diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake
+index 52e0fef..06ba167 100644
+--- a/inference-engine/cmake/developer_package.cmake
++++ b/inference-engine/cmake/developer_package.cmake
+@@ -95,12 +95,12 @@ if(NOT UNIX)
+ set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
+ set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
+ else()
+- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
+- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
+- set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
+- set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
+- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
+- set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
++ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
++ set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
++ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
++ set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
+ set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
+ endif()
+
+diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
+index 8265701..9d4a884 100644
+--- a/inference-engine/cmake/ie_parallel.cmake
++++ b/inference-engine/cmake/ie_parallel.cmake
+@@ -22,9 +22,9 @@ function(set_ie_threading_interface_for TARGET_NAME)
+ endif ()
+
+ if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE)
+- find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH)
+- find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH)
+- find_library(TBB_LIBRARIES_DEBUG tbb_debug ${lib_dbg_path} NO_DEFAULT_PATH)
++ find_path(TBB_INCLUDE_DIRS tbb/tbb.h)
++ find_library(TBB_LIBRARIES_RELEASE tbb)
++ find_library(TBB_LIBRARIES_DEBUG tbb)
+ ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}")
+ ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}")
+ ext_message(STATUS "TBB Debug lib: ${TBB_LIBRARIES_DEBUG}")
+@@ -78,8 +78,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
+ endif ()
+
+ if (NOT OMP_LIBRARIES_RELEASE)
+- find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH)
+- find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH)
++ find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name})
++ find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name})
+ ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}")
+ ext_message(STATUS "OMP Debug lib: ${OMP_LIBRARIES_DEBUG}")
+ endif ()
+diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake
+index 6713808..7e5e47a 100644
+--- a/inference-engine/cmake/linux_name.cmake
++++ b/inference-engine/cmake/linux_name.cmake
+@@ -5,7 +5,7 @@
+ if (LINUX)
+ function(get_linux_name res_var)
+ if (NOT EXISTS "/etc/lsb-release")
+- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
++ execute_process(COMMAND find /usr/lib/ /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
+ OUTPUT_VARIABLE release_data RESULT_VARIABLE result)
+ set(name_regex "NAME=\"([^ \"\n]*).*\"\n")
+ set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"")
+diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
+index d354f64..3802624 100644
+--- a/inference-engine/samples/CMakeLists.txt
++++ b/inference-engine/samples/CMakeLists.txt
+@@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE)
+ set (HAVE_SYS_STAT_H 1)
+ set (HAVE_INTTYPES_H 1)
+
+-add_subdirectory(thirdparty/gflags)
+-
+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ endif()
+diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
+index f3514ed..37a0744 100644
+--- a/inference-engine/src/inference_engine/CMakeLists.txt
++++ b/inference-engine/src/inference_engine/CMakeLists.txt
+@@ -97,12 +97,13 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv")
++include_directories(${TARGET_NAME} "/usr/include/ngraph")
+
+ if(ENABLE_MKL_DNN)
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak")
+ endif()
+
+-set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
++set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} SOVERSION 1)
+
+ # Static library used for unit tests which are always built
+
+@@ -132,7 +133,7 @@ if(WIN32)
+ target_compile_definitions(${TARGET_NAME}_s PRIVATE -DNOMINMAX)
+ endif()
+
+-set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
++set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s SOVERSION 1)
+
+ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
+ PRIVATE ngraph
+diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
+index 5a4b259..7208a0f 100644
+--- a/inference-engine/thirdparty/CMakeLists.txt
++++ b/inference-engine/thirdparty/CMakeLists.txt
+@@ -7,12 +7,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed")
+ endif()
+
+-add_subdirectory(pugixml)
+-export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
+-export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
+-
+ add_subdirectory(stb_lib)
+-add_subdirectory(ade)
+
+ if (ENABLE_CLDNN)
+ set(CLDNN__OUTPUT_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+@@ -40,8 +35,6 @@ if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ add_definitions(-fvisibility=default)
+ endif()
+
+-include(ngraph.cmake)
+-
+ if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ remove_definitions(-fvisibility=default)
+ add_definitions(-fvisibility=hidden)
+--
+2.23.0
+
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 af6febde..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 888db5ced39bba933753c7f8b0b0ef4f900578a9 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal at intel.com>
-Date: Tue, 27 Aug 2019 08:06:46 +0800
-Subject: [PATCH] disable tests
-
-Disable tests for now since they build a local copy of gflags etc.
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
-
----
- inference-engine/CMakeLists.txt | 1 -
- inference-engine/samples/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
-index 9e15382..bdf874e 100644
---- a/inference-engine/CMakeLists.txt
-+++ b/inference-engine/CMakeLists.txt
-@@ -131,7 +131,6 @@ include(CheckCXXCompilerFlag)
- include(cpplint)
-
- add_subdirectory(src)
--add_subdirectory(tests)
- add_subdirectory(thirdparty)
- set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
-
-diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index 4e13c11..a8a9946 100644
---- a/inference-engine/samples/CMakeLists.txt
-+++ b/inference-engine/samples/CMakeLists.txt
-@@ -93,7 +93,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE)
- set (HAVE_SYS_STAT_H 1)
- set (HAVE_INTTYPES_H 1)
-
--add_subdirectory(thirdparty/gflags)
-
- if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
- 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 6053a315..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-fix-openmp-checking.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 46520b6fa766aabcb8c8bc0ead485d30bae965ea Mon Sep 17 00:00:00 2001
-From: Chin Huat Ang <chin.huat.ang at intel.com>
-Date: Tue, 20 Aug 2019 12:20:33 +0800
-Subject: [PATCH] fix openmp checking
-
-Make sure that we supply -fopenmp when using OpenMP supplied by compiler
-and dont look for it locally.
-
-Upstream-Status: Submitted
-Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
-Signed-off-by: Chin Huat Ang <chin.huat.ang at intel.com>
----
- inference-engine/cmake/dependencies.cmake | 6 +-----
- inference-engine/cmake/ie_parallel.cmake | 4 ++--
- inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 +
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
-index d3cdf95..64435ca 100644
---- a/inference-engine/cmake/dependencies.cmake
-+++ b/inference-engine/cmake/dependencies.cmake
-@@ -86,11 +86,7 @@ if (WIN32)
- ENVIRONMENT "OMP"
- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
- elseif(LINUX)
-- RESOLVE_DEPENDENCY(OMP
-- ARCHIVE_LIN "iomp.tgz"
-- TARGET_PATH "${TEMP}/omp"
-- ENVIRONMENT "OMP"
-- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
-+ set(OMP "-fopenmp")
- else(APPLE)
- RESOLVE_DEPENDENCY(OMP
- ARCHIVE_MAC "iomp_20190130_mac.tgz"
-diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
-index 18ccdf0..2738ee5 100644
---- a/inference-engine/cmake/ie_parallel.cmake
-+++ b/inference-engine/cmake/ie_parallel.cmake
-@@ -68,8 +68,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
- endif ()
-
- if (NOT OMP_LIBRARIES_RELEASE OR NOT OMP_LIBRARIES_DEBUG)
-- find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH)
-- find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH)
-+ find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name})
-+ find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name})
- ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}")
- ext_message(STATUS "OMP Debug lib: ${OMP_LIBRARIES_DEBUG}")
- endif ()
-diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
-index df81a5a..96c7f1c 100644
---- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
-+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
-@@ -50,6 +50,7 @@ if (THREADING STREQUAL "TBB")
- set(MKLDNN_THR MKLDNN_THR_TBB)
- elseif (THREADING STREQUAL "OMP")
- set(MKLDNN_THR MKLDNN_THR_OMP)
-+ target_link_options(${TARGET_NAME} PRIVATE -fopenmp)
- else()
- set(MKLDNN_THR MKLDNN_THR_SEQ)
- 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 d20ea111..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3700b244d0906f339f33bcdbfc198f3ba97bf1a0 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal at intel.com>
-Date: Tue, 20 Aug 2019 15:58:04 +0800
-Subject: [PATCH] use provided paths
-
-Use the CMake paths provided by environment instead of hardcoding them here.
-
-Upstream-Status: Pending
-Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
-
----
- inference-engine/CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
-index 1c3d6ea..9e15382 100644
---- a/inference-engine/CMakeLists.txt
-+++ b/inference-engine/CMakeLists.txt
-@@ -99,14 +99,6 @@ if(NOT(UNIX))
- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
- set (LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
--else ()
-- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
-- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
-- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
-- set (CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
-- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION})
-- set (LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib)
-- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
- endif()
-
- 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 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 @@
+From d751c5330eb512c0deb49d640b50d921b7466f89 Mon Sep 17 00:00:00 2001
+From: Erin Park <erin.park at intel.com>
+Date: Wed, 11 Sep 2019 10:33:58 -0700
+Subject: [PATCH] R2 Install DLDT headers, libs, sample Apps
+
+-Libraries to /usr/lib64
+-Headers to /usr/include
+-Sample Apps executable to /usr/bin
+-Sample Apps source code to /usr/share/doc/inference_engine
+-Python library to /usr/lib/python3.7/site-packages
+-plugins.xml to /usr/share/openvino/inference-engine
+-Create targets_cpu_extension.cmake
+
+Upstream-Status: Pending [Taken from Clear Linux with changes to install
+libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64]
+Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
+
+---
+ inference-engine/CMakeLists.txt | 2 ++
+ inference-engine/cmake/config.cmake.in | 1 +
+ inference-engine/ie_bridges/python/CMakeLists.txt | 2 +-
+ .../src/openvino/inference_engine/CMakeLists.txt | 4 +++-
+ inference-engine/samples/CMakeLists.txt | 9 +--------
+ .../samples/common/format_reader/CMakeLists.txt | 2 ++
+ inference-engine/src/CMakeLists.txt | 4 +++-
+ inference-engine/src/extension/CMakeLists.txt | 5 ++++-
+ inference-engine/src/hetero_plugin/CMakeLists.txt | 1 +
+ .../src/inference_engine/CMakeLists.txt | 22 +++++++++++++++++++---
+ .../src/inference_engine/ie_util_internal.cpp | 7 ++++---
+ inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 +
+ .../src/vpu/myriad_plugin/CMakeLists.txt | 2 ++
+ inference-engine/tests/unit/CMakeLists.txt | 2 ++
+ 14 files changed, 46 insertions(+), 18 deletions(-)
+
+diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
+index 5ee8f53..734fb45 100644
+--- a/inference-engine/CMakeLists.txt
++++ b/inference-engine/CMakeLists.txt
+@@ -67,3 +67,5 @@ if (ENABLE_PYTHON)
+ endif()
+
+ add_cpplint_report_target()
++
++install(DIRECTORY samples DESTINATION share/doc/inference_engine)
+diff --git a/inference-engine/cmake/config.cmake.in b/inference-engine/cmake/config.cmake.in
+index d9a6918..8e406be 100644
+--- a/inference-engine/cmake/config.cmake.in
++++ b/inference-engine/cmake/config.cmake.in
+@@ -7,6 +7,7 @@ if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine)
+ set(InferenceEngine_LIBRARIES inference_engine)
+ else()
+ include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake")
++ include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake")
+ get_target_property(InferenceEngine_INCLUDE_DIRS IE::inference_engine INTERFACE_INCLUDE_DIRECTORIES)
+ set(InferenceEngine_LIBRARIES IE::inference_engine)
+ endif()
+diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
+index 9fca214..1d21443 100644
+--- a/inference-engine/ie_bridges/python/CMakeLists.txt
++++ b/inference-engine/ie_bridges/python/CMakeLists.txt
+@@ -49,4 +49,4 @@ find_package (InferenceEngine REQUIRED)
+
+ set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+ add_subdirectory (src/openvino/inference_engine)
+-add_subdirectory (src/openvino/tools/statistics_collector)
++#add_subdirectory (src/openvino/tools/statistics_collector)
+diff --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
+index 1f46013..d6cd112 100644
+--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
++++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
+@@ -29,4 +29,6 @@ ADD_CUSTOM_COMMAND (TARGET ${TARGET_NAME}
+ COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/inference_engine/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py
+ COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/requirements.txt ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../../requirements.txt
+ COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../__init__.py
+-)
+\ No newline at end of file
++)
++
++install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION lib/${PYTHON_VERSION}/site-packages/)
+diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
+index 3802624..dd7b679 100644
+--- a/inference-engine/samples/CMakeLists.txt
++++ b/inference-engine/samples/CMakeLists.txt
+@@ -39,14 +39,6 @@ if(NOT(UNIX))
+ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
+ set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
+ set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
+-else ()
+- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
+- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
+- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
+- set (CMAKE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
+- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
+- set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
+- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
+ endif()
+
+ if (WIN32)
+@@ -188,6 +180,7 @@ macro(ie_add_sample)
+ if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
+ add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
+ endif()
++ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
+ endmacro()
+
+
+diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
+index c4011c4..2322c3c 100644
+--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
++++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
+@@ -43,3 +43,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
+
+ export(TARGETS ${TARGET_NAME} NAMESPACE IE::
+ APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
++
++install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt
+index bd1793f..986040c 100644
+--- a/inference-engine/src/CMakeLists.txt
++++ b/inference-engine/src/CMakeLists.txt
+@@ -37,8 +37,10 @@ set(InferenceEngine_SRC_DIRS ${CMAKE_SOURCE_DIR}/src)
+ function(set_target_cpu_flags TARGET_NAME)
+ endfunction()
+
+-add_subdirectory(extension EXCLUDE_FROM_ALL)
++add_subdirectory(extension)
+ add_library(IE::ie_cpu_extension ALIAS ie_cpu_extension)
+
+ file(GLOB_RECURSE EXTENSION_SOURCES extension/*.cpp extension/*.hpp extension/*.h)
+ add_cpplint_target(ie_cpu_extension_cpplint FOR_SOURCES ${EXTENSION_SOURCES})
++
++install(DIRECTORY extension DESTINATION share/doc/inference_engine)
+diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
+index 799a62d..fb14ebe 100644
+--- a/inference-engine/src/extension/CMakeLists.txt
++++ b/inference-engine/src/extension/CMakeLists.txt
+@@ -49,7 +49,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "cpu_extension")
+
+ target_link_libraries(${TARGET_NAME} PRIVATE ${InferenceEngine_LIBRARIES})
+
+-target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
++target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
+
+ set_target_cpu_flags(${TARGET_NAME})
+@@ -61,3 +61,6 @@ if (IE_MAIN_SOURCE_DIR)
+ export(TARGETS ${TARGET_NAME} NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
+ endif()
+
++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
++install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets_cpu_extension.cmake)
+diff --git a/inference-engine/src/hetero_plugin/CMakeLists.txt b/inference-engine/src/hetero_plugin/CMakeLists.txt
+index 91eb189..abc0748 100644
+--- a/inference-engine/src/hetero_plugin/CMakeLists.txt
++++ b/inference-engine/src/hetero_plugin/CMakeLists.txt
+@@ -21,3 +21,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE inference_engine)
+ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
+
+ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
++install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
+index 37a0744..c0c803d 100644
+--- a/inference-engine/src/inference_engine/CMakeLists.txt
++++ b/inference-engine/src/inference_engine/CMakeLists.txt
+@@ -90,7 +90,9 @@ if(WIN32)
+ endif()
+
+ # Properties->C/C++->General->Additional Include Directories
+-target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
++target_include_directories(${TARGET_NAME} PUBLIC
++ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${IE_MAIN_SOURCE_DIR}/src/dumper")
+
+@@ -114,7 +116,9 @@ add_library(${TARGET_NAME}_s STATIC
+ set_ie_threading_interface_for(${TARGET_NAME}_s)
+
+ # Properties->C/C++->General->Additional Include Directories
+-target_include_directories(${TARGET_NAME}_s PUBLIC "${PUBLIC_HEADERS_DIR}"
++target_include_directories(${TARGET_NAME}_s PUBLIC
++ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
+ PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
+ PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper")
+
+@@ -146,7 +150,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
+ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
+
+ ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
+- POSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
++ P $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
+++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>OSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
+
+ # export targets
+ export(TARGETS ${TARGET_NAME} NAMESPACE IE:: FILE "${CMAKE_BINARY_DIR}/targets.cmake")
+@@ -177,3 +182,14 @@ configure_file(
+ "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in"
+ "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
+ COPYONLY)
++
++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
++install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets.cmake)
++install(DIRECTORY ${PUBLIC_HEADERS_DIR}/ DESTINATION include/${TARGET_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
++install(FILES
++ "${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
++ "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
++ DESTINATION ${ConfigPackageLocation})
++
++install(FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml" DESTINATION /usr/share/openvino/inference-engine)
+diff --git a/inference-engine/src/inference_engine/ie_util_internal.cpp b/inference-engine/src/inference_engine/ie_util_internal.cpp
+index 489ab24..2defd56 100644
+--- a/inference-engine/src/inference_engine/ie_util_internal.cpp
++++ b/inference-engine/src/inference_engine/ie_util_internal.cpp
+@@ -755,9 +755,10 @@ std::string getIELibraryPath() {
+ GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path));
+ return getPathName(ie_library_path);
+ #else
+- Dl_info info;
+- dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
+- return getPathName(info.dli_fname);
++ //Dl_info info;
++ //dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
++ //return getPathName(info.dli_fname);
++ return "/usr/share/openvino/inference-engine";
+ #endif
+ }
+
+diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
+index d767724..80d33e6 100644
+--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
++++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
+@@ -69,3 +69,4 @@ target_compile_definitions(test_${TARGET_NAME} PUBLIC -DMKLDNN_THR=${MKLDNN_THR}
+ target_link_libraries(test_${TARGET_NAME} PRIVATE inference_engine_s mkldnn)
+
+ set_target_properties(test_${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME test_${TARGET_NAME})
++install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
+index b51f1a6..c005473 100644
+--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
++++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
+@@ -36,3 +36,5 @@ if (LINUX)
+ COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../vpu_custom_kernels
+ $<TARGET_FILE_DIR:${TARGET_NAME}>/vpu_custom_kernels)
+ endif()
++
++install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
+index d83e088..641bef7 100644
+--- a/inference-engine/tests/unit/CMakeLists.txt
++++ b/inference-engine/tests/unit/CMakeLists.txt
+@@ -116,3 +116,5 @@ add_test(NAME ${TARGET_NAME}
+ COMMAND ${TARGET_NAME})
+
+ add_dependencies(${TARGET_NAME} mock_engine)
++
++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 8af9527e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6e225e85d5763e883128ee7b8a97ac247c46b465 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal at intel.com>
-Date: Tue, 20 Aug 2019 12:40:09 +0800
-Subject: [PATCH] use ade and pugixml from system
-
-Don't build a local copy and use the one from sysroot.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
----
- inference-engine/thirdparty/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
-index f65f38c..7f23e8f 100644
---- a/inference-engine/thirdparty/CMakeLists.txt
-+++ b/inference-engine/thirdparty/CMakeLists.txt
-@@ -7,11 +7,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed")
- endif()
-
--add_subdirectory(pugixml)
--export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
-+# add_subdirectory(pugixml)
-+# export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
-
- add_subdirectory(stb_lib)
--add_subdirectory(ade)
-
- if (ENABLE_CLDNN)
- 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
similarity index 66%
rename from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Supply-firmware-at-build-time.patch
rename to dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch
index dcc65ed6..09107391 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 @@
-From e58226a399be7cf2cc6d91b66facb65d7dfb5018 Mon Sep 17 00:00:00 2001
+From f4533f5bfce9daee08a4fea61736315fbe4ad6db Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal at intel.com>
-Date: Tue, 20 Aug 2019 15:40:18 +0800
+Date: Fri, 27 Sep 2019 11:34:36 +0800
Subject: [PATCH] Supply firmware at build time
We'd like to supply firmware when fetching the sources. Disable runtime
@@ -9,22 +9,21 @@ fetching and point to fetched firmware instead.
Upstream-Status: Submitted
Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
-
---
inference-engine/cmake/dependencies.cmake | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
-index 64435ca..217fbc9 100644
+index d493426..666ace6 100644
--- a/inference-engine/cmake/dependencies.cmake
+++ b/inference-engine/cmake/dependencies.cmake
-@@ -37,24 +37,6 @@ else()
- set(MODELS_BRANCH "master")
+@@ -22,24 +22,6 @@ if(COMMAND get_linux_name)
+ get_linux_name(LINUX_OS_NAME)
endif()
-if (ENABLE_MYRIAD)
- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450
-- ARCHIVE_UNIFIED firmware_ma2450_491.zip
+- ARCHIVE_UNIFIED firmware_ma2450_676.zip
- TARGET_PATH "${TEMP}/vpu/firmware/ma2450"
- ENVIRONMENT "VPU_FIRMWARE_MA2450"
- FOLDER)
@@ -32,12 +31,12 @@ index 64435ca..217fbc9 100644
-endif ()
-
-if (ENABLE_MYRIAD)
-- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2480
-- ARCHIVE_UNIFIED firmware_ma2480_mdk_R7_9.zip
-- TARGET_PATH "${TEMP}/vpu/firmware/ma2480"
-- ENVIRONMENT "VPU_FIRMWARE_MA2480"
+- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2X8X
+- ARCHIVE_UNIFIED firmware_ma2x8x_mdk_R8_9.zip
+- TARGET_PATH "${TEMP}/vpu/firmware/ma2x8x"
+- ENVIRONMENT "VPU_FIRMWARE_MA2X8X"
- FOLDER)
-- debug_message(STATUS "ma2480=" ${VPU_FIRMWARE_MA2480})
+- debug_message(STATUS "ma2x8x=" ${VPU_FIRMWARE_MA2X8X})
-endif ()
-
## 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 00000000..ec8b9fea
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
@@ -0,0 +1,81 @@
+From 970443ce6bf31128c3517374e2890a93518d988e Mon Sep 17 00:00:00 2001
+From: Kevron Rees <kevron.m.rees at intel.com>
+Date: Wed, 3 Apr 2019 09:20:48 -0700
+Subject: [PATCH] use GNUInstallDirs on *nix
+
+Upstream-Status: Submitted [Patch taken from Clear Linux and has been submitted
+upstream]
+Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
+---
+ .../thirdparty/clDNN/CMakeLists.txt | 3 +-
+ .../thirdparty/clDNN/src/CMakeLists.txt | 36 +++++++++++++++----
+ 2 files changed, 31 insertions(+), 8 deletions(-)
+
+diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
+index 624d95c..5957791 100644
+--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
++++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
+@@ -93,7 +93,8 @@ set(CLDNN__GTEST_DIR "${CLDNN__COMMON_DIR}/googletest-fused")
+ # Build targets settings.
+
+ # Path which points to default root directory for compilation output.
+-set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/build/out")
++set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_BINARY_DIR}")
++set(CLDNN__OUTPUT_DIR, "${CMAKE_BINARY_DIR}")
+
+ # Prefix for all targets in internal pass.
+ set(CLDNN_BUILD__PROJ_NAME_PREFIX "")
+diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
+index 132c6e4..cc88535 100644
+--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
++++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
+@@ -247,17 +247,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR
+
+ # ========================================== Installation ==============================================
+
++if(UNIX)
++ include(GNUInstallDirs)
++endif(UNIX)
++
++
+ # API headers.
+-install(DIRECTORY "${CLDNN__API_DIR}/"
++if(UNIX)
++ install(DIRECTORY "${CLDNN__API_DIR}/"
++ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN"
++ FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
++ )
++else()
++ install(DIRECTORY "${CLDNN__API_DIR}/"
+ DESTINATION "include/clDNN"
+ FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+ )
++endif(UNIX)
++
+ # Binaries.
+-install(TARGETS "${CLDNN_BUILD__PROJ}"
+- ARCHIVE DESTINATION "lib"
+- LIBRARY DESTINATION "lib"
+- RUNTIME DESTINATION "bin"
+- INCLUDES DESTINATION "include/clDNN"
+- )
++if(UNIX)
++ install(TARGETS "${CLDNN_BUILD__PROJ}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN"
++ )
++else()
++ install(TARGETS "${CLDNN_BUILD__PROJ}"
++ ARCHIVE DESTINATION "lib"
++ LIBRARY DESTINATION "lib"
++ RUNTIME DESTINATION "bin"
++ INCLUDES DESTINATION "include/clDNN"
++ )
++endif(UNIX)
+
+ # ======================================================================================================
+--
+2.23.0
+
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
similarity index 67%
rename from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-disable-werror.patch
rename to dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
index 5ba1e763..b5f52d56 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 @@
-From 434cf332e8c368b626d230b79e8dccecf2b0525b Mon Sep 17 00:00:00 2001
+From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal at intel.com>
-Date: Tue, 20 Aug 2019 19:39:37 +0800
+Date: Fri, 27 Sep 2019 20:32:08 +0800
Subject: [PATCH] disable werror
-This shouldn't be enabled and leads to multiple errors when compiling cldnn.
+This shouldn't be enabled and leads to multiple errors when compiling
+cldnn and samples.
-Upstream-Status: Submitted
+Upstream-Status: Pending
Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
-
---
- inference-engine/cmake/os_flags.cmake | 2 +-
+ inference-engine/cmake/os_flags.cmake | 1 -
inference-engine/samples/CMakeLists.txt | 1 -
+ inference-engine/src/extension/CMakeLists.txt | 1 -
inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 --
inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 -
- inference-engine/tools/CMakeLists.txt | 2 --
- 5 files changed, 1 insertion(+), 7 deletions(-)
+ inference-engine/tools/CMakeLists.txt | 1 -
+ 6 files changed, 7 deletions(-)
diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake
-index 29608ea..2c189d8 100644
+index 6a5442f..a14a1ae 100644
--- a/inference-engine/cmake/os_flags.cmake
+++ b/inference-engine/cmake/os_flags.cmake
-@@ -28,7 +28,7 @@ if (WIN32)
+@@ -48,7 +48,6 @@ if (WIN32)
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}")
endif()
-
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type ")
if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
elseif(UNIX)
diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index a8a9946..8ac5454 100644
+index dd7b679..828abe6 100644
--- a/inference-engine/samples/CMakeLists.txt
+++ b/inference-engine/samples/CMakeLists.txt
-@@ -68,7 +68,6 @@ if (WIN32)
+@@ -59,7 +59,6 @@ if (WIN32)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
endif()
else()
@@ -42,11 +42,23 @@ index a8a9946..8ac5454 100644
if (APPLE)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
elseif(UNIX)
+diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
+index fb14ebe..228bb8c 100644
+--- a/inference-engine/src/extension/CMakeLists.txt
++++ b/inference-engine/src/extension/CMakeLists.txt
+@@ -25,7 +25,6 @@ if (WIN32)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
+ endif()
+ else()
+- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ endif()
+
+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-index 624d95c..5646ff1 100644
+index 5957791..6007be4 100644
--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-@@ -757,8 +757,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
+@@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
MultiProcessorCompilation
DeadCodeEliminate
ExtensionsEnabled
@@ -68,15 +80,14 @@ index a541215..bed8a59 100644
append(CMAKE_C_FLAGS "-std=c99")
append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden")
diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt
-index 13ab365..feacf33 100644
+index fddfa28..a714fc1 100644
--- a/inference-engine/tools/CMakeLists.txt
+++ b/inference-engine/tools/CMakeLists.txt
-@@ -23,8 +23,6 @@ endif()
-
+@@ -24,7 +24,6 @@ endif()
if (WIN32)
# add_compile_options("/WX")
--else()
+ else()
- add_compile_options("-Werror")
endif()
- add_subdirectory(vpu)
+ 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 00000000..f335d247
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
@@ -0,0 +1,39 @@
+From 8335bac5c53b6cfe611a1c4987ca47aa6a60549f Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal at intel.com>
+Date: Fri, 27 Sep 2019 23:06:18 +0800
+Subject: [PATCH] point to correct location of ngraph headers
+
+Upstream-Status: Pending
+Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
+---
+ inference-engine/src/inference_engine/CMakeLists.txt | 2 +-
+ inference-engine/tests/unit/CMakeLists.txt | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
+index c0c803d..a4425fd 100644
+--- a/inference-engine/src/inference_engine/CMakeLists.txt
++++ b/inference-engine/src/inference_engine/CMakeLists.txt
+@@ -99,7 +99,7 @@ target_include_directories(${TARGET_NAME} PUBLIC
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv")
+-include_directories(${TARGET_NAME} "/usr/include/ngraph")
++include_directories(${TARGET_NAME} "${NGRAPH_INCLUDES}")
+
+ if(ENABLE_MKL_DNN)
+ target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak")
+diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
+index d83e088..29115d2 100644
+--- a/inference-engine/tests/unit/CMakeLists.txt
++++ b/inference-engine/tests/unit/CMakeLists.txt
+@@ -85,7 +85,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
+ ${IE_MAIN_SOURCE_DIR}/src/extension
+ ${IE_MAIN_SOURCE_DIR}/src/extension/common
+ ${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src
+- "${CMAKE_CURRENT_SOURCE_DIR}/mocks")
++ "${CMAKE_CURRENT_SOURCE_DIR}/mocks"
++ ${NGRAPH_INCLUDES})
+
+ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
+
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 6f0eb517..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-sample-apps-and-format_reader-library.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From d96a9413face4e8540400848d9a25a5458bad74a Mon Sep 17 00:00:00 2001
-From: "Brett T. Warden" <brett.t.warden at intel.com>
-Date: Mon, 28 Jan 2019 13:58:03 -0800
-Subject: [PATCH] Install sample apps and format_reader library
-
-Make sure that we install format_reader library as well.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Chin Huat Ang <chin.huat.ang at intel.com>
----
- inference-engine/samples/classification_sample/CMakeLists.txt | 1 +
- inference-engine/samples/classification_sample_async/CMakeLists.txt | 1 +
- inference-engine/samples/common/format_reader/CMakeLists.txt | 1 +
- inference-engine/samples/hello_autoresize_classification/CMakeLists.txt | 1 +
- inference-engine/samples/hello_classification/CMakeLists.txt | 1 +
- inference-engine/samples/hello_request_classification/CMakeLists.txt | 1 +
- inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt | 1 +
- inference-engine/samples/style_transfer_sample/CMakeLists.txt | 1 +
- inference-engine/samples/validation_app/CMakeLists.txt | 1 +
- 9 files changed, 9 insertions(+)
-
-diff --git a/inference-engine/samples/classification_sample/CMakeLists.txt b/inference-engine/samples/classification_sample/CMakeLists.txt
-index 1dab0c9..b2c67ea 100644
---- a/inference-engine/samples/classification_sample/CMakeLists.txt
-+++ b/inference-engine/samples/classification_sample/CMakeLists.txt
-@@ -16,6 +16,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${SRC})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
- COMPILE_PDB_NAME ${TARGET_NAME})
-diff --git a/inference-engine/samples/classification_sample_async/CMakeLists.txt b/inference-engine/samples/classification_sample_async/CMakeLists.txt
-index 9e37440..3fc0082 100644
---- a/inference-engine/samples/classification_sample_async/CMakeLists.txt
-+++ b/inference-engine/samples/classification_sample_async/CMakeLists.txt
-@@ -16,6 +16,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${SRC})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
- COMPILE_PDB_NAME ${TARGET_NAME})
-diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
-index e3ecd58..cc30fec 100644
---- a/inference-engine/samples/common/format_reader/CMakeLists.txt
-+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
-@@ -35,6 +35,7 @@ source_group("include" FILES ${LIBRARY_HEADERS})
-
- # Create library file from sources.
- add_library(${TARGET_NAME} SHARED ${MAIN_SRC} ${LIBRARY_HEADERS})
-+install(TARGETS ${TARGET_NAME} DESTINATION lib)
- target_link_libraries(${TARGET_NAME} ${OpenCV_LIBRARIES})
-
- if(CMAKE_VERSION VERSION_LESS "2.8.11")
-diff --git a/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt b/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt
-index 01deda6..5ef2900 100644
---- a/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt
-+++ b/inference-engine/samples/hello_autoresize_classification/CMakeLists.txt
-@@ -21,6 +21,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${SRC})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
- COMPILE_PDB_NAME ${TARGET_NAME})
-diff --git a/inference-engine/samples/hello_classification/CMakeLists.txt b/inference-engine/samples/hello_classification/CMakeLists.txt
-index 845f7e9..276be87 100644
---- a/inference-engine/samples/hello_classification/CMakeLists.txt
-+++ b/inference-engine/samples/hello_classification/CMakeLists.txt
-@@ -23,6 +23,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${SRC})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- if(WIN32)
- # This target supports UNICODE on Windows
-diff --git a/inference-engine/samples/hello_request_classification/CMakeLists.txt b/inference-engine/samples/hello_request_classification/CMakeLists.txt
-index c7dbb1e..3e5ab8f 100644
---- a/inference-engine/samples/hello_request_classification/CMakeLists.txt
-+++ b/inference-engine/samples/hello_request_classification/CMakeLists.txt
-@@ -23,6 +23,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${SRC})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
- COMPILE_PDB_NAME ${TARGET_NAME})
-diff --git a/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt b/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt
-index 436edc2..adba758 100644
---- a/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt
-+++ b/inference-engine/samples/object_detection_sample_ssd/CMakeLists.txt
-@@ -21,6 +21,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${MAIN_SRC} ${MAIN_HEADERS})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- add_dependencies(${TARGET_NAME} gflags)
-
-diff --git a/inference-engine/samples/style_transfer_sample/CMakeLists.txt b/inference-engine/samples/style_transfer_sample/CMakeLists.txt
-index ac2a170..d8e624b 100644
---- a/inference-engine/samples/style_transfer_sample/CMakeLists.txt
-+++ b/inference-engine/samples/style_transfer_sample/CMakeLists.txt
-@@ -22,6 +22,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${MAIN_SRC} ${MAIN_HEADERS})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- add_dependencies(${TARGET_NAME} gflags)
-
-diff --git a/inference-engine/samples/validation_app/CMakeLists.txt b/inference-engine/samples/validation_app/CMakeLists.txt
-index 87b337c..07f48b7 100644
---- a/inference-engine/samples/validation_app/CMakeLists.txt
-+++ b/inference-engine/samples/validation_app/CMakeLists.txt
-@@ -36,6 +36,7 @@ link_directories(${LIB_FOLDER})
-
- # Create library file from sources.
- add_executable(${TARGET_NAME} ${MAIN_SRC} ${MAIN_HEADERS})
-+install(TARGETS ${TARGET_NAME} DESTINATION bin)
-
- set_target_properties(${TARGET_NAME} PROPERTIES "CMAKE_CXX_FLAGS" "${CMAKE_CXX_FLAGS} -fPIE"
- 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 00000000..77310f9f
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./InferenceEngineUnitTests |sed \
+ -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \
+ -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|'
--
2.21.0
More information about the meta-intel
mailing list