Lapack: gesv host tpl fix

The types used for gesv_tpl_spec_avail and the actual TPL instantiation where mismatched leading to linker error.
kokkos · Nov 15, 2023 · 9d2da26 · 9d2da26
1 parent 52d70c1
commit 9d2da26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/lapack/tpls/KokkosLapack_gesv_tpl_spec_avail.hpp b/lapack/tpls/KokkosLapack_gesv_tpl_spec_avail.hpp
@@ -28,17 +28,17 @@ struct gesv_tpl_spec_avail {
 // Generic Host side LAPACK (could be MKL or whatever)
 #ifdef KOKKOSKERNELS_ENABLE_TPL_LAPACK
 
-#define KOKKOSLAPACK_GESV_TPL_SPEC_AVAIL_LAPACK(SCALAR, LAYOUT, MEMSPACE) \
-  template <class ExecSpace>                                              \
-  struct gesv_tpl_spec_avail<                                             \
-      ExecSpace,                                                          \
-      Kokkos::View<SCALAR**, LAYOUT, Kokkos::Device<ExecSpace, MEMSPACE>, \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >,             \
-      Kokkos::View<SCALAR**, LAYOUT, Kokkos::Device<ExecSpace, MEMSPACE>, \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >,             \
-      Kokkos::View<int*, LAYOUT, Kokkos::Device<ExecSpace, MEMSPACE>,     \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged> > > {          \
-    enum : bool { value = true };                                         \
+#define KOKKOSLAPACK_GESV_TPL_SPEC_AVAIL_LAPACK(SCALAR, LAYOUT, MEMSPACE)  \
+  template <class ExecSpace>                                               \
+  struct gesv_tpl_spec_avail<                                              \
+      ExecSpace,                                                           \
+      Kokkos::View<SCALAR**, LAYOUT, Kokkos::Device<ExecSpace, MEMSPACE>,  \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >,              \
+      Kokkos::View<SCALAR**, LAYOUT, Kokkos::Device<ExecSpace, MEMSPACE>,  \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >,              \
+      Kokkos::View<int*, LAYOUT, Kokkos::Device<ExecSpace, MEMSPACE>,      \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> > > {           \
+    enum : bool { value = true };                                          \
   };
 
 KOKKOSLAPACK_GESV_TPL_SPEC_AVAIL_LAPACK(double, Kokkos::LayoutLeft,

diff --git a/lapack/tpls/KokkosLapack_gesv_tpl_spec_decl.hpp b/lapack/tpls/KokkosLapack_gesv_tpl_spec_decl.hpp
@@ -85,7 +85,7 @@ void lapackGesvWrapper(const AViewType& A, const BViewType& B,
       Kokkos::View<SCALAR**, LAYOUT, Kokkos::Device<ExecSpace, MEM_SPACE>,   \
                    Kokkos::MemoryTraits<Kokkos::Unmanaged>>,                 \
       Kokkos::View<int*, LAYOUT,                                             \
-                   Kokkos::Device<Kokkos::DefaultHostExecutionSpace,         \
+                   Kokkos::Device<ExecSpace,         \
                                   Kokkos::HostSpace>,                        \
                    Kokkos::MemoryTraits<Kokkos::Unmanaged>>,                 \
       true, ETI_SPEC_AVAIL> {                                                \
@@ -95,7 +95,7 @@ void lapackGesvWrapper(const AViewType& A, const BViewType& B,
     using BViewType =                                                        \
         Kokkos::View<SCALAR**, LAYOUT, Kokkos::Device<ExecSpace, MEM_SPACE>, \
                      Kokkos::MemoryTraits<Kokkos::Unmanaged>>;               \
-    using PViewType = Kokkos::View<int*, LAYOUT, Kokkos::HostSpace,          \
+    using PViewType = Kokkos::View<int*, LAYOUT, Kokkos::Device<ExecSpace, MEM_SPACE>,          \
                                    Kokkos::MemoryTraits<Kokkos::Unmanaged>>; \
                                                                              \
     static void gesv(const ExecSpace& /* space */, const AViewType& A,       \