summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/compute-runtime/files/113cef897712c8b475f668f2bcf77a12db76a90e.patch45
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb1
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch26
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch27
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch46
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch26
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb4
-rw-r--r--dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb2
-rw-r--r--dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb2
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb2
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch62
11 files changed, 217 insertions, 26 deletions
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/files/113cef897712c8b475f668f2bcf77a12db76a90e.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/files/113cef897712c8b475f668f2bcf77a12db76a90e.patch
new file mode 100644
index 00000000..5edb52d0
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/files/113cef897712c8b475f668f2bcf77a12db76a90e.patch
@@ -0,0 +1,45 @@
1From a72b1fe0c571c191d857297114e0393ce017b7ab Mon Sep 17 00:00:00 2001
2From: Mateusz Jablonski <mateusz.jablonski@intel.com>
3Date: Wed, 28 Jul 2021 09:25:56 +0000
4Subject: [PATCH] Add missing includes
5
6Signed-off-by: Florian Minnecker <florian.github@minnecker.com>
7Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
8
9Upstream-Status: Backport
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 shared/source/helpers/basic_math.h | 3 ++-
13 shared/source/helpers/registered_method_dispatcher.h | 1 +
14 2 files changed, 3 insertions(+), 1 deletion(-)
15
16diff --git a/shared/source/helpers/basic_math.h b/shared/source/helpers/basic_math.h
17index fd62b9e6b..f339677eb 100644
18--- a/shared/source/helpers/basic_math.h
19+++ b/shared/source/helpers/basic_math.h
20@@ -11,8 +11,9 @@
21 #include <algorithm>
22 #include <cmath>
23 #include <cstdint>
24+#include <cstdio>
25 #include <cstdlib>
26-#include <stdio.h>
27+#include <limits>
28
29 #define KB 1024uLL
30 #define MB (KB * KB)
31diff --git a/shared/source/helpers/registered_method_dispatcher.h b/shared/source/helpers/registered_method_dispatcher.h
32index 56f880a16..cd778fad0 100644
33--- a/shared/source/helpers/registered_method_dispatcher.h
34+++ b/shared/source/helpers/registered_method_dispatcher.h
35@@ -7,6 +7,7 @@
36
37 #pragma once
38
39+#include <cstddef>
40 #include <cstdint>
41 #include <functional>
42
43--
442.37.3
45
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb
index 5525b66a..eb17b642 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae27f47fd6755510247c19e547e4c804 \
9 file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" 9 file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
10 10
11SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \ 11SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \
12 file://113cef897712c8b475f668f2bcf77a12db76a90e.patch \
12 " 13 "
13 14
14SRCREV = "e0633548a9bd025c70bc7f3539eef094b1bc9ce1" 15SRCREV = "e0633548a9bd025c70bc7f3539eef094b1bc9ce1"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch
new file mode 100644
index 00000000..0a4a0fd9
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch
@@ -0,0 +1,26 @@
1From a36a4788a52128e5ccbec4cd29eb167153dcc8b8 Mon Sep 17 00:00:00 2001
2From: Diana Chen <po-yu.chen@intel.com>
3Date: Mon, 11 Jan 2021 19:06:36 +0000
4Subject: [PATCH] IGA: Add missing header
5
6Upstream-Status: Backport
7Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
8---
9 visa/iga/IGALibrary/IR/SWSBSetter.cpp | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.cpp b/visa/iga/IGALibrary/IR/SWSBSetter.cpp
13index 87f119f3b..6956edf0d 100644
14--- a/visa/iga/IGALibrary/IR/SWSBSetter.cpp
15+++ b/visa/iga/IGALibrary/IR/SWSBSetter.cpp
16@@ -27,6 +27,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17 #include "Traversals.hpp"
18 #include "BitSet.hpp"
19 #include <iterator>
20+#include <limits>
21 using namespace iga;
22
23 /**
24--
252.37.3
26
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
new file mode 100644
index 00000000..68131584
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
@@ -0,0 +1,27 @@
1From 79a95322fc5ae21c3380f6455b28b931c98b2d13 Mon Sep 17 00:00:00 2001
2From: Marcin Naczk <marcin.naczk@intel.com>
3Date: Tue, 22 Feb 2022 13:09:54 +0000
4Subject: [PATCH] Upgrade github Action build IGC
5
6- Fix build IGC on Ubuntu 22.04 by adding missing include
7
8Upstream-Status: Backport
9Part of: https://github.com/intel/intel-graphics-compiler/commit/4369c970d4e02258b3c53e854faaa34197124a33
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11
12---
13 visa/iga/IGALibrary/IR/SWSBSetter.hpp | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.hpp b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
17index 5a7ad75c0..02d52add2 100644
18--- a/visa/iga/IGALibrary/IR/SWSBSetter.hpp
19+++ b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
20@@ -32,6 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21 #include "Operand.hpp"
22 #include "../ErrorHandler.hpp"
23 #include "RegDeps.hpp"
24+#include <limits>
25
26 namespace iga
27 {
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch
new file mode 100644
index 00000000..b88e9678
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch
@@ -0,0 +1,46 @@
1From a58dd6de4c29595a0f93cff167b487d777e4559e Mon Sep 17 00:00:00 2001
2From: "Szymichowski, Pawel" <pawel.szymichowski@intel.com>
3Date: Wed, 8 Apr 2020 08:24:05 -0700
4Subject: [PATCH] Changes in code.
5
6Change-Id: Ica75407e834f6b3439912bd0b47a6b30a6521fc7
7
8Upstream-Status: Backport
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10---
11 visa/iga/IGALibrary/api/igax.hpp | 21 ++++++++++++---------
12 1 file changed, 12 insertions(+), 9 deletions(-)
13
14diff --git a/visa/iga/IGALibrary/api/igax.hpp b/visa/iga/IGALibrary/api/igax.hpp
15index 4f1c680c6a9..6d17cd99b6a 100644
16--- a/visa/iga/IGALibrary/api/igax.hpp
17+++ b/visa/iga/IGALibrary/api/igax.hpp
18@@ -492,16 +492,19 @@ inline iga::Op OpSpec::op() const
19 }
20
21
22-#define IGA_OPSPEC_STRING_GETTER(API, INITSIZE) { \
23- char _staticBuf[INITSIZE]; \
24- char *strPtr = &_staticBuf[0]; \
25- size_t strCap = sizeof(_staticBuf); \
26- IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \
27- if (strCap > sizeof(_staticBuf)) { \
28- strPtr = (char *)alloca(strCap); \
29+#define IGA_OPSPEC_STRING_GETTER(API, INITSIZE) { \
30+ char _staticBuf[INITSIZE]; \
31+ char *strPtr = &_staticBuf[0]; \
32+ size_t strCap = sizeof(_staticBuf); \
33+ IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \
34+ if (strCap > sizeof(_staticBuf)) { \
35+ strPtr = (char *)malloc(strCap); \
36 IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \
37- } \
38- return std::string(strPtr); \
39+ std::string res(strPtr); \
40+ free(strPtr); \
41+ return res; \
42+ } \
43+ return std::string(strPtr); \
44 }
45 inline std::string OpSpec::menmonic() const
46 IGA_OPSPEC_STRING_GETTER(iga_opspec_mnemonic, 16);
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
new file mode 100644
index 00000000..6efd51bc
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
@@ -0,0 +1,26 @@
1From 59d5ba1517c48a9e629994917a6e90207df26b08 Mon Sep 17 00:00:00 2001
2From: Bruno Pagani <bruno.n.pagani@gmail.com>
3Date: Mon, 21 Feb 2022 12:32:25 +0000
4Subject: [PATCH] Fix missing include
5
6Same as 6c805b2
7
8Upstream-Status: Backport
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
11---
12 visa/LocalScheduler/SWSB_G4IR.cpp | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/visa/LocalScheduler/SWSB_G4IR.cpp b/visa/LocalScheduler/SWSB_G4IR.cpp
16index 0ef7961a0..bb631117d 100644
17--- a/visa/LocalScheduler/SWSB_G4IR.cpp
18+++ b/visa/LocalScheduler/SWSB_G4IR.cpp
19@@ -26,6 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20
21 #include <fstream>
22 #include <functional>
23+#include <limits>
24 #include <sstream>
25 #include "SWSB_G4IR.h"
26 #include "../G4_Opcode.h"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb
index 6cfa0b6d..5474f8a7 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb
@@ -9,6 +9,10 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
9 9
10SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \ 10SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \
11 file://0001-skip-execution-of-ElfPackager.patch \ 11 file://0001-skip-execution-of-ElfPackager.patch \
12 file://a58dd6de4c29595a0f93cff167b487d777e4559e.patch \
13 file://0001-IGA-Add-missing-header.patch \
14 file://4369c970d4e02258b3c53e854faaa34197124a33.patch \
15 file://fix-header.patch \
12 " 16 "
13 17
14SRCREV = "577887bf74c51a6084058836720fe58f8c35ca58" 18SRCREV = "577887bf74c51a6084058836720fe58f8c35ca58"
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb
index 26068acc..feeb036b 100644
--- a/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb
+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb
@@ -5,7 +5,7 @@ environment, performs static model analysis, and adjusts deep \
5learning models for optimal execution on end-point target devices." 5learning models for optimal execution on end-point target devices."
6HOMEPAGE = "https://01.org/openvinotoolkit" 6HOMEPAGE = "https://01.org/openvinotoolkit"
7 7
8SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2020 \ 8SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;lfs=0 \
9 " 9 "
10SRCREV = "b2140c083a068a63591e8c2e9b5f6b240790519d" 10SRCREV = "b2140c083a068a63591e8c2e9b5f6b240790519d"
11 11
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb
index d5793500..bdd5aafc 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb
@@ -10,7 +10,7 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
10 10
11COMPATIBLE_HOST_libc-musl = "null" 11COMPATIBLE_HOST_libc-musl = "null"
12 12
13inherit cmake systemd 13inherit cmake systemd features_check
14 14
15DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native connman" 15DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native connman"
16 16
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb
index 42d223c9..a0244227 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
4deep learning models through a high-level C++ Inference Engine API \ 4deep learning models through a high-level C++ Inference Engine API \
5integrated with application logic." 5integrated with application logic."
6 6
7SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2020 \ 7SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;lfs=0 \
8 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2450_942_R10.15.zip;name=ma2450 \ 8 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2450_942_R10.15.zip;name=ma2450 \
9 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_pcie-ma248x_942_R10.15.zip;name=ma248x \ 9 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_pcie-ma248x_942_R10.15.zip;name=ma248x \
10 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2x8x_942_R10.15.zip;name=ma2x8x \ 10 https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2x8x_942_R10.15.zip;name=ma2x8x \
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
index c4c7bd01..d77380d2 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
@@ -1,4 +1,4 @@
1From 1c78ff3ff1f77c78a618f7a780985cef1933bb2b Mon Sep 17 00:00:00 2001 1From 10dfcd0fb5c0f8d79981f59c9c363311143f640b Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Mon, 13 Apr 2020 15:20:28 +0800 3Date: Mon, 13 Apr 2020 15:20:28 +0800
4Subject: [PATCH] Installation and build fixes 4Subject: [PATCH] Installation and build fixes
@@ -30,13 +30,14 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
30 .../clDNN/CMakeCompilerLinkerOpts.txt | 2 -- 30 .../clDNN/CMakeCompilerLinkerOpts.txt | 2 --
31 .../thirdparty/clDNN/CMakeLists.txt | 1 - 31 .../thirdparty/clDNN/CMakeLists.txt | 1 -
32 .../clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +- 32 .../clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +-
33 .../thirdparty/clDNN/src/CMakeLists.txt | 4 ++--
33 .../tools/compile_tool/CMakeLists.txt | 2 +- 34 .../tools/compile_tool/CMakeLists.txt | 2 +-
34 .../tools/vpu/vpu_compile/CMakeLists.txt | 4 ++-- 35 .../tools/vpu/vpu_compile/CMakeLists.txt | 4 ++--
35 .../tools/vpu/vpu_perfcheck/CMakeLists.txt | 2 +- 36 .../tools/vpu/vpu_perfcheck/CMakeLists.txt | 2 +-
36 20 files changed, 28 insertions(+), 53 deletions(-) 37 21 files changed, 30 insertions(+), 55 deletions(-)
37 38
38diff --git a/CMakeLists.txt b/CMakeLists.txt 39diff --git a/CMakeLists.txt b/CMakeLists.txt
39index e48cee57..e9598455 100644 40index e48cee574a7..e9598455971 100644
40--- a/CMakeLists.txt 41--- a/CMakeLists.txt
41+++ b/CMakeLists.txt 42+++ b/CMakeLists.txt
42@@ -120,8 +120,6 @@ function(build_ngraph) 43@@ -120,8 +120,6 @@ function(build_ngraph)
@@ -49,7 +50,7 @@ index e48cee57..e9598455 100644
49 50
50 build_ngraph() 51 build_ngraph()
51diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake 52diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
52index e59edb2b..35672cac 100644 53index e59edb2b9c4..35672cac7e1 100644
53--- a/cmake/developer_package.cmake 54--- a/cmake/developer_package.cmake
54+++ b/cmake/developer_package.cmake 55+++ b/cmake/developer_package.cmake
55@@ -5,7 +5,9 @@ 56@@ -5,7 +5,9 @@
@@ -82,7 +83,7 @@ index e59edb2b..35672cac 100644
82 # Enable postfixes for Debug/Release builds 83 # Enable postfixes for Debug/Release builds
83 set(IE_DEBUG_POSTFIX_WIN "d") 84 set(IE_DEBUG_POSTFIX_WIN "d")
84diff --git a/cmake/os_flags.cmake b/cmake/os_flags.cmake 85diff --git a/cmake/os_flags.cmake b/cmake/os_flags.cmake
85index 6f70768f..40141aca 100644 86index 6f70768f9f1..40141aca8ad 100644
86--- a/cmake/os_flags.cmake 87--- a/cmake/os_flags.cmake
87+++ b/cmake/os_flags.cmake 88+++ b/cmake/os_flags.cmake
88@@ -139,7 +139,6 @@ if(WIN32) 89@@ -139,7 +139,6 @@ if(WIN32)
@@ -94,7 +95,7 @@ index 6f70768f..40141aca 100644
94 ie_add_compiler_flags(-fvisibility=hidden) 95 ie_add_compiler_flags(-fvisibility=hidden)
95 ie_add_compiler_flags(-fdiagnostics-show-option) 96 ie_add_compiler_flags(-fdiagnostics-show-option)
96diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt 97diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
97index d5feedb4..1ee656a1 100644 98index d5feedb498d..1ee656a18e1 100644
98--- a/inference-engine/CMakeLists.txt 99--- a/inference-engine/CMakeLists.txt
99+++ b/inference-engine/CMakeLists.txt 100+++ b/inference-engine/CMakeLists.txt
100@@ -123,12 +123,13 @@ install(FILES samples/CMakeLists.txt 101@@ -123,12 +123,13 @@ install(FILES samples/CMakeLists.txt
@@ -124,7 +125,7 @@ index d5feedb4..1ee656a1 100644
124 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") 125 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
125 126
126diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake 127diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
127index 9ea885be..71733fd9 100644 128index 9ea885be37a..71733fd9d32 100644
128--- a/inference-engine/cmake/ie_parallel.cmake 129--- a/inference-engine/cmake/ie_parallel.cmake
129+++ b/inference-engine/cmake/ie_parallel.cmake 130+++ b/inference-engine/cmake/ie_parallel.cmake
130@@ -42,14 +42,8 @@ function(set_ie_threading_interface_for TARGET_NAME) 131@@ -42,14 +42,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
@@ -145,7 +146,7 @@ index 9ea885be..71733fd9 100644
145 if (WIN32) 146 if (WIN32)
146 set(omp_lib_name libiomp5md) 147 set(omp_lib_name libiomp5md)
147diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 148diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
148index fce7d8f1..827e5764 100644 149index fce7d8f1784..827e5764aa7 100644
149--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 150--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
150+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp 151+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
151@@ -21,4 +21,4 @@ 152@@ -21,4 +21,4 @@
@@ -155,7 +156,7 @@ index fce7d8f1..827e5764 100644
155-#include <CL/cl2.hpp> 156-#include <CL/cl2.hpp>
156+#include <cl2.hpp> 157+#include <cl2.hpp>
157diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 158diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
158index f355e7b9..d24c7c78 100644 159index f355e7b951c..d24c7c78e6f 100644
159--- a/inference-engine/samples/CMakeLists.txt 160--- a/inference-engine/samples/CMakeLists.txt
160+++ b/inference-engine/samples/CMakeLists.txt 161+++ b/inference-engine/samples/CMakeLists.txt
161@@ -24,7 +24,7 @@ endif() 162@@ -24,7 +24,7 @@ endif()
@@ -188,7 +189,7 @@ index f355e7b9..d24c7c78 100644
188 189
189 # collect all samples subdirectories 190 # collect all samples subdirectories
190diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt 191diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
191index 6d935135..fe12eeb7 100644 192index 6d935135e9d..fe12eeb7193 100644
192--- a/inference-engine/samples/common/format_reader/CMakeLists.txt 193--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
193+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt 194+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
194@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" 195@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -198,7 +199,7 @@ index 6d935135..fe12eeb7 100644
198+ 199+
199+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) 200+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
200diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt 201diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
201index 43344e7f..50beda23 100644 202index 43344e7ff07..50beda23415 100644
202--- a/inference-engine/src/cldnn_engine/CMakeLists.txt 203--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
203+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt 204+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
204@@ -32,6 +32,7 @@ target_include_directories(${TARGET_NAME} PRIVATE 205@@ -32,6 +32,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
@@ -210,7 +211,7 @@ index 43344e7f..50beda23 100644
210 211
211 # copy default global xml file describing the custom kernels and the *.cl files 212 # copy default global xml file describing the custom kernels and the *.cl files
212diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 213diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
213index 54e264c8..e3809654 100644 214index 54e264c824c..e3809654635 100644
214--- a/inference-engine/src/inference_engine/CMakeLists.txt 215--- a/inference-engine/src/inference_engine/CMakeLists.txt
215+++ b/inference-engine/src/inference_engine/CMakeLists.txt 216+++ b/inference-engine/src/inference_engine/CMakeLists.txt
216@@ -292,20 +292,6 @@ if(threading_tbb) 217@@ -292,20 +292,6 @@ if(threading_tbb)
@@ -247,7 +248,7 @@ index 54e264c8..e3809654 100644
247 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml 248 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
248 DESTINATION ${IE_CPACK_LIBRARY_PATH} 249 DESTINATION ${IE_CPACK_LIBRARY_PATH}
249diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 250diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
250index 32cb534a..858ffefc 100644 251index 32cb534a79e..858ffefcf8e 100644
251--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 252--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
252+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 253+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
253@@ -41,5 +41,5 @@ target_link_libraries(${TARGET_NAME} 254@@ -41,5 +41,5 @@ target_link_libraries(${TARGET_NAME}
@@ -258,7 +259,7 @@ index 32cb534a..858ffefc 100644
258+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d 259+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
259 COMPONENT myriad) 260 COMPONENT myriad)
260diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt 261diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt
261index f3fb53e1..09fb66ce 100644 262index f3fb53e1d29..09fb66cea57 100644
262--- a/inference-engine/tests/mock_engine/CMakeLists.txt 263--- a/inference-engine/tests/mock_engine/CMakeLists.txt
263+++ b/inference-engine/tests/mock_engine/CMakeLists.txt 264+++ b/inference-engine/tests/mock_engine/CMakeLists.txt
264@@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLU 265@@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLU
@@ -268,7 +269,7 @@ index f3fb53e1..09fb66ce 100644
268+ 269+
269+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) 270+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
270diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt 271diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
271index a5c945ae..eabe70d3 100644 272index a5c945ae819..eabe70d3e7b 100644
272--- a/inference-engine/tests/unit/CMakeLists.txt 273--- a/inference-engine/tests/unit/CMakeLists.txt
273+++ b/inference-engine/tests/unit/CMakeLists.txt 274+++ b/inference-engine/tests/unit/CMakeLists.txt
274@@ -187,3 +187,5 @@ add_test(NAME ${TARGET_NAME} 275@@ -187,3 +187,5 @@ add_test(NAME ${TARGET_NAME}
@@ -278,7 +279,7 @@ index a5c945ae..eabe70d3 100644
278+ 279+
279+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 280+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
280diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt 281diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
281index ec22761d..3962d924 100644 282index ec22761d0d5..3962d924fe2 100644
282--- a/inference-engine/thirdparty/CMakeLists.txt 283--- a/inference-engine/thirdparty/CMakeLists.txt
283+++ b/inference-engine/thirdparty/CMakeLists.txt 284+++ b/inference-engine/thirdparty/CMakeLists.txt
284@@ -35,14 +35,12 @@ function(build_with_lto) 285@@ -35,14 +35,12 @@ function(build_with_lto)
@@ -298,7 +299,7 @@ index ec22761d..3962d924 100644
298 ie_developer_export_targets(pugixml_mt) 299 ie_developer_export_targets(pugixml_mt)
299 endif() 300 endif()
300diff --git a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt 301diff --git a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
301index 6b799cdd..91755b35 100644 302index 6b799cdd38f..91755b351e8 100644
302--- a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt 303--- a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
303+++ b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt 304+++ b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
304@@ -206,7 +206,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) 305@@ -206,7 +206,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
@@ -318,7 +319,7 @@ index 6b799cdd..91755b35 100644
318 ALIAS WarnLevel1 WarnLevels REMOVE_GROUP 319 ALIAS WarnLevel1 WarnLevels REMOVE_GROUP
319 ALIAS WarnLevel2 "-Wall" 320 ALIAS WarnLevel2 "-Wall"
320diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt 321diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
321index b08c2744..42ca79e6 100644 322index b08c27444a9..42ca79e677c 100644
322--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt 323--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
323+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt 324+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
324@@ -767,7 +767,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") 325@@ -767,7 +767,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
@@ -330,7 +331,7 @@ index b08c2744..42ca79e6 100644
330 NoFastMath 331 NoFastMath
331 StackProtector 332 StackProtector
332diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp 333diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
333index a9e379bd..8b822223 100644 334index a9e379bdee6..8b822223681 100644
334--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp 335--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
335+++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp 336+++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
336@@ -30,7 +30,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; 337@@ -30,7 +30,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel;
@@ -342,8 +343,23 @@ index a9e379bd..8b822223 100644
342 343
343 namespace cl { 344 namespace cl {
344 typedef CL_API_ENTRY cl_int(CL_API_CALL *PFN_clEnqueueAcquireMediaSurfacesINTEL)( 345 typedef CL_API_ENTRY cl_int(CL_API_CALL *PFN_clEnqueueAcquireMediaSurfacesINTEL)(
346diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
347index 99e947eeb83..5ce0fc5086a 100644
348--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
349+++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
350@@ -213,8 +213,8 @@ install(DIRECTORY "${CLDNN__API_DIR}/"
351 )
352 # Binaries.
353 install(TARGETS "${CLDNN_BUILD__PROJ}"
354- ARCHIVE DESTINATION "lib"
355- LIBRARY DESTINATION "lib"
356+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
357+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
358 RUNTIME DESTINATION "bin"
359 INCLUDES DESTINATION "include/clDNN"
360 )
345diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt 361diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
346index 25168bac..1c57116f 100644 362index 25168bacf58..1c57116ff04 100644
347--- a/inference-engine/tools/compile_tool/CMakeLists.txt 363--- a/inference-engine/tools/compile_tool/CMakeLists.txt
348+++ b/inference-engine/tools/compile_tool/CMakeLists.txt 364+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
349@@ -48,5 +48,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 365@@ -48,5 +48,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -354,7 +370,7 @@ index 25168bac..1c57116f 100644
354+ RUNTIME DESTINATION bin 370+ RUNTIME DESTINATION bin
355 COMPONENT core) 371 COMPONENT core)
356diff --git a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt 372diff --git a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
357index 4123de6f..52179fac 100644 373index 4123de6fda9..52179facafe 100644
358--- a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt 374--- a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
359+++ b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt 375+++ b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
360@@ -50,5 +50,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 376@@ -50,5 +50,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -367,7 +383,7 @@ index 4123de6f..52179fac 100644
367+ RUNTIME DESTINATION bin 383+ RUNTIME DESTINATION bin
368+ COMPONENT myriad) 384+ COMPONENT myriad)
369diff --git a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt 385diff --git a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
370index a7a801d4..b8f9e26f 100644 386index a7a801d4e41..b8f9e26f309 100644
371--- a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt 387--- a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
372+++ b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt 388+++ b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
373@@ -55,6 +55,6 @@ if(ENABLE_MYRIAD) 389@@ -55,6 +55,6 @@ if(ENABLE_MYRIAD)
@@ -379,5 +395,5 @@ index a7a801d4..b8f9e26f 100644
379 COMPONENT myriad) 395 COMPONENT myriad)
380 endif() 396 endif()
381-- 397--
3822.25.2 3982.37.3
383 399