From fd2b7bf6d74fee6525a34a97b1e7035b976fb18b Mon Sep 17 00:00:00 2001 From: Nathan Ellingwood Date: Thu, 13 Sep 2018 15:04:36 -0600 Subject: [PATCH] KokkosKernels: Fix for spgemm unit_test mkl macro Address Trilinos issue #3438, incorporates part of fix from PR kokkos/kokkos-kernels#290 --- .../kokkos-kernels/unit_test/sparse/Test_Sparse_spgemm.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spgemm.hpp b/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spgemm.hpp index 04767c192428..b33f4ff932fc 100644 --- a/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spgemm.hpp +++ b/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spgemm.hpp @@ -301,14 +301,14 @@ void test_spgemm(lno_t numRows, size_type nnz, lno_t bandwidth, lno_t row_size_v case SPGEMM_CUSPARSE: //TODO: add these test failure cases for cusparse too. algo = "SPGEMM_CUSPARSE"; -#ifndef KERNELS_HAVE_CUSPARSE +#if !defined(KERNELS_HAVE_CUSPARSE) && !defined(KOKKOSKERNELS_ENABLE_TPL_CUSPARSE) is_expected_to_fail = true; #endif break; case SPGEMM_MKL: algo = "SPGEMM_MKL"; -#ifndef HAVE_KOKKOSKERNELS_MKL +#if !defined(HAVE_KOKKOSKERNELS_MKL) && !defined(KOKKOSKERNELS_ENABLE_TPL_MKL) is_expected_to_fail = true; #endif //MKL requires scalar to be either float or double