Adds GMRES resolve test for Kokkos DualView, fixes templates in other…

… tests.
trilinos · Dec 18, 2023 · 13cf380 · 13cf380
1 parent 6c8f94d
commit 13cf380
Show file tree

Hide file tree

Showing 4 changed files with 448 additions and 2 deletions.
diff --git a/packages/belos/tpetra/test/BlockGmres/CMakeLists.txt b/packages/belos/tpetra/test/BlockGmres/CMakeLists.txt
@@ -32,6 +32,16 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   STANDARD_PASS_OUTPUT
   )
 
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  Tpetra_KokkosDense_resolve_gmres_hb
+  SOURCES test_kokkos_resolve_gmres_hb.cpp
+  COMM serial mpi
+  ARGS
+    "--verbose --filename=orsirr1.hb"
+    "--verbose --filename=orsirr1.hb --pseudo"
+  STANDARD_PASS_OUTPUT
+  )
+
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   Tpetra_pseudo_gmres_hb
   SOURCES test_pseudo_gmres_hb.cpp

diff --git a/packages/belos/tpetra/test/BlockGmres/test_kokkos_hybrid_gmres_hb.cpp b/packages/belos/tpetra/test/BlockGmres/test_kokkos_hybrid_gmres_hb.cpp
@@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
   typedef Tpetra::Operator<ST>             OP;
   typedef Tpetra::MultiVector<ST>          MV;
   typedef Belos::OperatorTraits<ST,MV,OP> OPT;
-  typedef Belos::MultiVecTraits<ST,MV>    MVT;
+  typedef Belos::MultiVecTraits<ST,MV,DM> MVT;
 
   Tpetra::ScopeGuard tpetraScope(&argc,&argv);
 

diff --git a/packages/belos/tpetra/test/BlockGmres/test_kokkos_pseudo_gmres_hb.cpp b/packages/belos/tpetra/test/BlockGmres/test_kokkos_pseudo_gmres_hb.cpp
@@ -82,7 +82,7 @@ int run(int argc, char *argv[]) {
   using tmap_t       = Tpetra::Map<LO,GO,NT>;
   using tcrsmatrix_t = Tpetra::CrsMatrix<ST,LO,GO,NT>;
 
-  using MVT = typename Belos::MultiVecTraits<ST,MV>;
+  using MVT = typename Belos::MultiVecTraits<ST,MV,DM>;
   using OPT = typename Belos::OperatorTraits<ST,MV,OP>;
 
   using Teuchos::RCP;