Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GPU] update onednn with the latest rls-v3.8-pc #29256

Closed
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[GPU] update onednn/rls-v3.8-pc
sungeunk committed Mar 6, 2025
commit bb90467dc27bc0ad5cd21c8719540eca65928675
4 changes: 4 additions & 0 deletions src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -126,6 +126,10 @@ target_link_libraries(${TARGET_NAME} PUBLIC OpenCL::OpenCL openvino::runtime PRI

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

if (ENABLE_ONEDNN_FOR_GPU)
target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:onednn_gpu_tgt,INTERNAL_INCLUDE_DIRECTORIES>)
endif()

set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

if(WIN32)
3 changes: 2 additions & 1 deletion src/plugins/intel_gpu/src/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -56,7 +56,8 @@ if(OV_COMPILER_IS_INTEL_LLVM)
endif()

if(ENABLE_ONEDNN_FOR_GPU)
ov_target_link_libraries_as_system(${TARGET_NAME} PUBLIC onednn_gpu_tgt)
ov_target_link_libraries_as_system(${TARGET_NAME} PRIVATE onednn_gpu_tgt)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $<TARGET_PROPERTY:onednn_gpu_tgt,INTERNAL_INCLUDE_DIRECTORIES>)
endif()

ov_set_threading_interface_for(${TARGET_NAME})
4 changes: 2 additions & 2 deletions src/plugins/intel_gpu/src/runtime/ocl/ocl_device.cpp
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
#ifndef NOMINMAX
# define NOMINMAX
#endif
#include "gpu/intel/jit/jit_generator.hpp"
#include "gpu/intel/jit/generator.hpp"
#endif // ENABLE_ONEDNN_FOR_GPU

#include "ocl_device.hpp"
@@ -324,7 +324,7 @@ device_info init_device_info(const cl::Device& device, const cl::Context& contex
using namespace dnnl::impl::gpu::intel::jit;
ngen::HW hw = ngen::HW::Unknown;
ngen::Product product = {ngen::ProductFamily::Unknown, 0};
jit_generator<ngen::HW::Unknown>::detectHWInfo(context.get(), device.get(), hw, product);
generator_t<ngen::HW::Unknown>::detectHWInfo(context.get(), device.get(), hw, product);
info.arch = convert_ngen_arch(hw);
// We change the value of this flag to avoid OneDNN usage for the platforms unknown to OneDNN
// This is required to guarantee some level of forward compatibility for the new HW generations
16 changes: 8 additions & 8 deletions src/plugins/intel_gpu/thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -156,25 +156,25 @@ if(ENABLE_ONEDNN_FOR_GPU)
)
endif()

set(LIB_INCLUDE_DIRS "${ONEDNN_INSTALL_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/src")
set(LIB_INCLUDE_DIRS "${ONEDNN_INSTALL_DIR}/include")
set(LIB_INTERNAL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/src/"
"${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/src/gpu/intel/jit/ngen/"
"${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/third_party/ngen/"
"${CMAKE_CURRENT_SOURCE_DIR}/onednn_gpu/third_party/")
set(LIB_DEFINITIONS ENABLE_ONEDNN_FOR_GPU
DNNL_DLL
DNNL_DLL_EXPORTS
DNNL_ENABLE_CPU_ISA_HINTS
DNNL_ENABLE_MAX_CPU_ISA
DNNL_X64=1
NGEN_CPP11
NGEN_NEO_INTERFACE
NGEN_NO_OP_NAMES
NGEN_SAFE
NGEN_WINDOWS_COMPAT)
DNNL_X64=1)
add_library(onednn_gpu_tgt INTERFACE)
set_target_properties(onednn_gpu_tgt PROPERTIES
INTERFACE_LINK_LIBRARIES $<BUILD_INTERFACE:${ONEDNN_GPU_LIB_PATH}>
INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${LIB_INCLUDE_DIRS}>"
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LIB_INCLUDE_DIRS}"
INTERFACE_COMPILE_DEFINITIONS "${LIB_DEFINITIONS}"
)
INTERNAL_INCLUDE_DIRECTORIES "${LIB_INTERNAL_INCLUDE_DIRS}"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like custom properties must also be prefixed with INTERFACE_ to avoid error for rhel

)
add_dependencies(onednn_gpu_tgt onednn_gpu_build)

if(NOT BUILD_SHARED_LIBS)
2 changes: 1 addition & 1 deletion src/plugins/intel_gpu/thirdparty/onednn_gpu