Remove MKL_VERSION_2024 variable from cmake files (#1889)

* Get rid of MKL_VERSION_2024 variable

* Return back a quite discovery

Author: antonwolfy

CMakeLists.txt

@@ -26,18 +26,11 @@ endif()
 set(MKL_ARCH "intel64")
 set(MKL_LINK "dynamic")
 set(MKL_THREADING "tbb_thread")
-set(MKL_VERSION_2024 FALSE)
+set(MKL_INTERFACE "ilp64")
 find_package(MKL QUIET)
 if(MKL_FOUND)
-    if(MKL_VERSION VERSION_GREATER_EQUAL "2024.0.0")
-        set(MKL_VERSION_2024 TRUE)
-        set(MKL_INTERFACE "ilp64")
-        find_package(MKL REQUIRED)
-    endif()
-endif()
-
-if(NOT MKL_VERSION_2024)
-    set(MKL_INTERFACE_FULL "intel_ilp64")
+    find_package(MKL REQUIRED)
+else()
     find_package(MKL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
 endif()
 

dpnp/backend/CMakeLists.txt

@@ -84,12 +84,7 @@ if(DPNP_GENERATE_COVERAGE)
     target_link_options(${_trgt} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
 endif()
 
-if (MKL_VERSION_2024)
-    target_link_libraries(${_trgt} PUBLIC MKL::MKL_SYCL)
-else()
-    target_link_libraries(${_trgt} PUBLIC MKL::MKL_DPCPP)
-endif()
-
+target_link_libraries(${_trgt} PUBLIC MKL::MKL_SYCL)
 target_link_libraries(${_trgt} PUBLIC oneDPL)
 
 if (UNIX)

dpnp/backend/extensions/blas/CMakeLists.txt

@@ -69,11 +69,7 @@ if (DPNP_GENERATE_COVERAGE)
     target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
 endif()
 
-if (MKL_VERSION_2024)
-    target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::BLAS)
-else()
-    target_link_libraries(${python_module_name} PUBLIC MKL::MKL_DPCPP)
-endif()
+target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::BLAS)
 
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/blas"

dpnp/backend/extensions/lapack/CMakeLists.txt

@@ -82,11 +82,7 @@ if (DPNP_GENERATE_COVERAGE)
     target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
 endif()
 
-if (MKL_VERSION_2024)
-    target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::LAPACK)
-else()
-    target_link_libraries(${python_module_name} PUBLIC MKL::MKL_DPCPP)
-endif()
+target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::LAPACK)
 
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/lapack"

dpnp/backend/extensions/vm/CMakeLists.txt

@@ -109,11 +109,7 @@ if (DPNP_GENERATE_COVERAGE)
     target_link_options(${python_module_name} PRIVATE -fprofile-instr-generate -fcoverage-mapping)
 endif()
 
-if (MKL_VERSION_2024)
-    target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::VM)
-else()
-    target_link_libraries(${python_module_name} PUBLIC MKL::MKL_DPCPP)
-endif()
+target_link_libraries(${python_module_name} PUBLIC MKL::MKL_SYCL::VM)
 
 install(TARGETS ${python_module_name}
   DESTINATION "dpnp/backend/extensions/vm"