Improve support for MKL

Author: rogerfraser

dynadjust/CMakeLists.txt

@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.15)
 project(dynadjust VERSION 1.2.9)
 
-option(BUILD_TESTING "Enable testing" OFF)
+option(BUILD_TESTING "Enable testing" ON)
 option(BUILD_STATIC "Build static binaries in the 'static' directory" OFF)
-option(USE_MKL "Use Intel MKL (Linux and Windows)" OFF)
+option(USE_MKL "Use Intel MKL (Linux and Windows)" ON)
 option(USE_OPENMP_MAC "Use OpenMP on macOS (requires `brew install libomp`)" OFF)
 option(ILP64 "Use ILP64 Interface for BLAS and LAPACK" OFF)
 
-set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
+set(CMAKE_DISABLE_PRECOMPILE_HEADERS OFF)
 
 # Fix Boost 1.70+ issue with CMake 3.14+
 if(POLICY CMP0167)
@@ -279,25 +279,44 @@ if(APPLE)
     endif()
     list(APPEND DNA_LIBRARIES ${ACCELERATE_LIB})
 
-elseif(WIN32)
+elseif (WIN32)
+    message(STATUS "Looking for BLAS and LAPACK on Windows (BLA_VENDOR=${BLA_VENDOR})")
     if (USE_MKL)
         add_compile_options("-DUSE_MKL")
         if (ILP64)
             set(BLA_VENDOR "Intel10_64ilp" CACHE STRING "Force MKL" FORCE)
         else()
             set(BLA_VENDOR "Intel10_64lp" CACHE STRING "Force MKL" FORCE)
         endif()
-    else()
-        set(BLA_VENDOR "OpenBLAS" CACHE STRING "Force OpenBLAS" FORCE)
-    endif()
 
-    message(STATUS "Looking for BLAS and LAPACK on Windows (BLA_VENDOR=${BLA_VENDOR})")
+        message(STATUS "BLA_VENDOR=${BLA_VENDOR}")
+        
+        find_package(MKL CONFIG REQUIRED PATHS $ENV{MKL_ROOT})
+        set (BLAS_LIBRARIES, ${MKL_REQUESTED_LIBRARIES})
+        set(BLAS_INCLUDE_DIRS, ${MKL_INCLUDE})
+        message(STATUS "MKL_INCLUDE=${MKL_INCLUDE}")
+        message(STATUS "MKL_LIB_DIR=${MKL_ROOT}/lib")
+        message(STATUS "DLL_EXT=${DLL_EXT}")
+        include_directories(${MKL_INCLUDE})
+        link_directories("${MKL_ROOT}/lib")
+
+        foreach(lib ${MKL_REQUESTED_LIBRARIES})
+            get_filename_component(libname ${lib} NAME_WLE)
+            list(APPEND MKL_REQUESTED_DLL_LIBRARIES "${libname}_dll")            
+        endforeach()
 
-    find_package(BLAS REQUIRED)
-    add_link_options(${BLAS_LINKER_FLAGS})
-    message(STATUS "BLAS_LINKER_FLAGS=${BLAS_LINKER_FLAGS}")
-    message(STATUS "BLAS_LIBRARIES=${BLAS_LIBRARIES}")
-    list(APPEND DNA_LIBRARIES ${BLAS_LIBRARIES})
+        message(STATUS "MKL_REQUESTED_DLL_LIBRARIES=${MKL_REQUESTED_DLL_LIBRARIES}")
+
+        list(APPEND DNA_LIBRARIES ${MKL_REQUESTED_DLL_LIBRARIES})
+    else()
+        set(BLA_VENDOR "OpenBLAS" CACHE STRING "Force OpenBLAS" FORCE)
+        find_package(BLAS REQUIRED)
+        add_link_options(${BLAS_LINKER_FLAGS})
+        message(STATUS "BLAS_LINKER_FLAGS=${BLAS_LINKER_FLAGS}")
+        message(STATUS "BLAS_LIBRARIES=${BLAS_LIBRARIES}")
+        list(APPEND DNA_LIBRARIES ${BLAS_LIBRARIES})
+    endif()   
+    
 
     if (NOT USE_MKL)
         set(BLA_VENDOR "Generic" CACHE STRING "Force Generic" FORCE)
@@ -311,7 +330,7 @@ elseif(WIN32)
         list(APPEND DNA_LIBRARIES ${LAPACK_LIBRARIES})
     endif()
 
-    if(NOT USE_MKL)
+    if (NOT USE_MKL)
         # Find OpenBLAS package which should set include directories
         find_package(OpenBLAS CONFIG QUIET)
         if(OpenBLAS_FOUND)
@@ -379,7 +398,8 @@ elseif(UNIX)
             list(APPEND DNA_LIBRARIES ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
         endif()
     endif()
-
+else()
+    message(STATUS "Here is something dandy")
 endif()
 
 message(STATUS "DynAdjust library dependencies: ${DNA_LIBRARIES}")

dynadjust/CMakePresets.json

@@ -4,7 +4,7 @@
 
   "configurePresets": [
     {
-      "name": "vs-x64",
+      "name": "vs-x64-openblas",
       "displayName": "VS2022 x64 (vcpkg)",
       "generator": "Visual Studio 17 2022",
       "architecture": { "value": "x64" },
@@ -13,15 +13,34 @@
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
         "VCPKG_TARGET_TRIPLET": "x64-windows"
       }
+    },
+    {
+      "name": "vs-x64-mkl",
+      "displayName": "VS2022 x64 (vcpkg)",
+      "generator": "Visual Studio 17 2022",
+      "architecture": { "value": "x64" },
+      "binaryDir": "${sourceParentDir}/build/",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+        "VCPKG_TARGET_TRIPLET": "x64-windows",
+        "CMAKE_PREFIX_PATH": "C:\\Program Files (x86)\\Intel\\oneAPI\\mkl\\2025.2\\lib\\cmake\\mkl;$env{CMAKE_PREFIX_PATH}",
+        "USE_MKL": "ON",
+        "MKL_ARCH": "intel64",
+        "MKL_MPI": "intelmpi",
+        "MKL_LINK": "dynamic",
+        "MKL_INTERFACE": "lp64",
+        "ENABLE_SCALAPACK": "True",
+        "BLA_VENDOR": "Intel10_64lp"
+      }
     }
   ],
 
   "buildPresets": [
-    { "name": "build-debug",   "configurePreset": "vs-x64", "configuration": "Debug" },
-    { "name": "build-release", "configurePreset": "vs-x64", "configuration": "Release" }
+    { "name": "build-debug",   "configurePreset": "vs-x64-mkl", "configuration": "Debug" },
+    { "name": "build-release", "configurePreset": "vs-x64-mkl", "configuration": "Release" }
   ],
 
   "testPresets": [
-    { "name": "ctest", "configurePreset": "vs-x64", "configuration": "Debug" }
+    { "name": "ctest", "configurePreset": "vs-x64-mkl", "configuration": "Debug" }
   ]
 }

dynadjust/include/config/dnaversion.hpp

@@ -125,9 +125,9 @@ const char* const __dynadjust_app_name__ = "dynadjust";
 
 #if defined(__APPLE__) // Apple Accelerate framework // (-DACCELERATE_LAPACK_ILP64=1 for ILP64)
     #define __LINEAR_ALGEBRA_LIB__ "OpenBLAS"
-#elif (defined(_WIN32) && !defined(MKL_ILP64) && !defined(MKL_LP64)) // Windows - No LAPACKE and no MKL
+#elif (defined(_WIN32) && !defined(USE_MKL)) // Windows - No LAPACKE and no MKL
     #define __LINEAR_ALGEBRA_LIB__ "OpenBLAS"
-#elif (defined(MKL_ILP64) || defined(MKL_LP64)) // Linux or Windows - Intel MKL with ILP64
+#elif (defined(_WIN32) && defined(USE_MKL))  // Linux or Windows - Intel MKL with ILP64
     #define __LINEAR_ALGEBRA_LIB__ "Intel MKL"
 #else // LAPACKE fall back
     #define __LINEAR_ALGEBRA_LIB__ "OpenBLAS"