meta-intel/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
Anuj Mittal 7aeed42101 openvino: upgrade 2021.1 -> 2021.2
For release notes, see:
https://software.intel.com/content/www/us/en/develop/articles/openvino-relnotes.html

Refresh patches and use the now available option to build against system
version of pugixml.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
2020-12-29 16:35:15 +08:00

54 lines
2.3 KiB
Diff

From aa515686548d74a68456b9ba7a295b6ae4be343a Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Wed, 10 Jun 2020 09:50:19 +0800
Subject: [PATCH] cldnn: fix inclusion of headers
Upstream-Status: Inappropriate
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
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 68ccf3217..c5b0ce6be 100644
--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
@@ -39,7 +39,7 @@
# pragma GCC system_header
#endif
-#include <CL/cl2.hpp>
+#include <cl2.hpp>
#ifdef __GNUC__
# pragma GCC diagnostic pop
diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
index 7e15abbed..46d43e0e5 100644
--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
@@ -31,6 +31,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
${CLDNN__IOCL_ICD_INCDIRS}
+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
${CLDNN_TOP_FOLDER})
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
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 97608c30a..3a04096c0 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 <CL/cl_intel_planar_yuv.h>
+#include <CL/cl_ext_intel.h>
#include "cl_intel_usm_defs.h"
#include <memory>