From fdf504738dd926df0d78ecb537b95badd88158bc Mon Sep 17 00:00:00 2001
From: Vladimir Paramuzov <vladimir.paramuzov@intel.com>
Date: Fri, 25 Nov 2022 11:37:51 +0400
Subject: [PATCH] [GPU] Replace cl2.hpp with opencl.hpp in cmake search for
 docs and benchmark_app (#14158)

---
 docs/snippets/CMakeLists.txt                  |  2 +-
 samples/cpp/benchmark_app/CMakeLists.txt      | 31 +++++++++++++++++--
 .../benchmark_app/remote_tensors_filling.cpp  |  1 -
 .../benchmark_app/remote_tensors_filling.hpp  |  3 --
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/docs/snippets/CMakeLists.txt b/docs/snippets/CMakeLists.txt
index 7f2e0e80813..f9ef8ef079e 100644
--- a/docs/snippets/CMakeLists.txt
+++ b/docs/snippets/CMakeLists.txt
@@ -24,7 +24,7 @@ file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
 find_package(OpenCL)
 find_path(OpenCL_HPP_INCLUDE_DIR
     NAMES
-      CL/cl2.hpp OpenCL/cl2.hpp
+      CL/opencl.hpp OpenCL/opencl.hpp
     HINTS
       ${opencl_root_hints}
       ENV "PROGRAMFILES(X86)"
diff --git a/samples/cpp/benchmark_app/CMakeLists.txt b/samples/cpp/benchmark_app/CMakeLists.txt
index 09ab0c868c5..434a19f3dff 100644
--- a/samples/cpp/benchmark_app/CMakeLists.txt
+++ b/samples/cpp/benchmark_app/CMakeLists.txt
@@ -61,6 +61,23 @@ if(SAMPLES_ENABLE_OPENCL)
     endif()
 
     find_path(OpenCL_HPP_INCLUDE_DIR
+        NAMES
+        CL/opencl.hpp OpenCL/opencl.hpp
+        HINTS
+        ${opencl_root_hints}
+        ENV "PROGRAMFILES(X86)"
+        ENV AMDAPPSDKROOT
+        ENV INTELOCLSDKROOT
+        ENV NVSDKCOMPUTE_ROOT
+        ENV CUDA_PATH
+        ENV ATISTREAMSDKROOT
+        ENV OCL_ROOT
+        PATH_SUFFIXES
+        include
+        OpenCL/common/inc
+        "AMD APP/include")
+
+    find_path(CL2_HPP_INCLUDE_DIR
         NAMES
         CL/cl2.hpp OpenCL/cl2.hpp
         HINTS
@@ -81,9 +98,15 @@ if(SAMPLES_ENABLE_OPENCL)
         # Use OpenCL CPP headers from sources if present
         set(OpenCL_HEADERS ${OPENCL_HEADERS_DIR})
         set(OpenCL_LIB "OpenCL")
-    elseif(OpenCL_HPP_INCLUDE_DIR)
+    elseif(OpenCL_HPP_INCLUDE_DIR OR CL2_HPP_INCLUDE_DIR)
         # Append OpenCL CPP headers to C headers and use both
-        set(OpenCL_HEADERS ${OpenCL_INCLUDE_DIR} ${OpenCL_HPP_INCLUDE_DIR})
+        set(OpenCL_HEADERS ${OpenCL_INCLUDE_DIR})
+        if (OpenCL_HPP_INCLUDE_DIR)
+            list(APPEND ${OpenCL_HEADERS} ${OpenCL_HPP_INCLUDE_DIR})
+        endif()
+        if (CL2_HPP_INCLUDE_DIR)
+            list(APPEND ${OpenCL_HEADERS} ${CL2_HPP_INCLUDE_DIR})
+        endif()
         set(OpenCL_LIB "OpenCL::OpenCL")
     else()
         MESSAGE(WARNING "OpenCL CPP header is not found, ${TARGET_NAME} will be built without OpenCL support. Download it from: https://github.com/KhronosGroup/OpenCL-CLHPP and set -Dopencl_root_hints=[PATH]/OpenCL-CLHPP/include to cmake.")
@@ -93,6 +116,10 @@ if(SAMPLES_ENABLE_OPENCL)
         target_link_libraries(${TARGET_NAME} PRIVATE ${OpenCL_LIB})
         target_include_directories(${TARGET_NAME} PRIVATE ${OpenCL_HEADERS})
         target_compile_definitions(${TARGET_NAME} PRIVATE HAVE_GPU_DEVICE_MEM_SUPPORT)
+        if (OpenCL_HPP_INCLUDE_DIR OR OPENCL_HEADERS_DIR)
+            # the macro below is defined when opencl.hpp is found to suppress deprecation message from cl2.hpp
+            target_compile_definitions(${TARGET_NAME} PRIVATE OV_GPU_USE_OPENCL_HPP)
+        endif()
     endif()
 endif()
 
diff --git a/samples/cpp/benchmark_app/remote_tensors_filling.cpp b/samples/cpp/benchmark_app/remote_tensors_filling.cpp
index fbc342b9403..09c44ece906 100644
--- a/samples/cpp/benchmark_app/remote_tensors_filling.cpp
+++ b/samples/cpp/benchmark_app/remote_tensors_filling.cpp
@@ -12,7 +12,6 @@
 #include <vector>
 
 #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_wrapper.hpp>
 #endif
diff --git a/samples/cpp/benchmark_app/remote_tensors_filling.hpp b/samples/cpp/benchmark_app/remote_tensors_filling.hpp
index 67f56a0e564..4e8555b844e 100644
--- a/samples/cpp/benchmark_app/remote_tensors_filling.hpp
+++ b/samples/cpp/benchmark_app/remote_tensors_filling.hpp
@@ -5,9 +5,6 @@
 #pragma once
 
 #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
 #    include <gpu/gpu_context_api_ocl.hpp>
 #endif