Merge topic 'filter-clip-universal-instantiations'
5ddfb719a ClipWithField: Use primive types in instantiations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2325
This commit is contained in:
commit
0f339f33a7
@ -24,7 +24,7 @@ namespace filter
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int8>&,
|
const vtkm::cont::ArrayHandle<char>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int8, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<char, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
@ -40,7 +40,7 @@ VTKM_DEPRECATED_SUPPRESS_END
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int16>&,
|
const vtkm::cont::ArrayHandle<signed char>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int16, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<signed char, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
@ -56,7 +56,7 @@ VTKM_DEPRECATED_SUPPRESS_END
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int32>&,
|
const vtkm::cont::ArrayHandle<short>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int32, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<short, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
@ -72,7 +72,7 @@ VTKM_DEPRECATED_SUPPRESS_END
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int64>&,
|
const vtkm::cont::ArrayHandle<int>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -80,7 +80,39 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::Int64, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<int, vtkm::cont::StorageTagVirtual>&,
|
||||||
|
const vtkm::filter::FieldMetadata&,
|
||||||
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
|
#endif
|
||||||
|
|
||||||
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
|
const vtkm::cont::DataSet&,
|
||||||
|
const vtkm::cont::ArrayHandle<long>&,
|
||||||
|
const vtkm::filter::FieldMetadata&,
|
||||||
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
|
#ifndef VTKM_NO_DEPRECATED_VIRTUAL
|
||||||
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
|
const vtkm::cont::DataSet&,
|
||||||
|
const vtkm::cont::ArrayHandle<long, vtkm::cont::StorageTagVirtual>&,
|
||||||
|
const vtkm::filter::FieldMetadata&,
|
||||||
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
|
#endif
|
||||||
|
|
||||||
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
|
const vtkm::cont::DataSet&,
|
||||||
|
const vtkm::cont::ArrayHandle<long long>&,
|
||||||
|
const vtkm::filter::FieldMetadata&,
|
||||||
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
|
#ifndef VTKM_NO_DEPRECATED_VIRTUAL
|
||||||
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
|
const vtkm::cont::DataSet&,
|
||||||
|
const vtkm::cont::ArrayHandle<long long, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
|
@ -36,7 +36,7 @@ namespace filter
|
|||||||
|
|
||||||
$py(
|
$py(
|
||||||
# These values are taken from vtkm/TypeList.h
|
# These values are taken from vtkm/TypeList.h
|
||||||
types = [ "vtkm::Int8", "vtkm::Int16", "vtkm::Int32", "vtkm::Int64"]
|
types = [ "char", "signed char", "short", "int", "long", "long long" ]
|
||||||
)\
|
)\
|
||||||
\
|
\
|
||||||
$for(TYPE in types)\
|
$for(TYPE in types)\
|
||||||
|
@ -24,7 +24,7 @@ namespace filter
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt8>&,
|
const vtkm::cont::ArrayHandle<unsigned char>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt8, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<unsigned char, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
@ -40,7 +40,7 @@ VTKM_DEPRECATED_SUPPRESS_END
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt16>&,
|
const vtkm::cont::ArrayHandle<unsigned short>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt16, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<unsigned short, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
@ -56,7 +56,7 @@ VTKM_DEPRECATED_SUPPRESS_END
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt32>&,
|
const vtkm::cont::ArrayHandle<unsigned int>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt32, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<unsigned int, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
@ -72,7 +72,7 @@ VTKM_DEPRECATED_SUPPRESS_END
|
|||||||
|
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt64>&,
|
const vtkm::cont::ArrayHandle<unsigned long>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
@ -80,7 +80,23 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
|||||||
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
const vtkm::cont::DataSet&,
|
const vtkm::cont::DataSet&,
|
||||||
const vtkm::cont::ArrayHandle<vtkm::UInt64, vtkm::cont::StorageTagVirtual>&,
|
const vtkm::cont::ArrayHandle<unsigned long, vtkm::cont::StorageTagVirtual>&,
|
||||||
|
const vtkm::filter::FieldMetadata&,
|
||||||
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
|
#endif
|
||||||
|
|
||||||
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
|
const vtkm::cont::DataSet&,
|
||||||
|
const vtkm::cont::ArrayHandle<unsigned long long>&,
|
||||||
|
const vtkm::filter::FieldMetadata&,
|
||||||
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
|
|
||||||
|
#ifndef VTKM_NO_DEPRECATED_VIRTUAL
|
||||||
|
VTKM_DEPRECATED_SUPPRESS_BEGIN
|
||||||
|
template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
|
||||||
|
const vtkm::cont::DataSet&,
|
||||||
|
const vtkm::cont::ArrayHandle<unsigned long long, vtkm::cont::StorageTagVirtual>&,
|
||||||
const vtkm::filter::FieldMetadata&,
|
const vtkm::filter::FieldMetadata&,
|
||||||
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
|
||||||
VTKM_DEPRECATED_SUPPRESS_END
|
VTKM_DEPRECATED_SUPPRESS_END
|
||||||
|
@ -36,7 +36,7 @@ namespace filter
|
|||||||
|
|
||||||
$py(
|
$py(
|
||||||
# These values are taken from vtkm/TypeList.h
|
# These values are taken from vtkm/TypeList.h
|
||||||
types = ["vtkm::UInt8", "vtkm::UInt16", "vtkm::UInt32", "vtkm::UInt64"]
|
types = ["unsigned char", "unsigned short", "unsigned int", "unsigned long", "unsigned long long"]
|
||||||
)\
|
)\
|
||||||
\
|
\
|
||||||
$for(TYPE in types)\
|
$for(TYPE in types)\
|
||||||
|
Loading…
Reference in New Issue
Block a user