[GPU] Silence ocl include pragma message (#13789)

This commit is contained in:
Vladimir Paramuzov 2022-11-03 18:02:23 +04:00 committed by GitHub
parent e30a935e6f
commit ced0eebd13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 46 additions and 2 deletions

View File

@ -1,4 +1,5 @@
#include <openvino/runtime/core.hpp> #include <openvino/runtime/core.hpp>
#define OV_GPU_USE_OPENCL_HPP
#include <openvino/runtime/intel_gpu/ocl/ocl.hpp> #include <openvino/runtime/intel_gpu/ocl/ocl.hpp>
cl::Context get_ocl_context(); // a function which returns cl context created on the app side cl::Context get_ocl_context(); // a function which returns cl context created on the app side

View File

@ -1,4 +1,5 @@
#include <openvino/runtime/core.hpp> #include <openvino/runtime/core.hpp>
#define OV_GPU_USE_OPENCL_HPP
#include <openvino/runtime/intel_gpu/ocl/ocl.hpp> #include <openvino/runtime/intel_gpu/ocl/ocl.hpp>
#include <openvino/runtime/intel_gpu/properties.hpp> #include <openvino/runtime/intel_gpu/properties.hpp>
#include <openvino/core/preprocess/pre_post_process.hpp> #include <openvino/core/preprocess/pre_post_process.hpp>

View File

@ -1,4 +1,5 @@
#include <openvino/runtime/core.hpp> #include <openvino/runtime/core.hpp>
#define OV_GPU_USE_OPENCL_HPP
#include <openvino/runtime/intel_gpu/ocl/ocl.hpp> #include <openvino/runtime/intel_gpu/ocl/ocl.hpp>

View File

@ -1,6 +1,7 @@
#include <openvino/runtime/core.hpp> #include <openvino/runtime/core.hpp>
#include <openvino/runtime/intel_gpu/properties.hpp> #include <openvino/runtime/intel_gpu/properties.hpp>
#define OV_GPU_USE_OPENCL_HPP
#include <openvino/runtime/intel_gpu/ocl/ocl.hpp> #include <openvino/runtime/intel_gpu/ocl/ocl.hpp>
#ifdef WIN32 #ifdef WIN32

View File

@ -12,6 +12,7 @@
#include <vector> #include <vector>
#ifdef HAVE_DEVICE_MEM_SUPPORT #ifdef HAVE_DEVICE_MEM_SUPPORT
# define OV_GPU_USE_OPENCL_HPP
# include <openvino/runtime/intel_gpu/ocl/ocl.hpp> # include <openvino/runtime/intel_gpu/ocl/ocl.hpp>
# include <openvino/runtime/intel_gpu/ocl/ocl_wrapper.hpp> # include <openvino/runtime/intel_gpu/ocl/ocl_wrapper.hpp>
#endif #endif

View File

@ -5,6 +5,9 @@
#pragma once #pragma once
#if defined(HAVE_GPU_DEVICE_MEM_SUPPORT) #if defined(HAVE_GPU_DEVICE_MEM_SUPPORT)
# ifndef OV_GPU_USE_OPENCL_HPP
# define OV_GPU_USE_OPENCL_HPP
# endif
# define HAVE_DEVICE_MEM_SUPPORT # define HAVE_DEVICE_MEM_SUPPORT
# include <gpu/gpu_context_api_ocl.hpp> # include <gpu/gpu_context_api_ocl.hpp>
#endif #endif

View File

@ -39,7 +39,11 @@
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include <CL/cl2.hpp> #ifdef OV_GPU_USE_OPENCL_HPP
# include <CL/opencl.hpp>
#else
# include <CL/cl2.hpp>
#endif
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic pop # pragma GCC diagnostic pop

View File

@ -41,7 +41,11 @@
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include <CL/cl2.hpp> #ifdef OV_GPU_USE_OPENCL_HPP
# include <CL/opencl.hpp>
#else
# include <CL/cl2.hpp>
#endif
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic pop # pragma GCC diagnostic pop

View File

@ -18,6 +18,10 @@
# define NOMINMAX # define NOMINMAX
#endif #endif
#ifndef OV_GPU_USE_OPENCL_HPP
#define OV_GPU_USE_OPENCL_HPP
#endif
#ifdef _WIN32 #ifdef _WIN32
# include <gpu/gpu_context_api_dx.hpp> # include <gpu/gpu_context_api_dx.hpp>
#else #else

View File

@ -190,6 +190,11 @@ function(ie_headers_compilation_with_custom_flags)
endif() endif()
set(content "#include <${header_file}>\n${content}") set(content "#include <${header_file}>\n${content}")
endforeach() endforeach()
if (OPENCL_HEADERS_DIR)
set(content "#define OV_GPU_USE_OPENCL_HPP\n${content}")
endif()
set(source_file "${CMAKE_CURRENT_BINARY_DIR}/modern_flags_${IE_TEST_TEST_SUFFIX}.cpp") set(source_file "${CMAKE_CURRENT_BINARY_DIR}/modern_flags_${IE_TEST_TEST_SUFFIX}.cpp")
file(REMOVE ${source_file}) file(REMOVE ${source_file})
file(GENERATE OUTPUT ${source_file} CONTENT ${content}) file(GENERATE OUTPUT ${source_file} CONTENT ${content})

View File

@ -28,6 +28,10 @@
#define NOMINMAX_DEFINED_CTX_UT #define NOMINMAX_DEFINED_CTX_UT
#endif #endif
#ifndef OV_GPU_USE_OPENCL_HPP
# define OV_GPU_USE_OPENCL_HPP
#endif
#include <gpu/gpu_context_api_dx.hpp> #include <gpu/gpu_context_api_dx.hpp>
#include <atlbase.h> #include <atlbase.h>
#include <d3d11.h> #include <d3d11.h>

View File

@ -7,6 +7,8 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#define OV_GPU_USE_OPENCL_HPP
#include "openvino/runtime/intel_gpu/ocl/ocl.hpp" #include "openvino/runtime/intel_gpu/ocl/ocl.hpp"
#include "openvino/runtime/core.hpp" #include "openvino/runtime/core.hpp"

View File

@ -11,6 +11,10 @@
# define NOMINMAX # define NOMINMAX
#endif #endif
#ifndef OV_GPU_USE_OPENCL_HPP
# define OV_GPU_USE_OPENCL_HPP
#endif
#ifdef _WIN32 #ifdef _WIN32
# include <gpu/gpu_context_api_dx.hpp> # include <gpu/gpu_context_api_dx.hpp>
#elif defined ENABLE_LIBVA #elif defined ENABLE_LIBVA

View File

@ -4,6 +4,8 @@
#include "behavior/executable_network/get_metric.hpp" #include "behavior/executable_network/get_metric.hpp"
#define OV_GPU_USE_OPENCL_HPP
#ifdef _WIN32 #ifdef _WIN32
# include "gpu/gpu_context_api_dx.hpp" # include "gpu/gpu_context_api_dx.hpp"
#elif defined ENABLE_LIBVA #elif defined ENABLE_LIBVA

View File

@ -7,6 +7,8 @@
#include "behavior/ov_plugin/core_integration.hpp" #include "behavior/ov_plugin/core_integration.hpp"
#include "openvino/runtime/intel_gpu/properties.hpp" #include "openvino/runtime/intel_gpu/properties.hpp"
#define OV_GPU_USE_OPENCL_HPP
#ifdef _WIN32 #ifdef _WIN32
# include "gpu/gpu_context_api_dx.hpp" # include "gpu/gpu_context_api_dx.hpp"
#elif defined ENABLE_LIBVA #elif defined ENABLE_LIBVA

View File

@ -4,6 +4,8 @@
#include "behavior/plugin/core_integration.hpp" #include "behavior/plugin/core_integration.hpp"
#define OV_GPU_USE_OPENCL_HPP
#ifdef _WIN32 #ifdef _WIN32
# include "gpu/gpu_context_api_dx.hpp" # include "gpu/gpu_context_api_dx.hpp"
#elif defined ENABLE_LIBVA #elif defined ENABLE_LIBVA

View File

@ -4,6 +4,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#ifndef OV_GPU_USE_OPENCL_HPP
# define OV_GPU_USE_OPENCL_HPP
#endif
#include "openvino/runtime/intel_gpu/ocl/ocl.hpp" #include "openvino/runtime/intel_gpu/ocl/ocl.hpp"
#include "openvino/runtime/core.hpp" #include "openvino/runtime/core.hpp"
#include "openvino/runtime/properties.hpp" #include "openvino/runtime/properties.hpp"