From 7813389e66d014976ddd2ac50d7f5469c7499aca Mon Sep 17 00:00:00 2001
From: Brian Kelley <bmkelle@sandia.gov>
Date: Mon, 18 Jul 2022 17:01:27 -0600
Subject: [PATCH] Fix D1 color ETI with both CudaSpace and UVM

Since GaussSeidel can be instantiated with different
temporary/persistent (aka fast/slow) memory spaces, and calls D1
coloring, D1 coloring itself also needs to be instantiated with
fast/slow spaces.

This fixes undefined reference errors on builds where UVM and CudaSpace
are both instantiated.
---
 src/CMakeLists.txt                           |  2 +-
 src/graph/impl/KokkosGraph_color_d1_spec.hpp | 82 ++++++++++----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8fd0bc21b8..a1c938aed5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -443,7 +443,7 @@ KOKKOSKERNELS_GENERATE_ETI(Graph_color_d1 color_d1
   COMPONENTS  graph
   HEADER_LIST ETI_HEADERS
   SOURCE_LIST SOURCES
-  TYPE_LISTS  FLOATS ORDINALS OFFSETS LAYOUTS DEVICES
+  TYPE_LISTS  FLOATS ORDINALS OFFSETS LAYOUTS DEVICES_W_SLOW_SPACE
 )
 
 LIST(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h)
diff --git a/src/graph/impl/KokkosGraph_color_d1_spec.hpp b/src/graph/impl/KokkosGraph_color_d1_spec.hpp
index 67cd09a099..09366f2c4e 100644
--- a/src/graph/impl/KokkosGraph_color_d1_spec.hpp
+++ b/src/graph/impl/KokkosGraph_color_d1_spec.hpp
@@ -64,21 +64,21 @@ struct color_d1_eti_spec_avail {
 }  // namespace Impl
 }  // namespace KokkosGraph
 
-#define KOKKOSGRAPH_COLOR_D1_ETI_SPEC_AVAIL(SCALAR_TYPE, ORDINAL_TYPE,       \
-                                            OFFSET_TYPE, LAYOUT_TYPE,        \
-                                            EXEC_SPACE_TYPE, MEM_SPACE_TYPE) \
-  template <>                                                                \
-  struct color_d1_eti_spec_avail<                                            \
-      KokkosKernels::Experimental::KokkosKernelsHandle<                      \
-          const OFFSET_TYPE, const ORDINAL_TYPE, const SCALAR_TYPE,          \
-          EXEC_SPACE_TYPE, MEM_SPACE_TYPE, MEM_SPACE_TYPE>,                  \
-      Kokkos::View<const OFFSET_TYPE *, LAYOUT_TYPE,                         \
-                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,          \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,                 \
-      Kokkos::View<const ORDINAL_TYPE *, LAYOUT_TYPE,                        \
-                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,          \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>> {               \
-    enum : bool { value = true };                                            \
+#define KOKKOSGRAPH_COLOR_D1_ETI_SPEC_AVAIL(                              \
+    SCALAR_TYPE, ORDINAL_TYPE, OFFSET_TYPE, LAYOUT_TYPE, EXEC_SPACE_TYPE, \
+    MEM_SPACE_TYPE, SLOW_MEM_SPACE_TYPE)                                  \
+  template <>                                                             \
+  struct color_d1_eti_spec_avail<                                         \
+      KokkosKernels::Experimental::KokkosKernelsHandle<                   \
+          const OFFSET_TYPE, const ORDINAL_TYPE, const SCALAR_TYPE,       \
+          EXEC_SPACE_TYPE, MEM_SPACE_TYPE, SLOW_MEM_SPACE_TYPE>,          \
+      Kokkos::View<const OFFSET_TYPE *, LAYOUT_TYPE,                      \
+                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,       \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,              \
+      Kokkos::View<const ORDINAL_TYPE *, LAYOUT_TYPE,                     \
+                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,       \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>> {            \
+    enum : bool { value = true };                                         \
   };
 
 // Include the actual specialization declarations
@@ -118,34 +118,34 @@ struct COLOR_D1<KernelHandle, size_view_t, lno_view_t, false,
 }  // namespace Impl
 }  // namespace KokkosGraph
 
-#define KOKKOSGRAPH_COLOR_D1_ETI_SPEC_DECL(SCALAR_TYPE, ORDINAL_TYPE,       \
-                                           OFFSET_TYPE, LAYOUT_TYPE,        \
-                                           EXEC_SPACE_TYPE, MEM_SPACE_TYPE) \
-  extern template struct COLOR_D1<                                          \
-      typename KokkosKernels::Experimental::KokkosKernelsHandle<            \
-          const OFFSET_TYPE, const ORDINAL_TYPE, const SCALAR_TYPE,         \
-          EXEC_SPACE_TYPE, MEM_SPACE_TYPE, MEM_SPACE_TYPE>,                 \
-      Kokkos::View<const OFFSET_TYPE *, LAYOUT_TYPE,                        \
-                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,         \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,                \
-      Kokkos::View<const ORDINAL_TYPE *, LAYOUT_TYPE,                       \
-                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,         \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,                \
+#define KOKKOSGRAPH_COLOR_D1_ETI_SPEC_DECL(                               \
+    SCALAR_TYPE, ORDINAL_TYPE, OFFSET_TYPE, LAYOUT_TYPE, EXEC_SPACE_TYPE, \
+    MEM_SPACE_TYPE, SLOW_MEM_SPACE_TYPE)                                  \
+  extern template struct COLOR_D1<                                        \
+      typename KokkosKernels::Experimental::KokkosKernelsHandle<          \
+          const OFFSET_TYPE, const ORDINAL_TYPE, const SCALAR_TYPE,       \
+          EXEC_SPACE_TYPE, MEM_SPACE_TYPE, SLOW_MEM_SPACE_TYPE>,          \
+      Kokkos::View<const OFFSET_TYPE *, LAYOUT_TYPE,                      \
+                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,       \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,              \
+      Kokkos::View<const ORDINAL_TYPE *, LAYOUT_TYPE,                     \
+                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,       \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,              \
       false, true>;
 
-#define KOKKOSGRAPH_COLOR_D1_ETI_SPEC_INST(SCALAR_TYPE, ORDINAL_TYPE,       \
-                                           OFFSET_TYPE, LAYOUT_TYPE,        \
-                                           EXEC_SPACE_TYPE, MEM_SPACE_TYPE) \
-  template struct COLOR_D1<                                                 \
-      KokkosKernels::Experimental::KokkosKernelsHandle<                     \
-          const OFFSET_TYPE, const ORDINAL_TYPE, const SCALAR_TYPE,         \
-          EXEC_SPACE_TYPE, MEM_SPACE_TYPE, MEM_SPACE_TYPE>,                 \
-      Kokkos::View<const OFFSET_TYPE *, LAYOUT_TYPE,                        \
-                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,         \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,                \
-      Kokkos::View<const ORDINAL_TYPE *, LAYOUT_TYPE,                       \
-                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,         \
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,                \
+#define KOKKOSGRAPH_COLOR_D1_ETI_SPEC_INST(                               \
+    SCALAR_TYPE, ORDINAL_TYPE, OFFSET_TYPE, LAYOUT_TYPE, EXEC_SPACE_TYPE, \
+    MEM_SPACE_TYPE, SLOW_MEM_SPACE_TYPE)                                  \
+  template struct COLOR_D1<                                               \
+      KokkosKernels::Experimental::KokkosKernelsHandle<                   \
+          const OFFSET_TYPE, const ORDINAL_TYPE, const SCALAR_TYPE,       \
+          EXEC_SPACE_TYPE, MEM_SPACE_TYPE, SLOW_MEM_SPACE_TYPE>,          \
+      Kokkos::View<const OFFSET_TYPE *, LAYOUT_TYPE,                      \
+                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,       \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,              \
+      Kokkos::View<const ORDINAL_TYPE *, LAYOUT_TYPE,                     \
+                   Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>,       \
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>,              \
       false, true>;
 
 #include <generated_specializations_hpp/KokkosGraph_color_d1_eti_spec_decl.hpp>