From 78386dd80bcc9b740c181ce4718af7e0b328f85a Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 5 Jun 2020 01:26:01 +0800 Subject: openvino-inference-engine: upgrade 2020.1 -> 2020.3.0 * Point to the renamed repository and change the project name to openvino-inference-engine. * Include ngraph as a submodule instead of using it as a separate project. * Use the new unit tests, the old ones have been deprecated. Signed-off-by: Anuj Mittal --- .../0005-cldnn-fix-inclusion-of-headers.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch') 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 new file mode 100644 index 00000000..1b842da2 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch @@ -0,0 +1,52 @@ +From 0d0810481186fc443fe65a6119ddcc71ba21e814 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Wed, 10 Jun 2020 09:50:19 +0800 +Subject: [PATCH 5/5] cldnn: fix inclusion of headers + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal +--- + inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +- + inference-engine/src/cldnn_engine/CMakeLists.txt | 1 + + .../thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp +index fce7d8f1..827e5764 100644 +--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp ++++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp +@@ -21,4 +21,4 @@ + # pragma GCC system_header + #endif + +-#include ++#include +diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt +index de56ed8e..c81453ab 100644 +--- a/inference-engine/src/cldnn_engine/CMakeLists.txt ++++ b/inference-engine/src/cldnn_engine/CMakeLists.txt +@@ -31,6 +31,7 @@ set (CLDNN_TOP_FOLDER ${IE_MAIN_SOURCE_DIR}/thirdparty/clDNN) + target_include_directories(${TARGET_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CLDNN__IOCL_ICD_INCDIRS} ++ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp + ${CLDNN_TOP_FOLDER}) + + # copy default global xml file describing the custom kernels and the *.cl files +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 +index 8f668b18..a1d24438 100644 +--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp ++++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp +@@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; + typedef cl_va_api_device_source_intel cl_device_source_intel; + typedef cl_va_api_device_set_intel cl_device_set_intel; + #endif +-#include ++#include + #include "cl_intel_usm_defs.h" + + #include +-- +2.25.4 + -- cgit v1.2.3-54-g00ecf