From c04b2b54402c5e239950e52920424fcdbdca4e38 Mon Sep 17 00:00:00 2001 From: Evan Harvey Date: Fri, 22 Jan 2021 10:14:53 -0700 Subject: [PATCH] cmake/std/atdm: Run Kokkos interOp tests in serial - Fixes #8544. - Fixes #8543. --- cmake/std/atdm/ATDMDisables.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/std/atdm/ATDMDisables.cmake b/cmake/std/atdm/ATDMDisables.cmake index 0d6f8a892edc..23c66631b4c5 100644 --- a/cmake/std/atdm/ATDMDisables.cmake +++ b/cmake/std/atdm/ATDMDisables.cmake @@ -315,4 +315,12 @@ IF (ATDM_NODE_TYPE STREQUAL "CUDA") "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution" CACHE STRING ) + # Ensure these Kokkos tests run in serial to other Trilinos tests. + # #6840 resulted in ctest spreading tests across multiple GPUs. By ensuring + # that this Kokkos inter operability test runs in serial, we ensure that the + # GPU ID is not swapped upon initialize resulting in an invalid Cuda stream. + # See #8544. + ATDM_SET_ENABLE(KokkosCore_UnitTest_CudaInterOpStreams_MPI_1_SET_RUN_SERIAL ON) + # See #8543. + ATDM_SET_ENABLE(KokkosCore_UnitTest_CudaInterOpInit_MPI_1_SET_RUN_SERIAL ON) ENDIF()