Merge pull request #2148 from mndevec/kk_mkl_spgemm_bug_fix

Kokkoskernels: spgemm disabling mkl flag on mkl2phase.
trilinos · Jan 10, 2018 · 6ab3036 · 6ab3036
2 parents 9458ba8 + 00358dc
commit 6ab3036
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp
@@ -47,7 +47,7 @@
 //#define HAVE_KOKKOSKERNELS_MKL
 
 
-#ifdef HAVE_KOKKOSKERNELS_MKL
+#ifdef HAVE_KOKKOSKERNELS_MKL_DISABLED
 #include "mkl.h"
 #endif
 
@@ -81,7 +81,7 @@ void mkl2phase_symbolic(
     cin_row_index_view_type row_mapC,
     bool verbose = false){
 
-#ifdef HAVE_KOKKOSKERNELS_MKL
+#ifdef HAVE_KOKKOSKERNELS_MKL_DISABLED
 
   typedef typename KernelHandle::nnz_lno_t idx;
 
@@ -216,7 +216,7 @@ void mkl2phase_symbolic(
       cin_nonzero_value_view_type &valuesC,
       bool verbose = false){
 
-#ifdef HAVE_KOKKOSKERNELS_MKL
+#ifdef HAVE_KOKKOSKERNELS_MKL_DISABLED
 
     typedef typename KernelHandle::nnz_lno_t idx;