From 81746c0546d5cabb574b61502afd233b54bf2d04 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Wed, 3 Jun 2020 16:17:48 -0600 Subject: [PATCH 1/5] Tpetra,Intrepid2: Adding RUN_SERIAL to tests which were timing out on RIDE --- .../unit-test/Discretization/Integration/Cuda/CMakeLists.txt | 3 ++- packages/tpetra/core/test/Blas/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/intrepid2/unit-test/Discretization/Integration/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Discretization/Integration/Cuda/CMakeLists.txt index 6ea7873d58f1..9838d29b1b84 100644 --- a/packages/intrepid2/unit-test/Discretization/Integration/Cuda/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Discretization/Integration/Cuda/CMakeLists.txt @@ -1,10 +1,11 @@ - +#Note BMK 6-3-20: adding RUN_SERIAL because this was timing out on RIDE TRIBITS_ADD_EXECUTABLE_AND_TEST( Test_01 SOURCES test_01.cpp ARGS PrintItAll NUM_MPI_PROCS 1 PASS_REGULAR_EXPRESSION "TEST PASSED" + RUN_SERIAL ADD_DIR_TO_NAME ) diff --git a/packages/tpetra/core/test/Blas/CMakeLists.txt b/packages/tpetra/core/test/Blas/CMakeLists.txt index c1396ff54422..8df88e4d8ccc 100644 --- a/packages/tpetra/core/test/Blas/CMakeLists.txt +++ b/packages/tpetra/core/test/Blas/CMakeLists.txt @@ -22,6 +22,7 @@ TRIBITS_ADD_TEST( COMM serial mpi NUM_MPI_PROCS 1 STANDARD_PASS_OUTPUT + RUN_SERIAL ) TRIBITS_ADD_TEST( @@ -31,6 +32,7 @@ TRIBITS_ADD_TEST( COMM serial mpi NUM_MPI_PROCS 1 STANDARD_PASS_OUTPUT + RUN_SERIAL ) TRIBITS_ADD_TEST( @@ -40,6 +42,7 @@ TRIBITS_ADD_TEST( COMM serial mpi NUM_MPI_PROCS 1 STANDARD_PASS_OUTPUT + RUN_SERIAL ) TRIBITS_ADD_TEST( @@ -49,4 +52,5 @@ TRIBITS_ADD_TEST( COMM serial mpi NUM_MPI_PROCS 1 STANDARD_PASS_OUTPUT + RUN_SERIAL ) From 9393e521dcb5b91954b9b0c8a274ebfa98a68d75 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Wed, 3 Jun 2020 17:06:02 -0600 Subject: [PATCH 2/5] Intrepid2: RUN_SERIAL Cuda InterpolationProjection On RIDE PR testing, these are in danger of timing out (taking 8-9 minutes, where the limit is 10 minutes). --- packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt index 47e2d962cade..db02068e5093 100644 --- a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt @@ -5,6 +5,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( @@ -14,6 +15,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( @@ -23,6 +25,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( @@ -32,6 +35,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( @@ -68,4 +72,4 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( NUM_MPI_PROCS 1 PASS_REGULAR_EXPRESSION "TEST PASSED" ADD_DIR_TO_NAME - ) \ No newline at end of file + ) From a39daa0a94454e0a87979e6c733197ecedee0ba3 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Wed, 3 Jun 2020 17:18:39 -0600 Subject: [PATCH 3/5] Intrepid2: only do HEX and TET in serial --- packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt index db02068e5093..c4ea3a1abafe 100644 --- a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt @@ -25,7 +25,6 @@ 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( @@ -35,7 +34,6 @@ 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( From 98f468a7b05ac05b07b3ac17c6fb1352930a9af9 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Thu, 4 Jun 2020 12:15:44 -0600 Subject: [PATCH 4/5] MueLu, Intrepid2: more temporary RUN_SERIAL (for long-running tests) --- packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt | 2 ++ packages/muelu/test/unit_tests/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt index c4ea3a1abafe..db02068e5093 100644 --- a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt +++ b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt @@ -25,6 +25,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( @@ -34,6 +35,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/muelu/test/unit_tests/CMakeLists.txt b/packages/muelu/test/unit_tests/CMakeLists.txt index 20fd2b2f11f6..46a34a6d1353 100644 --- a/packages/muelu/test/unit_tests/CMakeLists.txt +++ b/packages/muelu/test/unit_tests/CMakeLists.txt @@ -361,6 +361,7 @@ ENDIF() PASS_REGULAR_EXPRESSION "End Result: TEST PASSED" NUM_MPI_PROCS 4 COMM mpi + RUN_SERIAL ) IF (${PACKAGE_NAME}_ENABLE_CreatePreconditionerTests) From 3738034f56e7473b36af721f7fb3df9bbd8cd916 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Thu, 4 Jun 2020 13:55:25 -0600 Subject: [PATCH 5/5] MueLu: temporary RUN_SERIAL 1-rank intrepid2 test --- packages/muelu/test/unit_tests/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/muelu/test/unit_tests/CMakeLists.txt b/packages/muelu/test/unit_tests/CMakeLists.txt index 46a34a6d1353..00527740c5c7 100644 --- a/packages/muelu/test/unit_tests/CMakeLists.txt +++ b/packages/muelu/test/unit_tests/CMakeLists.txt @@ -352,6 +352,7 @@ ENDIF() PASS_REGULAR_EXPRESSION "End Result: TEST PASSED" NUM_MPI_PROCS 1 COMM serial mpi + RUN_SERIAL ) TRIBITS_ADD_TEST(