Skip to content

Shared library MKL linking support #114

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
ethanglaser merged 9 commits into from
Apr 28, 2025
Merged

Shared library MKL linking support #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
142a638
add option for non avx shared lib build
ethanglaser Apr 11, 2025
5c8eab4
add support for static link
ethanglaser Apr 14, 2025
d2861b7
Merge branch 'main' into dev/eglaser-no-avx
ethanglaser Apr 16, 2025
246b261
Merge branch 'main' into dev/eglaser-no-avx
ethanglaser Apr 22, 2025
89869b3
Merge branch 'main' into dev/eglaser-no-avx
ethanglaser Apr 24, 2025
70c6c4d
update options.cmake to match private
ethanglaser Apr 24, 2025
e9ebc82
use SVS_EXPERIMENTAL_LINK_STATIC_MKL instead of MKL_LINK
ethanglaser Apr 25, 2025
9a1861b
remove non-avx platform support
ethanglaser Apr 25, 2025
f0d68ea
remove duplicated FindSphinx from public
ethanglaser Apr 28, 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
29 changes: 0 additions & 29 deletions cmake/FindSphinx.cmake
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cmake/mkl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ find_package(MKL CONFIG REQUIRED)
#
# The resulting object and linking are portable and should be suitable for distribution.
if (SVS_EXPERIMENTAL_BUILD_CUSTOM_MKL)
set(SVS_MKL_CUSTOM_LIBRARY_NAME libmkl_custom)
set(SVS_MKL_CUSTOM_LIBRARY_NAME libsvs_mkl)
set(SVS_MKL_CUSTOM_SO_NAME ${SVS_MKL_CUSTOM_LIBRARY_NAME}.so)
set(SVS_MKL_CUSTOM_FULL_PATH ${CMAKE_CURRENT_BINARY_DIR}/${SVS_MKL_CUSTOM_SO_NAME})

Expand Down Expand Up @@ -82,7 +82,7 @@ if (SVS_EXPERIMENTAL_BUILD_CUSTOM_MKL)
# Ensure that the custom Intel(R) MKL library is bundled with the rest of the library.
include(GNUInstallDirs)
install(IMPORTED_RUNTIME_ARTIFACTS svs_mkl LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
else()
elseif(NOT SVS_EXPERIMENTAL_LINK_STATIC_MKL)
target_compile_options(
${SVS_LIB} INTERFACE $<TARGET_PROPERTY:MKL::MKL,INTERFACE_COMPILE_OPTIONS>
)
Expand Down
Loading