diff --git a/cmake/modules/FindMKL.cmake b/cmake/modules/FindMKL.cmake index d4b7579d4f3a4df056d4b6857c1422fc7227fb3a..10696d1a81cd2941656a3f2062e840ce6799dd0b 100644 --- a/cmake/modules/FindMKL.cmake +++ b/cmake/modules/FindMKL.cmake @@ -16,8 +16,8 @@ include(Hints) set(mkl_hints ${hint_prefixes}) set(mkl_lib_hints "") set(mkl_include_hints "") -list(APPEND mkl_hints "/opt/intel/mkl/" "$ENV{HOME}/intel/mkl" "/home/l_tobi01/Software/dune-gdt-super/local/mkl/") -append_to_each("${mkl_hints}" "lib/intel64" mkl_lib_hints) +list(APPEND mkl_hints "/opt/intel/mkl/" "$ENV{HOME}/intel/mkl/") +append_to_each("${mkl_hints}" "lib/intel64/" mkl_lib_hints) append_to_each("${mkl_hints}" "include/" mkl_include_hints) find_library(MKL_LP64_LIBRARY mkl_intel_lp64 HINTS ${mkl_lib_hints}) @@ -45,6 +45,7 @@ else("${MKL_LP64_LIBRARY}" MATCHES "MKL_LP64_LIBRARY-NOTFOUND") endif("${MKL_LIBRARY}" MATCHES "MKL_LP64_LIBRARY-NOTFOUND") message("-- checking for mkl.h header") +#message(FATAL_ERROR ${mkl_include_hints}) find_path(MKL_INCLUDE_DIRS mkl.h HINTS ${mkl_include_hints}) if("${MKL_INCLUDE_DIRS}" MATCHES "MKL_INCLUDE_DIRS-NOTFOUND") message("-- mkl.h header not found") diff --git a/dune/xt/common/lapacke.cc b/dune/xt/common/lapacke.cc index b1586b8e79477dc02b504a19987599bf5f507f59..739d6cd9d42148d2419c2711b2724569907495f1 100644 --- a/dune/xt/common/lapacke.cc +++ b/dune/xt/common/lapacke.cc @@ -330,17 +330,6 @@ int dormqr(int DXTC_LAPACKE_ONLY(matrix_layout), #if HAVE_MKL || HAVE_LAPACKE return LAPACKE_dormqr(matrix_layout, side, trans, m, n, k, a, lda, tau, c, ldc); #else - DUNE_UNUSED_PARAMETER(matrix_layout); - DUNE_UNUSED_PARAMETER(side); - DUNE_UNUSED_PARAMETER(trans); - DUNE_UNUSED_PARAMETER(m); - DUNE_UNUSED_PARAMETER(n); - DUNE_UNUSED_PARAMETER(k); - DUNE_UNUSED_PARAMETER(a); - DUNE_UNUSED_PARAMETER(lda); - DUNE_UNUSED_PARAMETER(tau); - DUNE_UNUSED_PARAMETER(c); - DUNE_UNUSED_PARAMETER(ldc); DUNE_THROW(Exceptions::dependency_missing, "You are missing lapacke or the intel mkl, check available() first!"); return 1; #endif @@ -418,9 +407,6 @@ int dpttrf(int DXTC_LAPACKE_ONLY(n), double* DXTC_LAPACKE_ONLY(d), double* DXTC_ #if HAVE_MKL || HAVE_LAPACKE return LAPACKE_dpttrf(n, d, e); #else - DUNE_UNUSED_PARAMETER(n); - DUNE_UNUSED_PARAMETER(d); - DUNE_UNUSED_PARAMETER(e); DUNE_THROW(Exceptions::dependency_missing, "You are missing lapacke or the intel mkl, check available() first!"); return 1; #endif