Various

random_generator/CMakeLists.txt

@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.16)
 
 project("TREX - Scherman-Morrison random generator" VERSION "0.1.0")
 
+set(MKL_DIR $ENV{MKLROOT}/lib/cmake/mkl)
+
 set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/headers)
 set(GLOBAL_BIN_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
 set(GLOBAL_LIB_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
@@ -14,8 +16,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/versioning.h.in" "${PROJECT_BINA
 include_directories(${PROJECT_BINARY_DIR})
 
 find_package(HDF5 REQUIRED)
-find_package(BLAS REQUIRED)
-find_package(LAPACK REQUIRED)
+find_package(MKL REQUIRED)
+message(STATUS "Imported Intel oneMKL targets: ${MKL_IMPORTED_TARGETS}")
 find_package(OpenMP REQUIRED)
 
-add_subdirectory(src)
+add_subdirectory(src)

random_generator/src/cycle_generation/CMakeLists.txt

@@ -11,4 +11,4 @@ add_library(cycle_generation
         CApi.cpp)
 target_include_directories(cycle_generation PUBLIC ${CURRENT_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS})
 target_link_libraries(cycle_generation PUBLIC update_generation ${HDF5_LIBRARIES}
-        m ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} lapacke)
+	m ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} MKL::MKL)

random_generator/src/cycle_generation/Matrix.cpp

@@ -1,6 +1,7 @@
 
 #include "cycle_generation/Matrix.hpp"
-#include <lapacke.h>
+// #include <lapacke.h>
+#include <mkl_lapacke.h>
 
 namespace randomgen {
 
@@ -107,4 +108,4 @@ namespace randomgen {
     return res;
   }
 
-}// namespace randomgen
+}// namespace randomgen