Merge topic 'restore_tbb_schedule_explicit_grain_size'

9607f71c TBB 1D scheduling restored to using the explicit grain size.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !946
This commit is contained in:
Robert Maynard 2017-09-21 20:45:23 +00:00 committed by Kitware Robot
commit 427ff728ad

@ -35,7 +35,7 @@ void DeviceAdapterAlgorithm<vtkm::cont::DeviceAdapterTagTBB>::ScheduleTask(
vtkm::exec::internal::ErrorMessageBuffer errorMessage(errorString, MESSAGE_SIZE);
functor.SetErrorMessageBuffer(errorMessage);
::tbb::blocked_range<vtkm::Id> range(0, size);
::tbb::blocked_range<vtkm::Id> range(0, size, tbb::TBB_GRAIN_SIZE);
::tbb::parallel_for(
range, [&](const ::tbb::blocked_range<vtkm::Id>& r) { functor(r.begin(), r.end()); });