From 559d2aab948eab09b9c6774cbd19ac74dc227481 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 8 Mar 2016 14:53:46 -0500 Subject: [PATCH] CUDA based worklets should now not timeout. The first CUDA worklet test requires way more time because of the overhead to allow the driver to convert the kernel code from virtual arch to actual arch. --- CMake/VTKmMacros.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMake/VTKmMacros.cmake b/CMake/VTKmMacros.cmake index 37f9bbe7f..0a43f2b0a 100644 --- a/CMake/VTKmMacros.cmake +++ b/CMake/VTKmMacros.cmake @@ -246,11 +246,11 @@ function(vtkm_unit_tests) #determine the timeout for all the tests based on the backend. CUDA tests #generally require more time because of kernel generation. set(timeout 180) + if (VTKm_UT_CUDA) + set(timeout 600) + endif() if (VTKm_UT_CUDA) - #specify a longer timeout for cuda - set(timeout 360) - vtkm_setup_nvcc_flags( old_nvcc_flags ) cuda_add_executable(${test_prog} ${TestSources}) @@ -367,11 +367,13 @@ function(vtkm_worklet_unit_tests device_adapter) set(is_cuda TRUE) endif() - #determine the timeout for all the tests based on the backend. CUDA tests - #generally require more time because of kernel generation. + #determine the timeout for all the tests based on the backend. The first CUDA + #worklet test requires way more time because of the overhead to allow the + #driver to convert the kernel code from virtual arch to actual arch. + # set(timeout 180) if(is_cuda) - set(timeout 360) + set(timeout 600) endif() if(VTKm_ENABLE_TESTING)