Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix inconsistency in generated WorkletInvokeFunctorDetail.h

Browse Source 
There was a direct edit to WorkletInvokeFunctorDetail.h that was not
reflected in WorkletInvokeFunctorDetail.h.in. This makes the two files
consistent so that future edits will not loose the changes.
This commit is contained in:
Kenneth Moreland 2018-05-29 17:39:16 -06:00
parent 01581a8204
commit 201ea1c578
2 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

280
vtkm/exec/internal/WorkletInvokeFunctorDetail.h
View File

@ -160,13 +160,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -278,13 +278,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -418,13 +418,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -580,13 +580,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -764,13 +764,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -970,13 +970,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -1198,13 +1198,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -1448,13 +1448,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -1720,13 +1720,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -2014,13 +2014,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -2330,13 +2330,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -2668,13 +2668,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -3028,13 +3028,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -3410,13 +3410,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -3814,13 +3814,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -4240,13 +4240,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -4688,13 +4688,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -5158,13 +5158,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -5650,13 +5650,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;
@ -6164,13 +6164,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
using Invocation = vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<void(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20)>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
using FetchInfo1 = InvocationToFetch<ThreadIndicesType, Invocation, 1>;
using FetchType1 = typename FetchInfo1::type;

14
vtkm/exec/internal/WorkletInvokeFunctorDetail.h.in
View File

@ -225,13 +225,13 @@ VTKM_EXEC void DoWorkletInvokeFunctor(
VisitArrayType>& invocation,
const ThreadIndicesType& threadIndices)
{
typedef vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<$signature(num_params, return_type='void')>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>
Invocation;
using Invocation =
vtkm::internal::Invocation<ParameterInterface,
ControlInterface,
vtkm::internal::FunctionInterface<$signature(num_params, return_type='void')>,
InputDomainIndex,
OutputToInputMapType,
VisitArrayType>;
$for(param_index in range(1, num_params+1))\
using FetchInfo$(param_index) = InvocationToFetch<ThreadIndicesType, Invocation, $(param_index)>;