Skip to content

Enable oneMath support for dpnp builds #2313

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

Merged
merged 6 commits into from
Feb 14, 2025
Merged

Enable oneMath support for dpnp builds #2313

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7a5ffe
Refactor CMake to auto-detect oneMath or oneMKL
vlad-perevezentsev Feb 13, 2025
367759c
Update oneMKL repository URL to oneMath
vlad-perevezentsev Feb 13, 2025
e4ab84e
Merge master into support_onemath
vlad-perevezentsev Feb 13, 2025
c540be3
Apply review remarks
vlad-perevezentsev Feb 13, 2025
974b5a0
Apply remarks
vlad-perevezentsev Feb 13, 2025
9151a9a
Merge master into support_onemath
vlad-perevezentsev Feb 14, 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
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@ if(_use_onemkl_interfaces)

FetchContent_MakeAvailable(onemkl_interfaces_library)
if(TARGET onemath)
set(USED_MATH_LIBRARY "onemath" CACHE INTERNAL "Selected OneAPI math library")
set(MKL_INTERFACES_LIB "onemath" CACHE INTERNAL "OneMath lib target")
elseif(TARGET onemkl)
set(USED_MATH_LIBRARY "onemkl" CACHE INTERNAL "Selected OneAPI math library")
set(MKL_INTERFACES_LIB "onemkl" CACHE INTERNAL "OneMath lib target")
else()
message(STATUS "Neither 'oneMath' nor 'oneMKL' found!")
message(FATAL_ERROR "Neither 'oneMath' nor 'oneMKL' found!")
endif()
message(STATUS "OneAPI math library used: ${USED_MATH_LIBRARY}")
message(STATUS "OneMath lib target used: ${MKL_INTERFACES_LIB}")
set(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib")
endif()

Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/blas/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ if (DPNP_GENERATE_COVERAGE)
endif()

if(_use_onemkl_interfaces)
target_link_libraries(${python_module_name} PUBLIC ${USED_MATH_LIBRARY})
target_link_libraries(${python_module_name} PRIVATE ${MKL_INTERFACES_LIB})
target_compile_options(${python_module_name} PRIVATE -DUSE_ONEMKL_INTERFACES)
if(_use_onemkl_interfaces_cuda)
target_compile_options(${python_module_name} PRIVATE -DUSE_ONEMKL_CUBLAS)
Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/fft/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ if (DPNP_GENERATE_COVERAGE)
endif()

if(_use_onemkl_interfaces)
target_link_libraries(${python_module_name} PUBLIC ${USED_MATH_LIBRARY})
target_link_libraries(${python_module_name} PRIVATE ${MKL_INTERFACES_LIB})
target_compile_options(${python_module_name} PRIVATE -DUSE_ONEMKL_INTERFACES)
else()
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::DFT)
Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/extensions/lapack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ if (DPNP_GENERATE_COVERAGE)
endif()

if(_use_onemkl_interfaces)
target_link_libraries(${python_module_name} PUBLIC ${USED_MATH_LIBRARY})
target_link_libraries(${python_module_name} PRIVATE ${MKL_INTERFACES_LIB})
target_compile_options(${python_module_name} PRIVATE -DUSE_ONEMKL_INTERFACES)
else()
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::LAPACK)
Expand Down
2 changes: 2 additions & 0 deletions dpnp/backend/extensions/lapack/getrf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ static sycl::event getrf_impl(sycl::queue &exec_q,
} catch (mkl_lapack::exception const &e) {
is_exception_caught = true;
info = e.info();
std::cout << "info: " << info << std::endl;
std::cout << e.detail() << std::endl;

if (info < 0) {
error_msg << "Parameter number " << -info
Expand Down
Loading