Merge 'trilinos/Trilinos:develop' (f684369) into 'tcad-charon/Trilino…

…s:develop' (3b3055d). * trilinos-develop: Intrepid2: Set correct exec. spaces and RUN_SERIAL property for Projection tests (trilinos#7438)
tcad-charon · Jun 15, 2020 · 8ca364d · 8ca364d
2 parents 3b3055d + f684369
commit 8ca364d
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 29 deletions.
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt
@@ -1,75 +1,126 @@
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_HEX
   SOURCES test_interpolation_projection_HEX.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_HEX
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
   RUN_SERIAL
   )
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_TET
   SOURCES test_interpolation_projection_TET.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_TET
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
   RUN_SERIAL
   )
+
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_QUAD
   SOURCES test_interpolation_projection_QUAD.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_QUAD
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
   RUN_SERIAL
   )
-
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_TRI
   SOURCES test_interpolation_projection_TRI.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_TRI
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
   RUN_SERIAL
   )
-
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_HEX
   SOURCES test_convergence_HEX.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_Convergence_HEX
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL 
   )
-
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_TET
   SOURCES test_convergence_TET.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_Convergence_TET
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL 
   )
-
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_QUAD
   SOURCES test_convergence_QUAD.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_Convergence_QUAD
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL
   )
-
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_TRI
   SOURCES test_convergence_TRI.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_Convergence_TRI
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL
   )
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_QUAD.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_HEX.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_QUAD.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TET.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TRI.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_HEX.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TET.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TRI.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_HEX.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_QUAD.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TET.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;

diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TRI.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
 
-  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;