Skip to content

Commit

Permalink
Snapshot of kokkos-kernels.git from commit 7eb49945cc93d28437bd1d6eb7…
Browse files Browse the repository at this point in the history
…da418ad87678ed

From repository at git@github.com:kokkos/kokkos-kernels.git

At commit:
commit 7eb49945cc93d28437bd1d6eb7da418ad87678ed
Author: Nathan Ellingwood <ndellin@sandia.gov>
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 trilinos#12891

    Co-authored-by: brian-kelley <brian.honda11@gmail.com>
    (cherry picked from commit 5bf5474dcc02d7c9cd25e9c9adb377c7c62a49fc)
  • Loading branch information
ndellingwood committed Apr 5, 2024
1 parent 1721819 commit 802bf05
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 802bf05

Please sign in to comment.