summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch38
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch62
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb47
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb122
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch235
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch267
-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.patch97
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch42
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch27
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch24
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch104
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest13
13 files changed, 147 insertions, 1012 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
new file mode 100644
index 00000000..4474aa3c
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
@@ -0,0 +1,38 @@
1From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 18 May 2022 12:24:03 +0800
4Subject: [PATCH] CMakeLists: disable Werror
5
6gcc12 highlights minor warnings that cause the build to fail. Ignore
7those until they aren't fixed upstream.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 CMakeLists.txt | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 418483f7..c019fea0 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -146,7 +146,7 @@ else()
21 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
22 if(LNX_BUILD)
23 #A few warnings yet to resolve under esx
24- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
25+ #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
26 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror")
27 endif()
28 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
29@@ -791,4 +791,4 @@ if(ESX_BUILD)
30 include(CMake/esx.cmake)
31 endif()
32
33-add_subdirectory(src/os/nvm_api_sample)
34\ No newline at end of file
35+add_subdirectory(src/os/nvm_api_sample)
36--
372.35.3
38
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
new file mode 100644
index 00000000..8a734ed2
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -0,0 +1,62 @@
1Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
2 builds
3Upstream-Status: Backport
4Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
5---
6 MdePkg/Include/Base.h | 12 ++++++++++++
7 1 file changed, 12 insertions(+)
8
9Index: edk2/MdePkg/Include/Base.h
10===================================================================
11--- edk2.orig/MdePkg/Include/Base.h
12+++ edk2/MdePkg/Include/Base.h
13@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
14 #define NULL __null
15 #endif
16 #else
17+#ifndef OS_BUILD
18+#ifndef UNIT_TEST_UEFI_BUILD
19 #define NULL ((VOID *) 0)
20 #endif
21+#endif
22+#endif
23
24 //
25 // Null character
26@@ -813,6 +817,8 @@ typedef UINTN *BASE_LIST;
27 // Section 2.3.1 of the UEFI 2.3 Specification.
28 //
29
30+#ifndef OS_BUILD
31+#ifndef UNIT_TEST_UEFI_BUILD
32 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
33 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
34 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
35@@ -841,7 +847,8 @@ STATIC_ASSERT (ALIGNOF (CHAR16) == size
36 STATIC_ASSERT (ALIGNOF (INTN) == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements");
37 STATIC_ASSERT (ALIGNOF (UINTN) == sizeof (UINTN), "Alignment of UINTN does not meet UEFI Specification Data Type requirements");
38 STATIC_ASSERT (ALIGNOF (VOID *) == sizeof (VOID *), "Alignment of VOID * does not meet UEFI Specification Data Type requirements");
39-
40+#endif
41+#endif
42 //
43 // The following three enum types are used to verify that the compiler
44 // configuration for enum types is compliant with Section 2.3.1 of the
45@@ -861,6 +868,8 @@ typedef enum {
46 __VerifyInt32EnumValue = 0x7fffffff
47 } __VERIFY_INT32_ENUM_SIZE;
48
49+#ifndef OS_BUILD
50+#ifndef UNIT_TEST_UEFI_BUILD
51 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
52 STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
53 STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
54@@ -868,6 +877,8 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_EN
55 STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE) == sizeof (__VERIFY_UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
56 STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) == sizeof (__VERIFY_UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
57 STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
58+#endif
59+#endif
60
61 /**
62 Macro that returns a pointer to the data structure that contains a specified field of
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
new file mode 100644
index 00000000..695e29e9
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
@@ -0,0 +1,47 @@
1SUMMARY = "Utility for managing Intel Optane DC persistent memory modules"
2DESCRIPTION = "Utility for configuring and managing Intel Optane Persistent \
3Memory modules (PMem). It supports functionality to: \
4Discover DCPMMs on the platform. \
5Provision the platform memory configuration. \
6View and update the firmware on DCPMMs. \
7Configure data-at-rest security on DCPMMs. \
8Track health and performance of DCPMMs. \
9Debug and troubleshoot DCPMMs."
10
11HOMEPAGE = "https://github.com/intel/ipmctl"
12BUGTRACKER = "https://github.com/intel/ipmctl/issues"
13
14LICENSE = "BSD-3-Clause | BSD-2-Clause"
15LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \
16 file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
17
18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master_3_0;name=ipmctl; \
19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \
20 file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
21 file://0001-CMakeLists-disable-Werror.patch \
22"
23
24SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
25#tag edk2-stable202408
26SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201"
27SRCREV_FORMAT = "ipmctl_edk2"
28
29S = "${WORKDIR}/git"
30
31inherit cmake dos2unix
32
33DEPENDS = "ndctl pkgconfig-native"
34
35EXTRA_OECMAKE = "-DRELEASE=ON"
36
37do_configure:prepend() {
38 for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do
39 ln -sf edk2/${dir} ${S}
40 done
41}
42
43do_install:append() {
44 # Remove /var/log/ipmctl as anything created in /var/log will not be
45 # available when tmpfs is mounted at /var/volatile/log.
46 rm -rf ${D}${localstatedir}/log
47}
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb
deleted file mode 100644
index 1074cf6d..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb
+++ /dev/null
@@ -1,122 +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/R3/inference_engine/firmware_ma2450_759W.zip;name=ma2450 \
9 https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2x8x_mdk_R9.8.zip;name=ma2x8x \
10 https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_mv0262_mdk_R9.8.zip;name=mv0262 \
11 file://0001-R2-Build-fixes.patch;patchdir=.. \
12 file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=.. \
13 file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=.. \
14 file://0004-disable-werror.patch;patchdir=.. \
15 file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=.. \
16 file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \
17 file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \
18 file://0008-Simplify-searching-for-firmware-files.patch;patchdir=.. \
19 file://run-ptest \
20 "
21SRCREV = "fe3f978b98c86eaeed3cbdc280e1ffd0bc50d278"
22
23SRC_URI[ma2450.md5sum] = "852f80c3248c451a6c8bfd96d871318f"
24SRC_URI[ma2450.sha256sum] = "ba1b23b45cd8e548ead77af49b0e378100cf4f8dcda41a491868d3d4e7bf8cba"
25
26SRC_URI[ma2x8x.md5sum] = "2d9ca6894cdd25e9b10f7908c415dbc9"
27SRC_URI[ma2x8x.sha256sum] = "961ce4c7b14823a528185f5e75b3b6898a7e8f866b4b5b8af5f4f05f72226909"
28
29SRC_URI[mv0262.md5sum] = "c495f0ee0313e9d8d993e846a7868c4f"
30SRC_URI[mv0262.sha256sum] = "0c0c8d7782f49dd4928837b52b4b6f25c1b088bfee23e464729057a28323ab77"
31
32LICENSE = "Apache-2.0 & ISSL"
33LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
34 file://../../ISSL.txt;md5=ab31aad35d740d800ae1e332d6290f50 \
35"
36LICENSE_${PN}-vpu-firmware = "ISSL"
37
38inherit cmake ptest python3native
39
40S = "${WORKDIR}/git/inference-engine"
41
42EXTRA_OECMAKE += " \
43 -DENABLE_OPENCV=0 \
44 -DENABLE_SAMPLES_CORE=1 \
45 -DENABLE_PLUGIN_RPATH=0 \
46 -DENABLE_GNA=0 \
47 -DPYTHON_EXECUTABLE=${PYTHON} \
48 -DTHREADING=TBB \
49 -DCMAKE_BUILD_TYPE=DebugWithRelInfo \
50 -DNGRAPH_INCLUDES=${STAGING_INCDIR}/ngraph \
51 -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \
52 -DBUILD_GMOCK=1 \
53 -DBUILD_GTEST=0 \
54 -DINSTALL_GMOCK=0 \
55 -DINSTALL_GTEST=0 \
56 "
57
58DEPENDS += "libusb1 \
59 ade \
60 opencv \
61 pugixml \
62 ngraph \
63 tbb \
64 ${@bb.utils.contains('PTEST_ENABLED', '1', 'gflags', '', d)} \
65 "
66
67COMPATIBLE_HOST = '(x86_64).*-linux'
68COMPATIBLE_HOST_libc-musl = "null"
69
70PACKAGECONFIG ?= "vpu"
71PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, opencl-icd-loader, opencl-icd-loader intel-compute-runtime"
72PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3"
73PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_MA2450_FILE=../mvnc/MvNCAPI-ma2450.mvcmd -DVPU_FIRMWARE_MA2X8X_FILE=../mvnc/MvNCAPI-ma2x8x.mvcmd -DVPU_FIRMWARE_MV0262_FILE=../mvnc/MvNCAPI-mv0262.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware"
74PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
75
76do_install_append() {
77 if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then
78 install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2450.mvcmd ${D}${libdir}
79 install -m0644 ${WORKDIR}/mvnc/MvNCAPI-ma2x8x.mvcmd ${D}${libdir}
80 install -m0644 ${WORKDIR}/mvnc/MvNCAPI-mv0262.mvcmd ${D}${libdir}
81
82 install -D -m0644 ${S}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules ${D}${sysconfdir}/udev/rules.d/97-myriad-usbboot.rules
83 fi
84
85 if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then
86 cp -r ${S}/src/cldnn_engine/cldnn_global_custom_kernels ${D}${libdir}/
87 fi
88}
89
90do_install_ptest_base_prepend() {
91 # While not a Makefile based project that strictly falls into the category of
92 # what ptest helps with, adding the unit tests here as ptest would help.
93 # Create a dummy Makefile so installation doesn't fail.
94 touch ${WORKDIR}/Makefile
95 mv ${D}${bindir}/InferenceEngineUnitTests ${D}${PTEST_PATH}/
96 mv ${D}${libdir}/libmock_engine.so ${D}${PTEST_PATH}/
97}
98
99# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
100# instead of RSS
101SSTATE_SCAN_FILES_append = " *.cmake"
102
103FILES_${PN}-dev = "${includedir} \
104 ${libdir}/cmake \
105 ${libdir}/libinference_engine.so \
106 "
107
108FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \
109 ${datadir}/openvino \
110 ${libdir}/cldnn_global_custom_kernels \
111 "
112
113# Move inference engine samples into a separate package
114PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
115
116FILES_${PN}-samples = "${bindir}"
117FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd"
118
119# Package for inference engine python API
120PACKAGES =+ "${PN}-${PYTHON_PN}"
121
122FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino"
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
deleted file mode 100644
index 39d40983..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
+++ /dev/null
@@ -1,235 +0,0 @@
1From 8a5804c723c5bd396e5029f254f866f19a679cc5 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 1/7] R2 Build fixes
5
6-Update to R3
7-linux os-release name search
8-Use system libraries for (OMP/TBB)
9-Use system libraries for ngraph, ade, puigxml, gflags
10-Turn on ENABLE_PYTHON
11
12Upstream-Status: Pending [Taken from Clear Linux and updated to R3]
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
15---
16 inference-engine/CMakeLists.txt | 4 +++
17 inference-engine/cmake/dependencies.cmake | 30 ++++++++++++----------
18 inference-engine/cmake/developer_package.cmake | 12 ++++-----
19 inference-engine/cmake/ie_parallel.cmake | 6 ++---
20 inference-engine/cmake/linux_name.cmake | 2 +-
21 inference-engine/samples/CMakeLists.txt | 2 --
22 .../src/inference_engine/CMakeLists.txt | 5 ++--
23 inference-engine/thirdparty/CMakeLists.txt | 9 -------
24 8 files changed, 34 insertions(+), 36 deletions(-)
25
26diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
27index f41d9df..a282cb4 100644
28--- a/inference-engine/CMakeLists.txt
29+++ b/inference-engine/CMakeLists.txt
30@@ -62,6 +62,10 @@ add_cpplint_target(sample_cpplint
31 EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*")
32
33 if (ENABLE_PYTHON)
34+ set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
35+
36+ #to be able to link
37+ set (LIB_FOLDER ${IE_MAIN_SOURCE_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
38 add_subdirectory(ie_bridges/python)
39 endif()
40
41diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
42index 682f2e5..36c3f4d 100644
43--- a/inference-engine/cmake/dependencies.cmake
44+++ b/inference-engine/cmake/dependencies.cmake
45@@ -51,11 +51,11 @@ if (THREADING STREQUAL "OMP")
46 ENVIRONMENT "OMP"
47 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
48 elseif(LINUX)
49- RESOLVE_DEPENDENCY(OMP
50- ARCHIVE_LIN "iomp.tgz"
51- TARGET_PATH "${TEMP}/omp"
52- ENVIRONMENT "OMP"
53- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
54+ #RESOLVE_DEPENDENCY(OMP
55+ # ARCHIVE_LIN "iomp.tgz"
56+ # TARGET_PATH "${TEMP}/omp"
57+ # ENVIRONMENT "OMP"
58+ # VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
59 else(APPLE)
60 RESOLVE_DEPENDENCY(OMP
61 ARCHIVE_MAC "iomp_20190130_mac.tgz"
62@@ -63,8 +63,10 @@ if (THREADING STREQUAL "OMP")
63 ENVIRONMENT "OMP"
64 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
65 endif()
66- log_rpath_from_dir(OMP "${OMP}/lib")
67- debug_message(STATUS "intel_omp=" ${OMP})
68+ if (NOT LINUX)
69+ log_rpath_from_dir(OMP "${OMP}/lib")
70+ debug_message(STATUS "intel_omp=" ${OMP})
71+ endif ()
72 endif ()
73
74 ## TBB package
75@@ -77,10 +79,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
76 ENVIRONMENT "TBBROOT"
77 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
78 elseif(LINUX)
79- RESOLVE_DEPENDENCY(TBB
80- ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
81- TARGET_PATH "${TEMP}/tbb"
82- ENVIRONMENT "TBBROOT")
83+ #RESOLVE_DEPENDENCY(TBB
84+ # ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
85+ # TARGET_PATH "${TEMP}/tbb"
86+ # ENVIRONMENT "TBBROOT")
87 else(APPLE)
88 RESOLVE_DEPENDENCY(TBB
89 ARCHIVE_MAC "tbb2019_20190414_v1_mac.tgz"
90@@ -88,8 +90,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
91 ENVIRONMENT "TBBROOT"
92 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
93 endif()
94- log_rpath_from_dir(TBB "${TBB}/lib")
95- debug_message(STATUS "tbb=" ${TBB})
96+ if (NOT LINUX)
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 a27143d..950ccf4 100644
105--- a/inference-engine/cmake/developer_package.cmake
106+++ b/inference-engine/cmake/developer_package.cmake
107@@ -93,12 +93,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}/${CMAKE_BUILD_TYPE}/lib)
112- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
113- set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
114- set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
115- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
116- set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
117+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
118+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
119+ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
120+ set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
121+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
122+ set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/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 97e8c5e..9b03652 100644
128--- a/inference-engine/cmake/ie_parallel.cmake
129+++ b/inference-engine/cmake/ie_parallel.cmake
130@@ -36,8 +36,8 @@ 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_path(TBB_INCLUDE_DIRS tbb/tbb.h)
137+ find_library(TBB_LIBRARIES_RELEASE tbb)
138 ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}")
139 ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}")
140 if (NOT LINUX)
141@@ -98,7 +98,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
142 endif ()
143
144 if (NOT OMP_LIBRARIES_RELEASE)
145- find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH)
146+ find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name})
147 ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}")
148 if (NOT LINUX)
149 find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH)
150diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake
151index 6713808..7e5e47a 100644
152--- a/inference-engine/cmake/linux_name.cmake
153+++ b/inference-engine/cmake/linux_name.cmake
154@@ -5,7 +5,7 @@
155 if (LINUX)
156 function(get_linux_name res_var)
157 if (NOT EXISTS "/etc/lsb-release")
158- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
159+ execute_process(COMMAND find /usr/lib/ /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
160 OUTPUT_VARIABLE release_data RESULT_VARIABLE result)
161 set(name_regex "NAME=\"([^ \"\n]*).*\"\n")
162 set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"")
163diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
164index d3a094c..884b0a6 100644
165--- a/inference-engine/samples/CMakeLists.txt
166+++ b/inference-engine/samples/CMakeLists.txt
167@@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE)
168 set (HAVE_SYS_STAT_H 1)
169 set (HAVE_INTTYPES_H 1)
170
171-add_subdirectory(thirdparty/gflags)
172-
173 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
174 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
175 endif()
176diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
177index f4b34ad..2604c32 100644
178--- a/inference-engine/src/inference_engine/CMakeLists.txt
179+++ b/inference-engine/src/inference_engine/CMakeLists.txt
180@@ -116,6 +116,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
181 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
182 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
183 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv")
184+include_directories(${TARGET_NAME} "/usr/include/ngraph")
185
186 if(ENABLE_MKL_DNN)
187 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak")
188@@ -125,7 +126,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT)
189 target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_UNICODE_PATH_SUPPORT)
190 endif()
191
192-set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
193+set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} SOVERSION 1)
194
195 # Static library used for unit tests which are always built
196
197@@ -159,7 +160,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT)
198 target_compile_definitions(${TARGET_NAME}_s PUBLIC ENABLE_UNICODE_PATH_SUPPORT)
199 endif()
200
201-set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
202+set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s SOVERSION 1)
203
204 target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
205 PRIVATE ngraph
206diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
207index 54de20f..4ea20f5 100644
208--- a/inference-engine/thirdparty/CMakeLists.txt
209+++ b/inference-engine/thirdparty/CMakeLists.txt
210@@ -35,10 +35,6 @@ function(build_with_lto)
211 set(CMAKE_RANLIB "gcc-ranlib")
212 endif()
213
214- add_subdirectory(pugixml)
215- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
216- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
217-
218 if (TARGET pugixml_mt)
219 export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
220 export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
221@@ -46,11 +42,6 @@ function(build_with_lto)
222
223 add_subdirectory(stb_lib)
224
225- add_subdirectory(ade)
226- export(TARGETS ade NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
227-
228- include(ngraph.cmake)
229-
230 add_subdirectory(fluid/modules/gapi)
231 export(TARGETS fluid NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
232 endfunction()
233--
2342.7.4
235
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
deleted file mode 100644
index b89964b1..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
+++ /dev/null
@@ -1,267 +0,0 @@
1From 518cd8afb38810924371209416fd5b5d2c23a92e Mon Sep 17 00:00:00 2001
2From: Erin Park <erin.park@intel.com>
3Date: Wed, 11 Sep 2019 10:33:58 -0700
4Subject: [PATCH] R2 Install DLDT headers, libs, sample Apps
5
6-Update to R3
7-Libraries to /usr/lib64
8-Headers to /usr/include
9-Sample Apps executable to /usr/bin
10-Sample Apps source code to /usr/share/doc/inference_engine
11-Python library to ${libdir}/python<version>/site-packages
12-plugins.xml to /usr/share/openvino/inference-engine
13-Create targets_cpu_extension.cmake
14
15Upstream-Status: Pending [Taken from Clear Linux with changes to install
16libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64 and update to R3]
17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
18Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
19---
20 inference-engine/CMakeLists.txt | 2 ++
21 inference-engine/cmake/config.cmake.in | 1 +
22 inference-engine/ie_bridges/python/CMakeLists.txt | 2 +-
23 .../src/openvino/inference_engine/CMakeLists.txt | 4 +++-
24 inference-engine/samples/CMakeLists.txt | 9 +-------
25 .../samples/common/format_reader/CMakeLists.txt | 2 ++
26 inference-engine/src/CMakeLists.txt | 4 +++-
27 inference-engine/src/extension/CMakeLists.txt | 5 ++++-
28 inference-engine/src/hetero_plugin/CMakeLists.txt | 2 ++
29 .../src/inference_engine/CMakeLists.txt | 25 ++++++++++++++++++----
30 .../src/inference_engine/ie_util_internal.cpp | 7 +++---
31 inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 +
32 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 ++
33 inference-engine/tests/unit/CMakeLists.txt | 2 ++
34 14 files changed, 49 insertions(+), 19 deletions(-)
35
36diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
37index a282cb4..abb4de4 100644
38--- a/inference-engine/CMakeLists.txt
39+++ b/inference-engine/CMakeLists.txt
40@@ -70,3 +70,5 @@ if (ENABLE_PYTHON)
41 endif()
42
43 add_cpplint_report_target()
44+
45+install(DIRECTORY samples DESTINATION share/doc/inference_engine)
46diff --git a/inference-engine/cmake/config.cmake.in b/inference-engine/cmake/config.cmake.in
47index ebe82ee..0d7e6a4 100644
48--- a/inference-engine/cmake/config.cmake.in
49+++ b/inference-engine/cmake/config.cmake.in
50@@ -7,6 +7,7 @@ if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine)
51 set(InferenceEngine_LIBRARIES inference_engine)
52 else()
53 include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake")
54+ include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake")
55 if(NOT WIN32)
56 set_target_properties(IE::inference_engine PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-error=deprecated-declarations")
57 endif()
58diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
59index bba853f..444cce9 100644
60--- a/inference-engine/ie_bridges/python/CMakeLists.txt
61+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
62@@ -53,4 +53,4 @@ endif()
63
64 set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
65 add_subdirectory (src/openvino/inference_engine)
66-add_subdirectory (src/openvino/tools/statistics_collector)
67+#add_subdirectory (src/openvino/tools/statistics_collector)
68diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
69index 1f46013..952c173 100644
70--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
71+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
72@@ -29,4 +29,6 @@ ADD_CUSTOM_COMMAND (TARGET ${TARGET_NAME}
73 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/inference_engine/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py
74 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/requirements.txt ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../../requirements.txt
75 COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../__init__.py
76-)
77\ No newline at end of file
78+)
79+
80+install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/)
81diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
82index 884b0a6..25f9f23 100644
83--- a/inference-engine/samples/CMakeLists.txt
84+++ b/inference-engine/samples/CMakeLists.txt
85@@ -39,14 +39,6 @@ if(NOT(UNIX))
86 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
87 set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER})
88 set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
89-else ()
90- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
91- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
92- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
93- set (CMAKE_PDB_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
94- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
95- set (LIBRARY_OUTPUT_DIRECTORY ${IE_MAIN_SAMPLES_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
96- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
97 endif()
98
99 if (WIN32)
100@@ -188,6 +180,7 @@ macro(ie_add_sample)
101 if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT)
102 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME})
103 endif()
104+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
105 endmacro()
106
107
108diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
109index a8c9caf..dffa8cb 100644
110--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
111+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
112@@ -40,3 +40,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
113
114 export(TARGETS ${TARGET_NAME} NAMESPACE IE::
115 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
116+
117+install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
118diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt
119index 63fda2a..350e3f5 100644
120--- a/inference-engine/src/CMakeLists.txt
121+++ b/inference-engine/src/CMakeLists.txt
122@@ -37,8 +37,10 @@ set(InferenceEngine_SRC_DIRS ${CMAKE_SOURCE_DIR}/src)
123 function(set_target_cpu_flags TARGET_NAME)
124 endfunction()
125
126-add_subdirectory(extension EXCLUDE_FROM_ALL)
127+add_subdirectory(extension)
128 add_library(IE::ie_cpu_extension ALIAS ie_cpu_extension)
129
130 file(GLOB_RECURSE EXTENSION_SOURCES extension/*.cpp extension/*.hpp extension/*.h)
131 add_cpplint_target(ie_cpu_extension_cpplint FOR_SOURCES ${EXTENSION_SOURCES})
132+
133+install(DIRECTORY extension DESTINATION include/inference_engine)
134diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
135index 799a62d..fb14ebe 100644
136--- a/inference-engine/src/extension/CMakeLists.txt
137+++ b/inference-engine/src/extension/CMakeLists.txt
138@@ -49,7 +49,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "cpu_extension")
139
140 target_link_libraries(${TARGET_NAME} PRIVATE ${InferenceEngine_LIBRARIES})
141
142-target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
143+target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
144 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
145
146 set_target_cpu_flags(${TARGET_NAME})
147@@ -61,3 +61,6 @@ if (IE_MAIN_SOURCE_DIR)
148 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
149 endif()
150
151+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
152+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
153+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets_cpu_extension.cmake)
154diff --git a/inference-engine/src/hetero_plugin/CMakeLists.txt b/inference-engine/src/hetero_plugin/CMakeLists.txt
155index fdb1b0f..4955dc9 100644
156--- a/inference-engine/src/hetero_plugin/CMakeLists.txt
157+++ b/inference-engine/src/hetero_plugin/CMakeLists.txt
158@@ -21,3 +21,5 @@ target_include_directories(${TARGET_NAME} PRIVATE
159 )
160
161 target_link_libraries(${TARGET_NAME} PRIVATE inference_engine ade)
162+
163+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
164diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
165index 2604c32..54d3828 100644
166--- a/inference-engine/src/inference_engine/CMakeLists.txt
167+++ b/inference-engine/src/inference_engine/CMakeLists.txt
168@@ -110,8 +110,11 @@ if(WIN32)
169 endif()
170
171 # Properties->C/C++->General->Additional Include Directories
172-target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
173- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
174+target_include_directories(${TARGET_NAME} PUBLIC
175+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
176+ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
177+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
178+ "${IE_MAIN_SOURCE_DIR}/src/dumper")
179
180 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
181 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
182@@ -137,7 +140,9 @@ add_library(${TARGET_NAME}_s STATIC
183 set_ie_threading_interface_for(${TARGET_NAME}_s)
184
185 # Properties->C/C++->General->Additional Include Directories
186-target_include_directories(${TARGET_NAME}_s PUBLIC "${PUBLIC_HEADERS_DIR}"
187+target_include_directories(${TARGET_NAME}_s PUBLIC
188+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
189+ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
190 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
191 PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper")
192
193@@ -173,7 +178,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
194 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
195
196 ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
197- POSSIBLE_PLUGINS MultiDevicePlugin HeteroPlugin clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin HDDLPlugin)
198+ P $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
199++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>OSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
200
201 # export targets
202 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: FILE "${CMAKE_BINARY_DIR}/targets.cmake")
203@@ -204,3 +210,14 @@ configure_file(
204 "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in"
205 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
206 COPYONLY)
207+
208+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine)
209+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
210+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets.cmake)
211+install(DIRECTORY ${PUBLIC_HEADERS_DIR}/ DESTINATION include/${TARGET_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
212+install(FILES
213+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake"
214+ "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
215+ DESTINATION ${ConfigPackageLocation})
216+
217+install(FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml" DESTINATION /usr/share/openvino/inference-engine)
218diff --git a/inference-engine/src/inference_engine/ie_util_internal.cpp b/inference-engine/src/inference_engine/ie_util_internal.cpp
219index 1a2f078..b2668a9 100644
220--- a/inference-engine/src/inference_engine/ie_util_internal.cpp
221+++ b/inference-engine/src/inference_engine/ie_util_internal.cpp
222@@ -760,9 +760,10 @@ std::string getIELibraryPath() {
223 GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path));
224 return getPathName(ie_library_path);
225 #else
226- Dl_info info;
227- dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
228- return getPathName(info.dli_fname);
229+ //Dl_info info;
230+ //dladdr(reinterpret_cast<void *>(getIELibraryPath), &info);
231+ //return getPathName(info.dli_fname);
232+ return "/usr/share/openvino/inference-engine";
233 #endif
234 }
235
236diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
237index d767724..80d33e6 100644
238--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
239+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
240@@ -69,3 +69,4 @@ target_compile_definitions(test_${TARGET_NAME} PUBLIC -DMKLDNN_THR=${MKLDNN_THR}
241 target_link_libraries(test_${TARGET_NAME} PRIVATE inference_engine_s mkldnn)
242
243 set_target_properties(test_${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME test_${TARGET_NAME})
244+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
245diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
246index 7023513..b533f07 100644
247--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
248+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
249@@ -36,3 +36,5 @@ endif()
250 target_link_libraries(${TARGET_NAME}
251 PRIVATE
252 ${INTEL_ITT_LIBS} inference_engine vpu_graph_transformer mvnc)
253+
254+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
255diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
256index 8180802..2d37b1e 100644
257--- a/inference-engine/tests/unit/CMakeLists.txt
258+++ b/inference-engine/tests/unit/CMakeLists.txt
259@@ -122,3 +122,5 @@ add_test(NAME ${TARGET_NAME}
260 COMMAND ${TARGET_NAME})
261
262 add_dependencies(${TARGET_NAME} mock_engine)
263+
264+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
265--
2662.7.4
267
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
deleted file mode 100644
index c6371181..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From 32c30549fa821b0df3f5f7fdf33d7989a9f1a776 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 3/7] 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 inference-engine/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 c39fe5c..03e5bad 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 99e947e..fb25578 100644
30--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
31+++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
32@@ -206,17 +206,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.7.4
81
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
deleted file mode 100644
index ca912fdf..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
+++ /dev/null
@@ -1,97 +0,0 @@
1From 1ca4d5de754c6ee90f685f2706f657800cad8386 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 27 Sep 2019 20:32:08 +0800
4Subject: [PATCH 4/7] disable werror
5
6This shouldn't be enabled and leads to multiple errors when compiling
7cldnn and samples.
8
9Upstream-Status: Pending
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
13---
14 inference-engine/cmake/os_flags.cmake | 1 -
15 inference-engine/samples/CMakeLists.txt | 1 -
16 inference-engine/src/extension/CMakeLists.txt | 1 -
17 inference-engine/thirdparty/clDNN/CMakeLists.txt | 2 --
18 inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake | 1 -
19 inference-engine/tools/CMakeLists.txt | 1 -
20 6 files changed, 7 deletions(-)
21
22diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake
23index ad15859..d471246 100644
24--- a/inference-engine/cmake/os_flags.cmake
25+++ b/inference-engine/cmake/os_flags.cmake
26@@ -47,7 +47,6 @@ if (WIN32)
27 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}")
28 endif()
29 else()
30- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ")
31 if (APPLE)
32 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
33 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
34diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
35index 25f9f23..9aa5d5a 100644
36--- a/inference-engine/samples/CMakeLists.txt
37+++ b/inference-engine/samples/CMakeLists.txt
38@@ -59,7 +59,6 @@ if (WIN32)
39 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
40 endif()
41 else()
42- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") #treating warnings as errors
43 if (APPLE)
44 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
45 elseif(UNIX)
46diff --git a/inference-engine/src/extension/CMakeLists.txt b/inference-engine/src/extension/CMakeLists.txt
47index fb14ebe..228bb8c 100644
48--- a/inference-engine/src/extension/CMakeLists.txt
49+++ b/inference-engine/src/extension/CMakeLists.txt
50@@ -25,7 +25,6 @@ if (WIN32)
51 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4275 /wd4267") #disable some warnings
52 endif()
53 else()
54- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
55 endif()
56
57 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
58diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
59index 03e5bad..b9a3f5d 100644
60--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
61+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
62@@ -760,8 +760,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
63 MultiProcessorCompilation
64 DeadCodeEliminate
65 ExtensionsEnabled
66- TreatWarnAsErrorEnabled
67- WarnLevel4
68 NoFastMath
69 StackProtector
70 )
71diff --git a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
72index a541215..bed8a59 100644
73--- a/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
74+++ b/inference-engine/thirdparty/mkl-dnn/cmake/platform.cmake
75@@ -63,7 +63,6 @@ if(MSVC)
76 endif()
77 elseif(UNIX OR MINGW)
78 append(CMAKE_CCXX_FLAGS "-Wall -Wno-unknown-pragmas")
79- append_if_product(CMAKE_CCXX_FLAGS "-Werror")
80 append(CMAKE_CCXX_FLAGS "-fvisibility=internal")
81 append(CMAKE_C_FLAGS "-std=c99")
82 append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden")
83diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt
84index 3d80df3..b6cb7d8 100644
85--- a/inference-engine/tools/CMakeLists.txt
86+++ b/inference-engine/tools/CMakeLists.txt
87@@ -24,7 +24,6 @@ endif()
88 if (WIN32)
89 # add_compile_options("/WX")
90 else()
91- add_compile_options("-Werror")
92 endif()
93
94 if (ENABLE_OPENCV)
95--
962.7.4
97
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
deleted file mode 100644
index 0a01f5ac..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From c17cee8005b9635699feea98bfc34ede340daf07 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 5/7] 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 54d3828..4a9bedf 100644
15--- a/inference-engine/src/inference_engine/CMakeLists.txt
16+++ b/inference-engine/src/inference_engine/CMakeLists.txt
17@@ -119,7 +119,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 2d37b1e..b98d5a6 100644
28--- a/inference-engine/tests/unit/CMakeLists.txt
29+++ b/inference-engine/tests/unit/CMakeLists.txt
30@@ -83,7 +83,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
40--
412.7.4
42
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch
deleted file mode 100644
index b0c0a5d4..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From e41aafcd133ecf7215e941e01a58fcacd5c91bd7 Mon Sep 17 00:00:00 2001
2From: Chin Huat Ang <chin.huat.ang@intel.com>
3Date: Mon, 30 Sep 2019 13:50:45 +0800
4Subject: [PATCH 6/7] Install clDNN plugin to CMAKE_INSTALL_LIBDIR
5
6Upstream-Status: Pending
7Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
8---
9 inference-engine/src/cldnn_engine/CMakeLists.txt | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
13index b618084..7bdb311 100644
14--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
15+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
16@@ -22,6 +22,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
17 ${IE_MAIN_SOURCE_DIR}/src/inference_engine
18 ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src)
19
20+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
21+
22 # copy default global xml file describing the custom kernels and the *.cl files
23
24 add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
25--
262.7.4
27
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch
deleted file mode 100644
index 2a2b1ba3..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 41c81231a9f3222423510f2b6b10f4e7024150de Mon Sep 17 00:00:00 2001
2From: Chin Huat Ang <chin.huat.ang@intel.com>
3Date: Wed, 16 Oct 2019 13:06:26 +0800
4Subject: [PATCH 7/7] Install mock_engine to CMAKE_INSTALL_LIBDIR
5
6Upstream-Status: Pending
7Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
8---
9 inference-engine/tests/mock_engine/CMakeLists.txt | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt
13index a0f77cf..e23b93a 100644
14--- a/inference-engine/tests/mock_engine/CMakeLists.txt
15+++ b/inference-engine/tests/mock_engine/CMakeLists.txt
16@@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_API
17 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 11)
18 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
19 set_property(TARGET ${TARGET_NAME} PROPERTY COMPILE_PDB_NAME ${TARGET_NAME})
20+
21+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
22--
232.7.4
24
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch
deleted file mode 100644
index a4c75ff3..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch
+++ /dev/null
@@ -1,104 +0,0 @@
1From 1f6f05ae4d3fba95ccc34a4622d06b9d2bf88e80 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 27 Sep 2019 11:34:36 +0800
4Subject: [PATCH] Simplify searching for firmware files
5
6Disable runtime fetching when VPU_FIRMWARE_*_FILE variables are defined
7and point to already fetched firmware instead.
8
9Do it all in one foreach loop.
10
11Upstream-Status: Submitted [https://github.com/opencv/dldt/pull/302]
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 inference-engine/cmake/vpu_dependencies.cmake | 63 ++++++-------------
16 1 file changed, 20 insertions(+), 43 deletions(-)
17
18diff --git a/inference-engine/cmake/vpu_dependencies.cmake b/inference-engine/cmake/vpu_dependencies.cmake
19index 1550163d..e0bc844e 100644
20--- a/inference-engine/cmake/vpu_dependencies.cmake
21+++ b/inference-engine/cmake/vpu_dependencies.cmake
22@@ -4,52 +4,29 @@
23
24 set(VPU_SUPPORTED_SOC ma2450 ma2x8x mv0262)
25
26-#
27-# Default firmware packages
28-#
29-
30-RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450
31- ARCHIVE_UNIFIED firmware_ma2450_759W.zip
32- TARGET_PATH "${TEMP}/vpu/firmware/ma2450"
33- ENVIRONMENT "VPU_FIRMWARE_MA2450"
34- FOLDER)
35-debug_message(STATUS "ma2450=" ${VPU_FIRMWARE_MA2450})
36-
37-RESOLVE_DEPENDENCY(VPU_FIRMWARE_MV0262
38- ARCHIVE_UNIFIED firmware_mv0262_mdk_R9.8.zip
39- TARGET_PATH "${TEMP}/vpu/firmware/mv0262"
40- ENVIRONMENT "VPU_FIRMWARE_MV0262"
41- FOLDER)
42-debug_message(STATUS "mv0262=" ${VPU_FIRMWARE_MV0262})
43-
44-RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2X8X
45- ARCHIVE_UNIFIED firmware_ma2x8x_mdk_R9.8.zip
46- TARGET_PATH "${TEMP}/vpu/firmware/ma2x8x"
47- ENVIRONMENT "VPU_FIRMWARE_MA2X8X"
48- FOLDER)
49-debug_message(STATUS "ma2x8x=" ${VPU_FIRMWARE_MA2X8X})
50-
51-#
52-# CMake variables to override default firmware files
53-#
54-
55 foreach(soc IN LISTS VPU_SUPPORTED_SOC)
56 string(TOUPPER "${soc}" soc_upper)
57- set(var_name VPU_FIRMWARE_${soc_upper}_FILE)
58+ set(var_name_file VPU_FIRMWARE_${soc_upper}_FILE)
59+ set(var_name VPU_FIRMWARE_${soc_upper})
60+ set(var_name_zip firmware_${soc}_mdk_R9.8.zip)
61+ if(${soc} STREQUAL "ma2450")
62+ set(var_name_zip firmware_${soc}_759W.zip)
63+ endif()
64
65- find_file(${var_name} MvNCAPI-${soc}.mvcmd "${VPU_FIRMWARE_${soc_upper}}/mvnc")
66- if(NOT ${var_name})
67- message(FATAL_ERROR "[VPU] Missing ${soc} firmware")
68+ if(NOT DEFINED ${var_name_file})
69+ RESOLVE_DEPENDENCY(${var_name}
70+ ARCHIVE_UNIFIED ${var_name_zip}
71+ TARGET_PATH "${TEMP}/vpu/firmware/${soc}"
72+ ENVIRONMENT "${var_name}"
73+ FOLDER)
74+ find_file(${var_name_file} NAMES "MvNCAPI-${soc}.mvcmd" PATHS "${VPU_FIRMWARE_${soc_upper}}/mvnc" NO_CMAKE_FIND_ROOT_PATH)
75 endif()
76-endforeach()
77
78-#
79-# `vpu_copy_firmware` CMake target
80-#
81+ if(NOT ${var_name_file})
82+ message(FATAL_ERROR "[VPU] Missing ${soc} firmware, MvNCAPI-${soc}.mvcmd not found in ${VPU_FIRMWARE_${soc_upper}}/mvnc env $ENV{${var_name}} ")
83+ endif()
84
85-foreach(soc IN LISTS VPU_SUPPORTED_SOC)
86- string(TOUPPER "${soc}" soc_upper)
87- set(var_name VPU_FIRMWARE_${soc_upper}_FILE)
88+ debug_message(STATUS "${soc}=" ${${var_name_file}})
89
90 set(firmware_out_file "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/MvNCAPI-${soc}.mvcmd")
91 list(APPEND all_firmware_files ${firmware_out_file})
92@@ -57,9 +34,9 @@ foreach(soc IN LISTS VPU_SUPPORTED_SOC)
93 add_custom_command(
94 OUTPUT ${firmware_out_file}
95 COMMAND
96- ${CMAKE_COMMAND} -E copy ${${var_name}} ${firmware_out_file}
97- MAIN_DEPENDENCY ${${var_name}}
98- COMMENT "[VPU] Copy ${${var_name}} to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
99+ ${CMAKE_COMMAND} -E copy ${${var_name_file}} ${firmware_out_file}
100+ MAIN_DEPENDENCY ${${var_name_file}}
101+ COMMENT "[VPU] Copy ${${var_name_file}} to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
102 VERBATIM)
103 endforeach()
104
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
deleted file mode 100644
index 92f238a9..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest
+++ /dev/null
@@ -1,13 +0,0 @@
1#!/bin/sh
2
3# InferenceEngineUnitTests requires libmock_engine.so, since they are
4# installed in the same directory we will need to set LD_LIBRARY_PATH
5# so that libmock_engine.so is picked up correctly. We also assume that
6# this script is only execute within the same directory where it is
7# installed.
8
9export LD_LIBRARY_PATH=.
10
11./InferenceEngineUnitTests |sed \
12 -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \
13 -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|'
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-01 21:16:54 +0000