Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'benchmarks'

Browse Source 
fc68362d Build benchmarks even when testing is not enabled.
31e20859 Fix typo.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !696
This commit is contained in:
Robert Maynard 2017-02-15 20:10:18 +00:00 committed by Kitware Robot
commit ca302128a9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/VTKmMacros.cmake
View File

@ -518,7 +518,7 @@ function(vtkm_benchmarks device_adapter)
set(is_cuda TRUE)
endif()
if(VTKm_ENABLE_BENCHMARKS AND VTKm_ENABLE_TESTING)
if(VTKm_ENABLE_BENCHMARKS)
string(REPLACE "VTKM_DEVICE_ADAPTER_" "" device_type ${device_adapter})
if(is_cuda)

2
vtkm/cont/cuda/ErrorCuda.h
View File

@ -40,7 +40,7 @@
vtkm_cuda_check_async_error, \
__FILE__, \
__LINE__, \
"Unchecked asycnronous error"); \
"Unchecked asynchronous error"); \
} \
} \
VTKM_SWALLOW_SEMICOLON_POST_BLOCK