From e609164292f64f8e69e78d12e0a57cc22efe3728 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 15 Jun 2018 14:56:08 -0600 Subject: [PATCH] Disable some more Kokkos and KokkosKernels individual unit tests for some debug builds (#2827) These very targeted disables should allow these tests to all complete in well under 10 minutes in all of these debug builds on all of these platforms. See the diffs to see exactly what unit tests are disabled in what unit test executables in what builds on what platforms. For details on why these are being disabled, see #2827. --- .../std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake | 8 +++++--- .../std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake | 17 +++++++++++++++++ .../shiller/tweaks/CUDA-9.0-DEBUG-CUDA.cmake | 5 +++++ .../atdm/shiller/tweaks/GNU-DEBUG-SERIAL.cmake | 5 +++++ .../shiller/tweaks/INTEL-DEBUG-OPENMP.cmake | 4 ++++ .../shiller/tweaks/INTEL-DEBUG-SERIAL.cmake | 6 ++++++ 6 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-OPENMP.cmake diff --git a/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake b/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake index 27dc07e295c0..e27780621607 100644 --- a/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake +++ b/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake @@ -6,13 +6,15 @@ ATDM_SET_ENABLE(TeuchosNumerics_LAPACK_test_MPI_1_DISABLE ON) # This test segfaults in the 'debug' builds on this system (#2466) ATDM_SET_ENABLE(Belos_Tpetra_PseudoBlockCG_hb_test_MPI_4_DISABLE ON) -# Disable some unit tests that run too slow in debug mode for this CUDA DEBUG -# build (#2827) +# Disable some unit tests that run too slow in this DEBUG build (#2827) ATDM_SET_CACHE(KokkosContainers_UnitTest_Serial_MPI_1_EXTRA_ARGS "--gtest_filter=-serial.bitset:serial.scatterview" CACHE STRING ) +ATDM_SET_CACHE(KokkosKernels_graph_serial_MPI_1_EXTRA_ARGS + "--gtest_filter=-serial.graph_graph_color_d2_double_int_int_TestExecSpace" + CACHE STRING ) ATDM_SET_CACHE(KokkosKernels_sparse_serial_MPI_1_EXTRA_ARGS - "--gtest_filter=-serial.sparse_block_gauss_seidel_double_int_int_TestExecSpace:serial.sparse_block_gauss_seidel_double_int_size_t_TestExecSpace" + "--gtest_filter=-serial.sparse_block_gauss_seidel_double_int_int_TestExecSpace:serial.sparse_block_gauss_seidel_double_int_size_t_TestExecSpace:serial.sparse_trsv_mv_double_int_int_LayoutLeft_TestExecSpace" CACHE STRING ) # Disable randomly failing tests for this build (#2920) diff --git a/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake b/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake index 1b7611191cc5..06de80ba7ea2 100644 --- a/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake +++ b/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake @@ -8,3 +8,20 @@ ATDM_SET_ENABLE(PanzerAdaptersSTK_MixedPoissonExample-ConvTest-Hex-Order-3_DISAB # This test segfaults in the 'debug' builds on this system (#2466) ATDM_SET_ENABLE(Belos_Tpetra_PseudoBlockCG_hb_test_MPI_4_DISABLE ON) + +# Disable some unit tests that run too slow in this DEBUG build (#2827) +ATDM_SET_CACHE(KokkosContainers_UnitTest_Serial_MPI_1_EXTRA_ARGS + "--gtest_filter=-serial.bitset:serial.scatterview" + CACHE STRING ) +ATDM_SET_CACHE(KokkosContainers_UnitTest_OpenMP_MPI_1_EXTRA_ARGS + "--gtest_filter=-openmp.UnorderedMap_failed_insert" + CACHE STRING ) +ATDM_SET_CACHE(KokkosKernels_graph_serial_MPI_1_EXTRA_ARGS + "--gtest_filter=-serial.graph_graph_color_d2_double_int_int_TestExecSpace" + CACHE STRING ) +ATDM_SET_CACHE(KokkosKernels_sparse_openmp_MPI_1_EXTRA_ARGS + "--gtest_filter=-openmp.sparse_block_gauss_seidel_double_int_int_TestExecSpace:openmp.sparse_trsv_mv_double_int_int_LayoutLeft_TestExecSpace" + CACHE STRING ) +ATDM_SET_CACHE(KokkosKernels_sparse_serial_MPI_1_EXTRA_ARGS + "--gtest_filter=-serial.sparse_block_gauss_seidel_double_int_int_TestExecSpace:serial.sparse_block_gauss_seidel_double_int_size_t_TestExecSpace:serial.sparse_trsv_mv_double_int_int_LayoutLeft_TestExecSpace" + CACHE STRING ) diff --git a/cmake/std/atdm/shiller/tweaks/CUDA-9.0-DEBUG-CUDA.cmake b/cmake/std/atdm/shiller/tweaks/CUDA-9.0-DEBUG-CUDA.cmake index 04fe70e8f92d..f70f37d706c0 100644 --- a/cmake/std/atdm/shiller/tweaks/CUDA-9.0-DEBUG-CUDA.cmake +++ b/cmake/std/atdm/shiller/tweaks/CUDA-9.0-DEBUG-CUDA.cmake @@ -1 +1,6 @@ +# Disable some unit tests that run too slow in this DEBUG build (#2827) +ATDM_SET_CACHE(KokkosKernels_sparse_serial_MPI_1_EXTRA_ARGS + "--gtest_filter=-serial.sparse_block_gauss_seidel_double_int_int_TestExecSpace:serial.sparse_trsv_mv_double_int_int_LayoutLeft_TestExecSpace" + CACHE STRING ) + INCLUDE("${CMAKE_CURRENT_LIST_DIR}/CUDA_COMMON_TWEAKS.cmake") diff --git a/cmake/std/atdm/shiller/tweaks/GNU-DEBUG-SERIAL.cmake b/cmake/std/atdm/shiller/tweaks/GNU-DEBUG-SERIAL.cmake index 40234a99958a..c166bece6fc5 100644 --- a/cmake/std/atdm/shiller/tweaks/GNU-DEBUG-SERIAL.cmake +++ b/cmake/std/atdm/shiller/tweaks/GNU-DEBUG-SERIAL.cmake @@ -9,3 +9,8 @@ ATDM_SET_ENABLE(Stratimikos_test_aztecoo_thyra_driver_MPI_1_DISABLE ON) # Disable expensive test that started timing out (#2919) ATDM_SET_ENABLE(Belos_rcg_hb_MPI_4_DISABLE ON) + +# Disable some unit tests that run too slow in this DEBUG build (#2827) +ATDM_SET_CACHE(KokkosKernels_sparse_serial_MPI_1_EXTRA_ARGS + "--gtest_filter=-serial.sparse_block_gauss_seidel_double_int_int_TestExecSpace:serial.sparse_trsv_mv_double_int_int_LayoutLeft_TestExecSpace" + CACHE STRING ) diff --git a/cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-OPENMP.cmake b/cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-OPENMP.cmake new file mode 100644 index 000000000000..20c681bb6a9f --- /dev/null +++ b/cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-OPENMP.cmake @@ -0,0 +1,4 @@ +# Disable some unit tests that run too slow in this DEBUG build (#2827) +ATDM_SET_CACHE(KokkosKernels_sparse_serial_MPI_1_EXTRA_ARGS + "--gtest_filter=-serial.sparse_block_gauss_seidel_double_int_int_TestExecSpace:serial.sparse_trsv_mv_double_int_int_LayoutLeft_TestExecSpace" + CACHE STRING ) diff --git a/cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-SERIAL.cmake b/cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-SERIAL.cmake index 458806fade28..1ca3de3ef922 100644 --- a/cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-SERIAL.cmake +++ b/cmake/std/atdm/shiller/tweaks/INTEL-DEBUG-SERIAL.cmake @@ -1,2 +1,8 @@ # Disable test that runs over 30 min currently (#2446) ATDM_SET_ENABLE(PanzerAdaptersSTK_MixedPoissonExample-ConvTest-Hex-Order-3_DISABLE ON) + +ATDM_SET_CACHE(KokkosKernels_sparse_serial_MPI_1_EXTRA_ARGS + +# Disable some unit tests that run too slow in this DEBUG build (#2827) +"--gtest_filter=-serial.sparse_block_gauss_seidel_double_int_int_TestExecSpace:serial.sparse_trsv_mv_double_int_int_LayoutLeft_TestExecSpace" + CACHE STRING )