Fix Linux MKL build 2

Author: daleroberts

dynadjust/CMakeLists.txt

@@ -348,68 +348,32 @@ else()
         # Use Intel MKL's native CMake config
         add_compile_options("-DUSE_MKL")
 
-        # Set MKL interface based on ILP64 option
+        # Use FindBLAS to locate Intel MKL with explicit interface selection
+        # Note: MKLConfig.cmake in OneAPI 2025.x has issues with interface selection,
+        # so we use FindBLAS which allows explicit LP64/ILP64 selection via BLA_VENDOR
+        message(STATUS "Using FindBLAS with BLA_VENDOR set to Intel MKL")
+
         if(ILP64)
-            set(MKL_INTERFACE "ilp64" CACHE STRING "MKL interface layer")
+            set(BLA_VENDOR "Intel10_64ilp")
         else()
-            set(MKL_INTERFACE "lp64" CACHE STRING "MKL interface layer")
+            set(BLA_VENDOR "Intel10_64lp")
         endif()
 
-        # Set MKL threading (required for proper configuration)
-        if(NOT DEFINED MKL_THREADING)
-            set(MKL_THREADING "gnu_thread" CACHE STRING "MKL threading layer")
-        endif()
+        find_package(BLAS MODULE REQUIRED)
+        find_package(LAPACK MODULE)
 
-        # Set MKL link type
-        if(NOT DEFINED MKL_LINK)
-            set(MKL_LINK "dynamic" CACHE STRING "MKL link type")
+        # Verify we actually got MKL
+        if(NOT "${BLAS_LIBRARIES}" MATCHES "mkl")
+            message(FATAL_ERROR "USE_MKL=ON but Intel MKL was not found. Found: ${BLAS_LIBRARIES}")
         endif()
 
-        # Find MKL using its CMake config
-        find_package(MKL CONFIG)
-        
-        if(MKL_FOUND)
-            message(STATUS "Found Intel MKL using MKLConfig.cmake")
-            message(STATUS "  MKL Version: ${MKL_VERSION}")
-            message(STATUS "  MKL Interface: ${MKL_INTERFACE}")
-            message(STATUS "  MKL Threading: ${MKL_THREADING}")
-            message(STATUS "  MKL Link: ${MKL_LINK}")
-
-            # Explicitly ensure we're not using ILP64 when in LP64 mode
-            if(NOT ILP64)
-                # Remove any MKL_ILP64 definition that might have been set
-                remove_definitions(-DMKL_ILP64)
-                add_compile_definitions(MKL_LP64)
-            endif()
-
-            # Use the modern MKL target
-            list(APPEND DNA_LIBRARIES MKL::MKL)
-        else()
-            # MKL CONFIG not found, try with FindBLAS
-            message(STATUS "MKLConfig.cmake not found, trying FindBLAS with BLA_VENDOR set to Intel MKL")
-            
-            if(ILP64)
-                set(BLA_VENDOR "Intel10_64ilp")
-            else()
-                set(BLA_VENDOR "Intel10_64lp")
-            endif()
-            
-            find_package(BLAS MODULE REQUIRED)
-            find_package(LAPACK MODULE)
-            
-            # Verify we actually got MKL
-            if(NOT "${BLAS_LIBRARIES}" MATCHES "mkl")
-                message(FATAL_ERROR "USE_MKL=ON but Intel MKL was not found. Found: ${BLAS_LIBRARIES}")
-            endif()
-            
-            message(STATUS "Found Intel MKL via FindBLAS: ${BLAS_LIBRARIES}")
-            list(APPEND DNA_LIBRARIES ${BLAS_LIBRARIES})
-            if(LAPACK_FOUND)
-                list(APPEND DNA_LIBRARIES ${LAPACK_LIBRARIES})
-            endif()
-            
-            # MKL provides mkl_cblas.h, not cblas.h - no need to search for cblas.h
+        message(STATUS "Found Intel MKL via FindBLAS: ${BLAS_LIBRARIES}")
+        list(APPEND DNA_LIBRARIES ${BLAS_LIBRARIES})
+        if(LAPACK_FOUND)
+            list(APPEND DNA_LIBRARIES ${LAPACK_LIBRARIES})
         endif()
+
+        # MKL provides mkl_cblas.h, not cblas.h - no need to search for cblas.h
 
     else()
         # Use standard BLAS and LAPACK search