From 727918828efebc65d94eb0be20b564b867358c94 Mon Sep 17 00:00:00 2001 From: Mauro Perego Date: Wed, 27 May 2020 08:48:00 -0600 Subject: [PATCH 1/3] Intrepid2: Set correct execution spaces for Projection's tests --- packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt | 2 ++ .../unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp | 2 +- .../Projection/Cuda/test_DeRham_commutativity_QUAD.cpp | 2 +- .../unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp | 2 +- .../unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp | 2 +- .../unit-test/Projection/Cuda/test_convergence_HEX.cpp | 2 +- .../unit-test/Projection/Cuda/test_convergence_QUAD.cpp | 2 +- .../unit-test/Projection/Cuda/test_convergence_TET.cpp | 2 +- .../unit-test/Projection/Cuda/test_convergence_TRI.cpp | 2 +- .../Projection/OpenMP/test_DeRham_commutativity_HEX.cpp | 2 +- .../Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp | 2 +- .../Projection/OpenMP/test_DeRham_commutativity_TET.cpp | 2 +- .../Projection/OpenMP/test_DeRham_commutativity_TRI.cpp | 2 +- .../unit-test/Projection/OpenMP/test_convergence_HEX.cpp | 2 +- .../unit-test/Projection/OpenMP/test_convergence_QUAD.cpp | 2 +- .../unit-test/Projection/OpenMP/test_convergence_TET.cpp | 2 +- .../unit-test/Projection/OpenMP/test_convergence_TRI.cpp | 2 +- 17 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt index db02068e5093..0c2e67c6bc28 100644 --- a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt @@ -45,6 +45,7 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( NUM_MPI_PROCS 1 PASS_REGULAR_EXPRESSION "TEST PASSED" ADD_DIR_TO_NAME + RUN_SERIAL ) TRIBITS_ADD_EXECUTABLE_AND_TEST( @@ -54,6 +55,7 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( NUM_MPI_PROCS 1 PASS_REGULAR_EXPRESSION "TEST PASSED" ADD_DIR_TO_NAME + RUN_SERIAL ) TRIBITS_ADD_EXECUTABLE_AND_TEST( 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 index 7509f5eae136..72d5cf78665b 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityHex(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 index e36eaaaba4dc..25e75779a5a2 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityQuad(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 index 5db74d4f06b0..88382b75d7cd 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityTet(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 index 0a10f618396c..e8a12fe0d008 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityTri(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 index 73c7375f8fc2..62457d3e180f 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceHex(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 index cbb98a182fd3..86830c9eda0d 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceQuad(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 index f847ce283c8b..63ac0639d0ab 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceTet(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 index 43d8fb34f25d..7e1a7ab6bc4f 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceTri(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 index 7509f5eae136..e428193f004e 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityHex(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 index e36eaaaba4dc..b46336a66641 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityQuad(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 index 5db74d4f06b0..9174a4641abe 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityTet(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 index 0a10f618396c..49146d5cec52 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::DeRhamCommutativityTri(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 index 73c7375f8fc2..dc9ef8ae29e6 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceHex(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 index cbb98a182fd3..a3b2970e5c50 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceQuad(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 index f847ce283c8b..fec108638fc0 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceTet(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 index 43d8fb34f25d..8166184884d9 100644 --- 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(verbose); + const int r_val = Intrepid2::Test::ConvergenceTri(verbose); Kokkos::finalize(); return r_val; From 9bf8db10d5319a466b8c24eced5f85bb71e1c2f7 Mon Sep 17 00:00:00 2001 From: mperego Date: Sun, 7 Jun 2020 09:30:43 -0600 Subject: [PATCH 2/3] Update CMakeLists.txt --- packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt index 0c2e67c6bc28..6b24ba996248 100644 --- a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt @@ -65,6 +65,7 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( NUM_MPI_PROCS 1 PASS_REGULAR_EXPRESSION "TEST PASSED" ADD_DIR_TO_NAME + RUN_SERIAL ) TRIBITS_ADD_EXECUTABLE_AND_TEST( @@ -74,4 +75,5 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( NUM_MPI_PROCS 1 PASS_REGULAR_EXPRESSION "TEST PASSED" ADD_DIR_TO_NAME + RUN_SERIAL ) From f8ab75da96364f44ff2994d975ea00087082c533 Mon Sep 17 00:00:00 2001 From: Mauro Perego Date: Sat, 13 Jun 2020 22:07:53 -0600 Subject: [PATCH 3/3] fix setting RUN_SERIAL property in tests --- .../unit-test/Projection/Cuda/CMakeLists.txt | 73 +++++++++++++++---- 1 file changed, 60 insertions(+), 13 deletions(-) diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt index 6b24ba996248..0a67d5645f02 100644 --- a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt @@ -1,6 +1,11 @@ -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" @@ -8,69 +13,111 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( 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"