Added WA for multiple export sets

Author: ilya-lavrenov

cmake/features.cmake

@@ -43,6 +43,17 @@ endif()
 
 ov_dependent_option (ENABLE_ONEDNN_FOR_GPU "Enable oneDNN with GPU support" ${ENABLE_ONEDNN_FOR_GPU_DEFAULT} "ENABLE_INTEL_GPU" OFF)
 
+if(BUILD_SHARED_LIBS OR NOT ENABLE_INTEL_CPU)
+    set(ENABLE_GPU_USE_CPUS_ONEDNN_DEFAULT OFF)
+else()
+    set(ENABLE_GPU_USE_CPUS_ONEDNN_DEFAULT ON)
+endif()
+
+# TODO: remove
+set(ENABLE_GPU_USE_CPUS_ONEDNN_DEFAULT ON)
+
+ov_dependent_option (ENABLE_GPU_USE_CPUS_ONEDNN "Enable GPU to use oneDNN from CPU" ${ENABLE_GPU_USE_CPUS_ONEDNN_DEFAULT} "ENABLE_ONEDNN_FOR_GPU;ENABLE_INTEL_CPU" OFF)
+
 ov_option (ENABLE_DEBUG_CAPS "enable OpenVINO debug capabilities at runtime" OFF)
 ov_dependent_option (ENABLE_GPU_DEBUG_CAPS "enable GPU debug capabilities at runtime" ON "ENABLE_DEBUG_CAPS;ENABLE_INTEL_GPU" OFF)
 ov_dependent_option (ENABLE_CPU_DEBUG_CAPS "enable CPU debug capabilities at runtime" ON "ENABLE_DEBUG_CAPS;ENABLE_INTEL_CPU" OFF)

src/plugins/intel_cpu/thirdparty/CMakeLists.txt

@@ -63,10 +63,32 @@ function(ov_add_onednn_common)
     # GPU specific options
     #
 
-    if(NOT BUILD_SHARED_LIBS AND ENABLE_ONEDNN_FOR_GPU)
+    if(NOT BUILD_SHARED_LIBS AND ENABLE_ONEDNN_FOR_GPU OR ENABLE_GPU_USE_CPUS_ONEDNN)
         # build oneDNN to be compatible with Intel GPU plugin
         set(DNNL_ENABLE_PRIMITIVE_GPU_ISA "XEHP;XEHPG;XEHPC" CACHE STRING "" FORCE)
         set(DNNL_GPU_RUNTIME "OCL" CACHE STRING "" FORCE)
+
+        # Keep in sync with https://github.com/openvinotoolkit/openvino/blob/releases/2024/0/src/plugins/intel_gpu/CMakeLists.txt#L30
+        set(INTEL_GPU_TARGET_OCL_VERSION "200" CACHE STRING "Target version of OpenCL which should be used by GPU plugin")
+        add_definitions(-DCL_TARGET_OPENCL_VERSION=${INTEL_GPU_TARGET_OCL_VERSION})
+
+        if(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "300")
+            set(ONEDNN_CL_VERSION "3_0")
+        elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "220")
+            set(ONEDNN_CL_VERSION "2_2")
+        elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "210")
+            set(ONEDNN_CL_VERSION "2_1")
+        elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "200")
+            set(ONEDNN_CL_VERSION "2_0")
+        elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "120")
+            set(ONEDNN_CL_VERSION "1_2")
+        elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "100")
+            set(ONEDNN_CL_VERSION "1_0")
+        else()
+            message(FATAL_ERROR "Unsupported version of OpenCL: ${INTEL_GPU_TARGET_OCL_VERSION}")
+        endif()
+
+        set(OPENCL_VERSION_${ONEDNN_CL_VERSION} ON)
     else()
         set(DNNL_GPU_RUNTIME "NONE" CACHE STRING "" FORCE)
     endif()

src/plugins/intel_cpu/thirdparty/onednn

@@ -33,6 +33,22 @@ function(ov_build_onednn_gpu)
         message(WARNING "Intel GPU plugin unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
     endif()
 
+    if(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "300")
+        set(ONEDNN_CL_VERSION "3_0")
+    elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "220")
+        set(ONEDNN_CL_VERSION "2_2")
+    elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "210")
+        set(ONEDNN_CL_VERSION "2_1")
+    elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "200")
+        set(ONEDNN_CL_VERSION "2_0")
+    elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "120")
+        set(ONEDNN_CL_VERSION "1_2")
+    elseif(INTEL_GPU_TARGET_OCL_VERSION STREQUAL "100")
+        set(ONEDNN_CL_VERSION "1_0")
+    else()
+        message(FATAL_ERROR "Unsupported version of OpenCL: ${INTEL_GPU_TARGET_OCL_VERSION}")
+    endif()
+
     if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
         ov_add_compiler_flags(-Wno-undef)
         ov_add_compiler_flags(-Wno-missing-declarations)
@@ -119,6 +135,7 @@ function(ov_build_onednn_gpu)
             "-DDNNL_LIBRARY_TYPE=STATIC"
             "-DDNNL_EXPERIMENTAL_PROFILING=ON"
             "-DONEDNN_BUILD_GRAPH=OFF"
+            "-DOPENCL_VERSION_${ONEDNN_CL_VERSION}=ON"
             # specifically for Conan, because it overrides CMAKE_PREFIX_PATH and oneDNN's FindOpenCL.cmake is ignored
             # Conan's FindOpenCL.cmake module does not set OpenCL_INCLUDE_DIRS, so we need to set it manually
             "-DOpenCL_INCLUDE_DIRS=$<TARGET_PROPERTY:OpenCL::OpenCL,INTERFACE_INCLUDE_DIRECTORIES>"
@@ -156,9 +173,7 @@ function(ov_build_onednn_gpu)
 endfunction()
 
 if(ENABLE_ONEDNN_FOR_GPU)
-    # if(BUILD_SHARED_LIBS OR NOT ENABLE_INTEL_CPU)
-    #     ov_build_onednn_gpu()
-    # else()
+    if(ENABLE_GPU_USE_CPUS_ONEDNN)
         # in case of static libraries, Intel GPU shares oneDNN with CPU plugin
         set(DNNL_GPU_LIBRARY_NAME "openvino_onednn_cpu" CACHE STRING "Name of oneDNN library for Intel GPU Plugin")
 
@@ -172,5 +187,7 @@ if(ENABLE_ONEDNN_FOR_GPU)
             INTERFACE_COMPILE_DEFINITIONS ENABLE_ONEDNN_FOR_GPU)
 
         ov_install_static_lib(onednn_gpu_tgt ${OV_CPACK_COMP_CORE})
-    # endif()
+    else()
+        ov_build_onednn_gpu()
+    endif()
 endif()

src/plugins/intel_gpu/thirdparty/CMakeLists.txt

@@ -59,3 +59,6 @@ set(opencl_root_hints "${OpenCL_INCLUDE_DIR}" PARENT_SCOPE)
 # installation
 
 ov_install_static_lib(OpenCL ${OV_CPACK_COMP_CORE})
+
+install(TARGETS OpenCL EXPORT dnnl-targets
+        ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${OV_CPACK_COMP_CORE})