Skip to content

Commit bb90467

Browse files
committed
[GPU] update onednn/rls-v3.8-pc
1 parent eba8f10 commit bb90467

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ target_link_libraries(${TARGET_NAME} PUBLIC OpenCL::OpenCL openvino::runtime PRI
126126

127127
target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:rapidjson,INTERFACE_INCLUDE_DIRECTORIES>)
128128

129+
if (ENABLE_ONEDNN_FOR_GPU)
130+
target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:onednn_gpu_tgt,INTERNAL_INCLUDE_DIRECTORIES>)
131+
endif()
132+
129133
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
130134

131135
if(WIN32)

src/plugins/intel_gpu/src/runtime/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ if(OV_COMPILER_IS_INTEL_LLVM)
5656
endif()
5757

5858
if(ENABLE_ONEDNN_FOR_GPU)
59-
ov_target_link_libraries_as_system(${TARGET_NAME} PUBLIC onednn_gpu_tgt)
59+
ov_target_link_libraries_as_system(${TARGET_NAME} PRIVATE onednn_gpu_tgt)
60+
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $<TARGET_PROPERTY:onednn_gpu_tgt,INTERNAL_INCLUDE_DIRECTORIES>)
6061
endif()
6162

6263
ov_set_threading_interface_for(${TARGET_NAME})

src/plugins/intel_gpu/src/runtime/ocl/ocl_device.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef NOMINMAX
77
# define NOMINMAX
88
#endif
9-
#include "gpu/intel/jit/jit_generator.hpp"
9+
#include "gpu/intel/jit/generator.hpp"
1010
#endif // ENABLE_ONEDNN_FOR_GPU
1111

1212
#include "ocl_device.hpp"
@@ -324,7 +324,7 @@ device_info init_device_info(const cl::Device& device, const cl::Context& contex
324324
using namespace dnnl::impl::gpu::intel::jit;
325325
ngen::HW hw = ngen::HW::Unknown;
326326
ngen::Product product = {ngen::ProductFamily::Unknown, 0};
327-
jit_generator<ngen::HW::Unknown>::detectHWInfo(context.get(), device.get(), hw, product);
327+
generator_t<ngen::HW::Unknown>::detectHWInfo(context.get(), device.get(), hw, product);
328328
info.arch = convert_ngen_arch(hw);
329329
// We change the value of this flag to avoid OneDNN usage for the platforms unknown to OneDNN
330330
// This is required to guarantee some level of forward compatibility for the new HW generations

src/plugins/intel_gpu/thirdparty/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,25 @@ if(ENABLE_ONEDNN_FOR_GPU)
156156
)
157157
endif()
158158

159-
set(LIB_INCLUDE_DIRS "${ONEDNN_INSTALL_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/src")
159+
set(LIB_INCLUDE_DIRS "${ONEDNN_INSTALL_DIR}/include")
160+
set(LIB_INTERNAL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/src/"
161+
"${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/src/gpu/intel/jit/ngen/"
162+
"${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/third_party/ngen/"
163+
"${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/third_party/")
160164
set(LIB_DEFINITIONS ENABLE_ONEDNN_FOR_GPU
161165
DNNL_DLL
162166
DNNL_DLL_EXPORTS
163167
DNNL_ENABLE_CPU_ISA_HINTS
164168
DNNL_ENABLE_MAX_CPU_ISA
165-
DNNL_X64=1
166-
NGEN_CPP11
167-
NGEN_NEO_INTERFACE
168-
NGEN_NO_OP_NAMES
169-
NGEN_SAFE
170-
NGEN_WINDOWS_COMPAT)
169+
DNNL_X64=1)
171170
add_library(onednn_gpu_tgt INTERFACE)
172171
set_target_properties(onednn_gpu_tgt PROPERTIES
173172
INTERFACE_LINK_LIBRARIES $<BUILD_INTERFACE:${ONEDNN_GPU_LIB_PATH}>
174173
INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${LIB_INCLUDE_DIRS}>"
175174
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LIB_INCLUDE_DIRS}"
176175
INTERFACE_COMPILE_DEFINITIONS "${LIB_DEFINITIONS}"
177-
)
176+
INTERNAL_INCLUDE_DIRECTORIES "${LIB_INTERNAL_INCLUDE_DIRS}"
177+
)
178178
add_dependencies(onednn_gpu_tgt onednn_gpu_build)
179179

180180
if(NOT BUILD_SHARED_LIBS)

0 commit comments

Comments
 (0)