From 802bf05e4555d8308a0882e0b833708a98fc4380 Mon Sep 17 00:00:00 2001 From: Nathan Ellingwood Date: Fri, 5 Apr 2024 13:25:14 -0600 Subject: [PATCH] Snapshot of kokkos-kernels.git from commit 7eb49945cc93d28437bd1d6eb7da418ad87678ed From repository at git@github.com:kokkos/kokkos-kernels.git At commit: commit 7eb49945cc93d28437bd1d6eb7da418ad87678ed Author: Nathan Ellingwood Date: Fri Apr 5 13:06:34 2024 -0600 KokkosLapack_svd_tpl_spec_decl: defer to MKL spec when LAPACK also enabled Resolves redefintion of struct SVD compilation errors with both MKL and LAPACK are enabled Reported by @maartenarnst in https://github.com/trilinos/Trilinos/issues/12891 Co-authored-by: brian-kelley (cherry picked from commit 5bf5474dcc02d7c9cd25e9c9adb377c7c62a49fc) --- .../lapack/tpls/KokkosLapack_svd_tpl_spec_decl.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/kokkos-kernels/lapack/tpls/KokkosLapack_svd_tpl_spec_decl.hpp b/packages/kokkos-kernels/lapack/tpls/KokkosLapack_svd_tpl_spec_decl.hpp index bc23068c57f1..4385fa40d636 100644 --- a/packages/kokkos-kernels/lapack/tpls/KokkosLapack_svd_tpl_spec_decl.hpp +++ b/packages/kokkos-kernels/lapack/tpls/KokkosLapack_svd_tpl_spec_decl.hpp @@ -41,7 +41,8 @@ inline void svd_print_specialization() { } // namespace KokkosLapack // LAPACK -#ifdef KOKKOSKERNELS_ENABLE_TPL_LAPACK +#if defined(KOKKOSKERNELS_ENABLE_TPL_LAPACK) && \ + !defined(KOKKOSKERNELS_ENABLE_TPL_MKL) #include "KokkosLapack_Host_tpl.hpp" namespace KokkosLapack {