Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 10:35:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'dispatcher_base_smarter_invocation_construction'

Browse Source 
50d298948 Slightly improve compile times by making less unique temp types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1917
This commit is contained in:
Robert Maynard 2019-12-05 15:49:54 +00:00 committed by Kitware Robot
commit 1b6e7f8f04
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vtkm/worklet/internal/DispatcherBase.h
View File

@ -759,24 +759,28 @@ private:
// Replace the parameters in the invocation with the execution object and
// pass to next step of Invoke. Also add the scatter information.
this->InvokeSchedule(invocation.ChangeParameters(execObjectParameters)
.ChangeOutputToInputMap(outputToInputMap.PrepareForInput(device))
.ChangeVisitArray(visitArray.PrepareForInput(device))
.ChangeThreadToOutputMap(threadToOutputMap.PrepareForInput(device)),
threadRange,
device);
vtkm::internal::Invocation<ExecObjectParameters,
typename Invocation::ControlInterface,
typename Invocation::ExecutionInterface,
Invocation::InputDomainIndex,
decltype(outputToInputMap.PrepareForInput(device)),
decltype(visitArray.PrepareForInput(device)),
decltype(threadToOutputMap.PrepareForInput(device)),
DeviceAdapter>
changedInvocation(execObjectParameters,
outputToInputMap.PrepareForInput(device),
visitArray.PrepareForInput(device),
threadToOutputMap.PrepareForInput(device));
this->InvokeSchedule(changedInvocation, threadRange, device);
}
template <typename Invocation, typename RangeType, typename DeviceAdapter>
VTKM_CONT void InvokeSchedule(const Invocation& invocation,
RangeType range,
DeviceAdapter device) const
VTKM_CONT void InvokeSchedule(const Invocation& invocation, RangeType range, DeviceAdapter) const
{
using Algorithm = vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>;
using TaskTypes = typename vtkm::cont::DeviceTaskTypes<DeviceAdapter>;
auto invocationForDevice = invocation.ChangeDeviceAdapterTag(device);
// The TaskType class handles the magic of fetching values
// for each instance and calling the worklet's function.
// The TaskType will evaluate to one of the following classes:
@ -784,7 +788,7 @@ private:
// vtkm::exec::internal::TaskSingular
// vtkm::exec::internal::TaskTiling1D
// vtkm::exec::internal::TaskTiling3D
auto task = TaskTypes::MakeTask(this->Worklet, invocationForDevice, range);
auto task = TaskTypes::MakeTask(this->Worklet, invocation, range);
Algorithm::ScheduleTask(task, range);
}
};