Merge remote-tracking branch 'upstream/develop' into develop

E3SM-Project · Mar 8, 2024 · 8a2a231 · 8a2a231
2 parents 6e25228 + e612049
commit 8a2a231
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/packages/panzer/mini-em/src/solvers/MiniEM_Interpolation.cpp b/packages/panzer/mini-em/src/solvers/MiniEM_Interpolation.cpp
@@ -185,9 +185,8 @@ Teko::LinearOp buildInterpolation(const Teuchos::RCP<const panzer::LinearObjFact
 
     // estimate number of entries per row
     // This is an upper bound, as we are counting dofs that are on shared nodes, edges, faces more than once.
-    // Kokkos::View<size_t*,HostSpace> numEntriesPerRow("numEntriesPerRow", tp_rowmap->getLocalNumElements());
-    Kokkos::DualView<size_t*, DeviceSpace> numEntriesPerRow("numEntriesPerRow", tp_rowmap->getLocalNumElements());
-
+    using dv = Kokkos::DualView<size_t*, typename tp_graph::device_type>;
+    dv numEntriesPerRow("numEntriesPerRow", tp_rowmap->getLocalNumElements());
     {
       auto numEntriesPerRow_d = numEntriesPerRow.view_device();
 
@@ -220,8 +219,8 @@ Teko::LinearOp buildInterpolation(const Teuchos::RCP<const panzer::LinearObjFact
                                } //end HO LID loop
                              });
       } // blocks loop
-      numEntriesPerRow.template modify<DeviceSpace>();
-      numEntriesPerRow.template sync<HostSpace>();
+      numEntriesPerRow.template modify<typename dv::t_dev>();
+      numEntriesPerRow.template sync<typename dv::t_host>();
     }
 
     // Set up graph