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

Update pyexpander input files to work with python 3

Browse Source 
Python 3 does not use xrange anymore. Use the range function instead.
This commit is contained in:
Kenneth Moreland 2019-04-04 11:20:56 -06:00
parent 23f0905a1e
commit e43770a376
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ def template_params(num_params, start=0, name=''):
if num_params < start:
return ''
result = 'typename %s' % ptype(start, name)
for param in xrange(start+1, num_params+1):
for param in range(start+1, num_params+1):
result += ',\n typename %s' % ptype(param, name)
return result
@ -91,7 +91,7 @@ def signature(num_params, return_type=ptype(0), name=''):
result = '%s(' % return_type
if num_params > 0:
result += ptype(1, name)
for param in xrange(2, num_params+1):
for param in range(2, num_params+1):
result += ', %s' % ptype(param, name)
result += ')'
return result
@ -100,7 +100,7 @@ def arg_list(num_params, name='', start=1):
if num_params < start:
return ''
result = pname(start, name)
for param in xrange(start+1, num_params+1):
for param in range(start+1, num_params+1):
result += ', %s' % pname(param, name)
return result
)\

14
vtkm/internal/FunctionInterfaceDetailPost.h.in
View File

@ -65,7 +65,7 @@ def template_params(num_params, start=0, name=''):
if num_params < start:
return ''
result = 'typename %s' % ptype(start, name)
for param in xrange(start+1, num_params+1):
for param in range(start+1, num_params+1):
result += ',\n typename %s' % ptype(param, name)
return result
@ -73,7 +73,7 @@ def signature(num_params, name=''):
result = '%s(' % ptype(0, name)
if num_params > 0:
result += ptype(1, name)
for param in xrange(2, num_params+1):
for param in range(2, num_params+1):
result += ',%s' % ptype(param, name)
result += ')'
return result
@ -93,13 +93,13 @@ namespace detail
// clang-format off
$for(num_params in xrange(0, max_parameters+1))\
$for(num_params in range(0, max_parameters+1))\
template<typename Transform,
$template_params(num_params)>
struct FunctionInterfaceStaticTransformType<$signature(num_params), Transform>
{
using type = $ptype(0)(
$for(param_index in xrange(1, num_params+1))\
$for(param_index in range(1, num_params+1))\
typename Transform::template ReturnType<$ptype(param_index),$(param_index)>::type$comma_if(param_index<num_params)
$endfor\
);
@ -115,7 +115,7 @@ $endfor\
// clang-format off
$for(num_params in xrange(0, max_parameters+1))\
$for(num_params in range(0, max_parameters+1))\
/// \brief Create a \c FunctionInterface
///
/// \c make_FunctionInterface is a function that takes a variable number of
@ -131,14 +131,14 @@ $for(num_params in xrange(0, max_parameters+1))\
template<$template_params(num_params)>
FunctionInterface<$signature(num_params)>
make_FunctionInterface(
$for(param_index in xrange(1,num_params+1))\
$for(param_index in range(1,num_params+1))\
const $ptype(param_index)& p$(param_index)$comma_if(param_index<num_params)
$endfor\
)
{
detail::ParameterContainer<$signature(num_params)> container =
{
$for(param_index in xrange(1,num_params+1))\
$for(param_index in range(1,num_params+1))\
p$(param_index)$comma_if(param_index<num_params)
$endfor\
};

16
vtkm/internal/FunctionInterfaceDetailPre.h.in
View File

@ -67,7 +67,7 @@ def template_params(num_params, start=0, name=''):
if num_params < start:
return ''
result = 'typename %s' % ptype(start, name)
for param in xrange(start+1, num_params+1):
for param in range(start+1, num_params+1):
result += ',\n typename %s' % ptype(param, name)
return result
@ -75,7 +75,7 @@ def signature(num_params, return_type=ptype(0), name=''):
result = '%s(' % return_type
if num_params > 0:
result += ptype(1, name)
for param in xrange(2, num_params+1):
for param in range(2, num_params+1):
result += ', %s' % ptype(param, name)
result += ')'
return result
@ -278,7 +278,7 @@ $if(num_params < 1)\
result.Value = transform(f());
$else\
result.Value = transform(f(
$for(param_index in xrange(1, num_params))\
$for(param_index in range(1, num_params))\
transform(parameters.Parameter$(param_index)),
$endfor\
transform(parameters.Parameter$(num_params))));
@ -300,7 +300,7 @@ $if(num_params < 1)\
f();
$else\
f(
$for(param_index in xrange(1, num_params))\
$for(param_index in range(1, num_params))\
transform(parameters.Parameter$(param_index)),
$endfor\
transform(parameters.Parameter$(num_params)));
@ -320,7 +320,7 @@ struct FunctionInterfaceStaticTransformType;
// clang-format off
$for(num_params in xrange(0, max_parameters))\
$for(num_params in range(0, max_parameters))\
$# Transform functions need both control and execution versions
$for(environment in ['Cont', 'Exec'])\
VTKM_SUPPRESS_EXEC_WARNINGS
@ -337,7 +337,7 @@ $if(num_params < 1)\
(void)originalParameters;
(void)transformedParameters;
$else\
$for(param_index in xrange(1, num_params+1))\
$for(param_index in range(1, num_params+1))\
transformedParameters.Parameter$(param_index) =
transform(originalParameters.Parameter$(param_index), vtkm::internal::IndexTag<$(param_index)>());
$endfor\
@ -352,7 +352,7 @@ $endfor\
// clang-format off
$for(num_params in xrange(0, max_parameters))\
$for(num_params in range(0, max_parameters))\
$# ForEach functions need both control and execution versions
$for(environment in ['Cont', 'Exec'])\
$# ForEach functions also need to accept const and non-const versions of the FunctionInterface
@ -368,7 +368,7 @@ $if(num_params < 1)\
(void)f;
(void)parameters;
$else\
$for(param_index in xrange(1, num_params+1))\
$for(param_index in range(1, num_params+1))\
f(parameters.Parameter$(param_index), vtkm::internal::IndexTag<$(param_index)>());
$endfor\
$endif\