Skip to content

sycl: Use oneMath on non-WIN32 #13503

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

sycl: Use oneMath on non-WIN32 #13503

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46b5c98
Use oneMath on non-WIN32
jounjj May 13, 2025
3e870d7
Merge branch 'ggml-org:master' into use-onemath
jounjj May 13, 2025
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
6 changes: 3 additions & 3 deletions ggml/src/ggml-sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@ if (GGML_SYCL_GRAPH)
endif()

# Link against Intel oneMKL or oneMath
if (GGML_SYCL_TARGET STREQUAL "INTEL")
# Intel devices use Intel oneMKL directly instead of oneMath to avoid the limitation of linking Intel oneMKL statically
find_package(oneMath)
if (WIN32 AND NOT oneMath_FOUND AND GGML_SYCL_TARGET STREQUAL "INTEL")
Comment on lines +107 to +108
Copy link
Collaborator

Choose a reason for hiding this comment

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

The intention of the original PR #12192 was to use find_package if oneMath is installed and FetchContent otherwise. With these changes oneMath with Intel devices is only going to be used if users install oneMath (and on Linux).
You should be able to allow using FetchContent with:

Suggested change
find_package(oneMath)
if (WIN32 AND NOT oneMath_FOUND AND GGML_SYCL_TARGET STREQUAL "INTEL")
if (WIN32 AND GGML_SYCL_TARGET STREQUAL "INTEL")

Copy link
Collaborator

Choose a reason for hiding this comment

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

This will fallback to using the runtime dispatcher for Intel devices which can affect performance. You can see how the compile time dispatcher used to be enabled in 995aea3#diff-123d14cf628b04694c9022d4210d80c14a29409095635150b944f8dfd1c70b37L120.

# Intel devices on WIN32 use Intel oneMKL directly instead of oneMath to avoid the limitation of linking Intel oneMKL statically
# See https://github.com/uxlfoundation/oneMath/issues/654
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(SYCL_COMPILER ON)
Expand All @@ -114,7 +115,6 @@ if (GGML_SYCL_TARGET STREQUAL "INTEL")
target_link_libraries(ggml-sycl PRIVATE MKL::MKL_SYCL::BLAS)
target_compile_definitions(ggml-sycl PRIVATE GGML_SYCL_USE_INTEL_ONEMKL)
else()
find_package(oneMath QUIET)
if (NOT oneMath_FOUND)
message(STATUS "oneMath not found: oneMath will be automatically downloaded")
# Use FetchContent to automatically pull and build oneMath
Expand Down