diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-08-06 10:03:33 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-08-14 09:48:04 +0800 |
commit | 1937c72e021c7aeb66d3941cce950887f5b0ec93 (patch) | |
tree | 69b5f833a5a67c25f275c964b8269ae3accc60e0 /dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch | |
parent | c783be47b2b7b3e92c652a78bb6c6684ae07bca2 (diff) | |
download | meta-intel-1937c72e021c7aeb66d3941cce950887f5b0ec93.tar.gz |
openvino-inference-engine: upgrade 2020.3 -> 2020.4
For release notes, see:
https://software.intel.com/content/www/us/en/develop/articles/openvino-relnotes.html
The recipe has been changed to:
- disable unit tests as they rely on an older version of googletest.
- remove a patch as it was merged upstream.
- backport a patch instead of using a local version.
- refresh other patches.
- download mkl-dnn separately instead of using the submodule. The
project downloads a lot of other modules as well and we don't
want/use those.
- not download lfs documentation content.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch index 1b842da2..d47d273c 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0d0810481186fc443fe65a6119ddcc71ba21e814 Mon Sep 17 00:00:00 2001 | 1 | From f201d67c965318ebe49f0d38ea36e530c35a4701 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Wed, 10 Jun 2020 09:50:19 +0800 | 3 | Date: Wed, 10 Jun 2020 09:50:19 +0800 |
4 | Subject: [PATCH 5/5] cldnn: fix inclusion of headers | 4 | Subject: [PATCH] cldnn: fix inclusion of headers |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
13 | 3 files changed, 3 insertions(+), 2 deletions(-) | 13 | 3 files changed, 3 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 15 | diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp |
16 | index fce7d8f1..827e5764 100644 | 16 | index fce7d8f17..827e5764a 100644 |
17 | --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 17 | --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp |
18 | +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 18 | +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp |
19 | @@ -21,4 +21,4 @@ | 19 | @@ -21,4 +21,4 @@ |
@@ -23,19 +23,19 @@ index fce7d8f1..827e5764 100644 | |||
23 | -#include <CL/cl2.hpp> | 23 | -#include <CL/cl2.hpp> |
24 | +#include <cl2.hpp> | 24 | +#include <cl2.hpp> |
25 | diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt | 25 | diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt |
26 | index de56ed8e..c81453ab 100644 | 26 | index eeb9b5c80..32a283ba4 100644 |
27 | --- a/inference-engine/src/cldnn_engine/CMakeLists.txt | 27 | --- a/inference-engine/src/cldnn_engine/CMakeLists.txt |
28 | +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt | 28 | +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt |
29 | @@ -31,6 +31,7 @@ set (CLDNN_TOP_FOLDER ${IE_MAIN_SOURCE_DIR}/thirdparty/clDNN) | 29 | @@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE |
30 | target_include_directories(${TARGET_NAME} PRIVATE | ||
31 | ${CMAKE_CURRENT_SOURCE_DIR} | 30 | ${CMAKE_CURRENT_SOURCE_DIR} |
31 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
32 | ${CLDNN__IOCL_ICD_INCDIRS} | 32 | ${CLDNN__IOCL_ICD_INCDIRS} |
33 | + ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp | 33 | + ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp |
34 | ${CLDNN_TOP_FOLDER}) | 34 | ${CLDNN_TOP_FOLDER}) |
35 | 35 | ||
36 | # copy default global xml file describing the custom kernels and the *.cl files | 36 | # install |
37 | diff --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 | 37 | diff --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 |
38 | index 8f668b18..a1d24438 100644 | 38 | index c67c81726..5ca48c597 100644 |
39 | --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 39 | --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp |
40 | +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 40 | +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp |
41 | @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; | 41 | @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; |