Skip to content

Commit 1e0a862

Browse files
committed
Get rid of MKL_VERSION_2024 variable
1 parent 96a2e41 commit 1e0a862

File tree

5 files changed

+7
-32
lines changed

5 files changed

+7
-32
lines changed

CMakeLists.txt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,10 @@ endif()
2626
set(MKL_ARCH "intel64")
2727
set(MKL_LINK "dynamic")
2828
set(MKL_THREADING "tbb_thread")
29-
set(MKL_VERSION_2024 FALSE)
30-
find_package(MKL QUIET)
29+
set(MKL_INTERFACE "ilp64")
3130
if(MKL_FOUND)
32-
if(MKL_VERSION VERSION_GREATER_EQUAL "2024.0.0")
33-
set(MKL_VERSION_2024 TRUE)
34-
set(MKL_INTERFACE "ilp64")
35-
find_package(MKL REQUIRED)
36-
endif()
37-
endif()
38-
39-
if(NOT MKL_VERSION_2024)
40-
set(MKL_INTERFACE_FULL "intel_ilp64")
31+
find_package(MKL REQUIRED)
32+
else()
4133
find_package(MKL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
4234
endif()
4335

dpnp/backend/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,7 @@ if(DPNP_GENERATE_COVERAGE)
8585
target_link_options(${_trgt} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
8686
endif()
8787

88-
if (MKL_VERSION_2024)
89-
target_link_libraries(${_trgt} PUBLIC MKL::MKL_SYCL)
90-
else()
91-
target_link_libraries(${_trgt} PUBLIC MKL::MKL_DPCPP)
92-
endif()
93-
88+
target_link_libraries(${_trgt} PUBLIC MKL::MKL_SYCL)
9489
target_link_libraries(${_trgt} PUBLIC oneDPL)
9590

9691
if (UNIX)

dpnp/backend/extensions/blas/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ if (DPNP_GENERATE_COVERAGE)
6969
target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
7070
endif()
7171

72-
if (MKL_VERSION_2024)
73-
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::BLAS)
74-
else()
75-
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_DPCPP)
76-
endif()
72+
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::BLAS)
7773

7874
install(TARGETS ${python_module_name}
7975
DESTINATION "dpnp/backend/extensions/blas"

dpnp/backend/extensions/lapack/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ if (DPNP_GENERATE_COVERAGE)
8282
target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
8383
endif()
8484

85-
if (MKL_VERSION_2024)
86-
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::LAPACK)
87-
else()
88-
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_DPCPP)
89-
endif()
85+
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::LAPACK)
9086

9187
install(TARGETS ${python_module_name}
9288
DESTINATION "dpnp/backend/extensions/lapack"

dpnp/backend/extensions/vm/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,7 @@ if (DPNP_GENERATE_COVERAGE)
108108
target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
109109
endif()
110110

111-
if (MKL_VERSION_2024)
112-
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::VM)
113-
else()
114-
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_DPCPP)
115-
endif()
111+
target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::VM)
116112

117113
install(TARGETS ${python_module_name}
118114
DESTINATION "dpnp/backend/extensions/vm"

0 commit comments

Comments
 (0)