From 5ddfb719a3c9302f3cc90612e0b389d908933727 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Thu, 19 Nov 2020 19:14:16 -0500
Subject: [PATCH] ClipWithField: Use primive types in instantiations

`vtkm::[U]Int*` types depending of each platform/arch would translate to
different integer types. We cannot make a generalization with this.

A simple way to handle this is to simply use primitive types, such as
char, signed char, long..., instead of vtkm::[U]Int*. This makes sure
that every primitive type is actually instantiated.

We could potentially use this in other filters instantiation file.

This error has been reported in VTK when being build with vtkm.
---
 vtkm/filter/ClipWithFieldSignedInteger.cxx    | 48 +++++++++++++++----
 vtkm/filter/ClipWithFieldSignedInteger.cxx.in |  2 +-
 vtkm/filter/ClipWithFieldUnsignedInteger.cxx  | 32 +++++++++----
 .../ClipWithFieldUnsignedInteger.cxx.in       |  2 +-
 4 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/vtkm/filter/ClipWithFieldSignedInteger.cxx b/vtkm/filter/ClipWithFieldSignedInteger.cxx
index 41fd085ec..e9a4063ef 100644
--- a/vtkm/filter/ClipWithFieldSignedInteger.cxx
+++ b/vtkm/filter/ClipWithFieldSignedInteger.cxx
@@ -24,7 +24,7 @@ namespace filter
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::Int8>&,
+  const vtkm::cont::ArrayHandle<char>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -32,7 +32,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
@@ -40,7 +40,7 @@ VTKM_DEPRECATED_SUPPRESS_END
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::Int16>&,
+  const vtkm::cont::ArrayHandle<signed char>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -48,7 +48,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
@@ -56,7 +56,7 @@ VTKM_DEPRECATED_SUPPRESS_END
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::Int32>&,
+  const vtkm::cont::ArrayHandle<short>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -64,7 +64,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
@@ -72,7 +72,7 @@ VTKM_DEPRECATED_SUPPRESS_END
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::Int64>&,
+  const vtkm::cont::ArrayHandle<int>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -80,7 +80,39 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
diff --git a/vtkm/filter/ClipWithFieldSignedInteger.cxx.in b/vtkm/filter/ClipWithFieldSignedInteger.cxx.in
index 58f9eb2fc..bffa0b6b3 100644
--- a/vtkm/filter/ClipWithFieldSignedInteger.cxx.in
+++ b/vtkm/filter/ClipWithFieldSignedInteger.cxx.in
@@ -36,7 +36,7 @@ namespace filter
 
 $py(
 # 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)\
diff --git a/vtkm/filter/ClipWithFieldUnsignedInteger.cxx b/vtkm/filter/ClipWithFieldUnsignedInteger.cxx
index 5bb472856..a67ae2e65 100644
--- a/vtkm/filter/ClipWithFieldUnsignedInteger.cxx
+++ b/vtkm/filter/ClipWithFieldUnsignedInteger.cxx
@@ -24,7 +24,7 @@ namespace filter
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::UInt8>&,
+  const vtkm::cont::ArrayHandle<unsigned char>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -32,7 +32,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
@@ -40,7 +40,7 @@ VTKM_DEPRECATED_SUPPRESS_END
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::UInt16>&,
+  const vtkm::cont::ArrayHandle<unsigned short>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -48,7 +48,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
@@ -56,7 +56,7 @@ VTKM_DEPRECATED_SUPPRESS_END
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::UInt32>&,
+  const vtkm::cont::ArrayHandle<unsigned int>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -64,7 +64,7 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
@@ -72,7 +72,7 @@ VTKM_DEPRECATED_SUPPRESS_END
 
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   const vtkm::cont::DataSet&,
-  const vtkm::cont::ArrayHandle<vtkm::UInt64>&,
+  const vtkm::cont::ArrayHandle<unsigned long>&,
   const vtkm::filter::FieldMetadata&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 
@@ -80,7 +80,23 @@ template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
 VTKM_DEPRECATED_SUPPRESS_BEGIN
 template VTKM_FILTER_EXTRA_EXPORT vtkm::cont::DataSet ClipWithField::DoExecute(
   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&,
   vtkm::filter::PolicyBase<vtkm::filter::PolicyDefault>);
 VTKM_DEPRECATED_SUPPRESS_END
diff --git a/vtkm/filter/ClipWithFieldUnsignedInteger.cxx.in b/vtkm/filter/ClipWithFieldUnsignedInteger.cxx.in
index 0519c3ea5..883c2f186 100644
--- a/vtkm/filter/ClipWithFieldUnsignedInteger.cxx.in
+++ b/vtkm/filter/ClipWithFieldUnsignedInteger.cxx.in
@@ -36,7 +36,7 @@ namespace filter
 
 $py(
 # 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)\