Merge pull request #12874 from cgcgcg/mueluRegressionUVM2

MueLu: Set counts for Regression test
trilinos · Apr 4, 2024 · 9b24394 · 9b24394
2 parents f7582a7 + e727d62
commit 9b24394
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/packages/muelu/test/unit_tests/ParameterList/ParameterListInterpreter/BlockCrs1.xml b/packages/muelu/test/unit_tests/ParameterList/ParameterListInterpreter/BlockCrs1.xml
@@ -5,6 +5,8 @@
   -->
 
   <!-- ===========  GENERAL ================ -->
+    <Parameter        name="aggregation: deterministic"           type="bool"     value="true"/>
+
     <Parameter        name="verbosity"                            type="string"   value="high"/>
 
     <Parameter        name="coarse: max size"                     type="int"      value="50"/>

diff --git a/packages/muelu/test/unit_tests/ParameterList/ParameterListInterpreter/BlockCrs2.xml b/packages/muelu/test/unit_tests/ParameterList/ParameterListInterpreter/BlockCrs2.xml
@@ -5,6 +5,8 @@
   -->
 
   <!-- ===========  GENERAL ================ -->
+    <Parameter        name="aggregation: deterministic"           type="bool"     value="true"/>
+
     <Parameter        name="verbosity"                            type="string"   value="high"/>
 
     <Parameter        name="coarse: max size"                     type="int"      value="50"/>

diff --git a/packages/muelu/test/unit_tests/Regression.cpp b/packages/muelu/test/unit_tests/Regression.cpp
@@ -105,9 +105,17 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Regression, H2D, Scalar, LocalOrdinal, GlobalO
 
   if (Node::is_cpu) {
     TEST_EQUALITY(Tpetra::Details::DeepCopyCounter::get_count_different_space(), 0);
-  } else {
+  }
+#ifdef KOKKOS_HAS_SHARED_SPACE
+  else {
+    size_t targetNumDeepCopies = std::is_same_v<typename Node::memory_space, Kokkos::SharedSpace> ? 20 : 37;
+    TEST_EQUALITY(Tpetra::Details::DeepCopyCounter::get_count_different_space(), targetNumDeepCopies);
+  }
+#else
+  else {
     TEST_EQUALITY(Tpetra::Details::DeepCopyCounter::get_count_different_space(), 37);
   }
+#endif
 
   auto X = Xpetra::MultiVectorFactory<SC, LO, GO, NO>::Build(A->getRowMap(), 1);
   auto B = Xpetra::MultiVectorFactory<SC, LO, GO, NO>::Build(A->getRowMap(), 1);

diff --git a/packages/muelu/test/unit_tests_kokkos/Regression.cpp b/packages/muelu/test/unit_tests_kokkos/Regression.cpp
@@ -115,7 +115,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Regression, H2D, Scalar, LocalOrdinal, GlobalO
   }
 #ifdef KOKKOS_HAS_SHARED_SPACE
   else {
-    size_t targetNumDeepCopies = std::is_same_v<typename Node::memory_space, Kokkos::SharedSpace> ? 31 : 42;
+    size_t targetNumDeepCopies = std::is_same_v<typename Node::memory_space, Kokkos::SharedSpace> ? 27 : 42;
     TEST_EQUALITY(Tpetra::Details::DeepCopyCounter::get_count_different_space(), targetNumDeepCopies);
   }
 #else