Put VTK symbols inside ABI namespace macros.

VTK_ABI_NAMESPACE_{BEGIN,END} macro is inserted around all VTK symbols.

Exclusions:
 * C interfaces, such as GetVTKVersion and the python module.
 * third-party libraries and external libraries that are not maintained
   by VTK but are part of the VTK repository.
 * Cxx module tests
 * Utilities
 * Wrapping/Tools
HTGUnlimitedGradien
Ryan Krattiger 6 months ago
parent 9519ee65b7
commit 65fc526a83
  1. 2
      Accelerators/Vtkm/Core/vtkmDataArray.cxx
  2. 4
      Accelerators/Vtkm/Core/vtkmDataArray.h
  3. 2
      Accelerators/Vtkm/Core/vtkmFilterPolicy.h
  4. 2
      Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.cxx
  5. 15
      Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h
  6. 2
      Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.hxx
  7. 2
      Accelerators/Vtkm/Core/vtkmlib/PortalTraits.h
  8. 2
      Accelerators/Vtkm/Core/vtkmlib/Portals.cxx
  9. 7
      Accelerators/Vtkm/Core/vtkmlib/Portals.h
  10. 2
      Accelerators/Vtkm/Core/vtkmlib/Portals.hxx
  11. 4
      Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx
  12. 2
      Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.cxx
  13. 2
      Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.h
  14. 6
      Accelerators/Vtkm/DataModel/vtkmConfigDataModel.h.in
  15. 2
      Accelerators/Vtkm/DataModel/vtkmDataSet.cxx
  16. 3
      Accelerators/Vtkm/DataModel/vtkmDataSet.h
  17. 2
      Accelerators/Vtkm/DataModel/vtkmFilterPolicy.h
  18. 4
      Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.cxx
  19. 14
      Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.h
  20. 2
      Accelerators/Vtkm/DataModel/vtkmlib/ArrayConverters.hxx
  21. 2
      Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersReal.cxx
  22. 2
      Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersSigned.cxx
  23. 2
      Accelerators/Vtkm/DataModel/vtkmlib/ArrayConvertersUnsigned.cxx
  24. 4
      Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.cxx
  25. 6
      Accelerators/Vtkm/DataModel/vtkmlib/CellSetConverters.h
  26. 4
      Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx
  27. 6
      Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.h
  28. 4
      Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx
  29. 6
      Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.h
  30. 2
      Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx
  31. 4
      Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h
  32. 6
      Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.cxx
  33. 6
      Accelerators/Vtkm/DataModel/vtkmlib/PolyDataConverter.h
  34. 4
      Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.cxx
  35. 6
      Accelerators/Vtkm/DataModel/vtkmlib/UnstructuredGridConverter.h
  36. 2
      Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx
  37. 2
      Accelerators/Vtkm/Filters/vtkmAverageToCells.h
  38. 2
      Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx
  39. 2
      Accelerators/Vtkm/Filters/vtkmAverageToPoints.h
  40. 2
      Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx
  41. 2
      Accelerators/Vtkm/Filters/vtkmCleanGrid.h
  42. 2
      Accelerators/Vtkm/Filters/vtkmClip.cxx
  43. 2
      Accelerators/Vtkm/Filters/vtkmClip.h
  44. 2
      Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx
  45. 2
      Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx
  46. 2
      Accelerators/Vtkm/Filters/vtkmClipInternals.h
  47. 6
      Accelerators/Vtkm/Filters/vtkmConfigFilters.h.in
  48. 2
      Accelerators/Vtkm/Filters/vtkmContour.cxx
  49. 2
      Accelerators/Vtkm/Filters/vtkmContour.h
  50. 2
      Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.cxx
  51. 2
      Accelerators/Vtkm/Filters/vtkmCoordinateSystemTransform.h
  52. 2
      Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx
  53. 2
      Accelerators/Vtkm/Filters/vtkmExternalFaces.h
  54. 2
      Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx
  55. 2
      Accelerators/Vtkm/Filters/vtkmExtractVOI.h
  56. 2
      Accelerators/Vtkm/Filters/vtkmFilterOverrides.cxx.in
  57. 2
      Accelerators/Vtkm/Filters/vtkmFilterOverrides.h
  58. 2
      Accelerators/Vtkm/Filters/vtkmGradient.cxx
  59. 2
      Accelerators/Vtkm/Filters/vtkmGradient.h
  60. 2
      Accelerators/Vtkm/Filters/vtkmHistogram.cxx
  61. 2
      Accelerators/Vtkm/Filters/vtkmHistogram.h
  62. 2
      Accelerators/Vtkm/Filters/vtkmImageConnectivity.cxx
  63. 2
      Accelerators/Vtkm/Filters/vtkmImageConnectivity.h
  64. 2
      Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx
  65. 2
      Accelerators/Vtkm/Filters/vtkmLevelOfDetail.h
  66. 2
      Accelerators/Vtkm/Filters/vtkmNDHistogram.cxx
  67. 2
      Accelerators/Vtkm/Filters/vtkmNDHistogram.h
  68. 2
      Accelerators/Vtkm/Filters/vtkmPointElevation.cxx
  69. 2
      Accelerators/Vtkm/Filters/vtkmPointElevation.h
  70. 2
      Accelerators/Vtkm/Filters/vtkmPointTransform.cxx
  71. 2
      Accelerators/Vtkm/Filters/vtkmPointTransform.h
  72. 2
      Accelerators/Vtkm/Filters/vtkmPolyDataNormals.cxx
  73. 2
      Accelerators/Vtkm/Filters/vtkmPolyDataNormals.h
  74. 2
      Accelerators/Vtkm/Filters/vtkmProbe.cxx
  75. 2
      Accelerators/Vtkm/Filters/vtkmProbe.h
  76. 2
      Accelerators/Vtkm/Filters/vtkmThreshold.cxx
  77. 2
      Accelerators/Vtkm/Filters/vtkmThreshold.h
  78. 2
      Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.cxx
  79. 2
      Accelerators/Vtkm/Filters/vtkmTriangleMeshPointNormals.h
  80. 2
      Accelerators/Vtkm/Filters/vtkmWarpScalar.cxx
  81. 2
      Accelerators/Vtkm/Filters/vtkmWarpScalar.h
  82. 2
      Accelerators/Vtkm/Filters/vtkmWarpVector.cxx
  83. 2
      Accelerators/Vtkm/Filters/vtkmWarpVector.h
  84. 17
      CMake/vtkEncodeString.cmake
  85. 3
      CMake/vtkObjectFactory.cxx.in
  86. 4
      CMake/vtkObjectFactory.h.in
  87. 2
      Charts/Core/vtkAxis.cxx
  88. 2
      Charts/Core/vtkAxis.h
  89. 2
      Charts/Core/vtkAxisExtended.cxx
  90. 2
      Charts/Core/vtkAxisExtended.h
  91. 2
      Charts/Core/vtkCategoryLegend.cxx
  92. 2
      Charts/Core/vtkCategoryLegend.h
  93. 2
      Charts/Core/vtkChart.cxx
  94. 2
      Charts/Core/vtkChart.h
  95. 2
      Charts/Core/vtkChartBox.cxx
  96. 2
      Charts/Core/vtkChartBox.h
  97. 2
      Charts/Core/vtkChartHistogram2D.cxx
  98. 2
      Charts/Core/vtkChartHistogram2D.h
  99. 2
      Charts/Core/vtkChartLegend.cxx
  100. 2
      Charts/Core/vtkChartLegend.h
  101. Some files were not shown because too many files have changed in this diff Show More

@ -21,6 +21,7 @@
#include "vtkmDataArray.h"
VTK_ABI_NAMESPACE_BEGIN
template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray<char>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray<double>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray<float>;
@ -34,3 +35,4 @@ template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray<unsigned int>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray<unsigned long>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray<unsigned long long>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkmDataArray<unsigned short>;
VTK_ABI_NAMESPACE_END

@ -34,12 +34,15 @@
namespace internal
{
VTK_ABI_NAMESPACE_BEGIN
template <typename T>
class ArrayHandleWrapperBase;
VTK_ABI_NAMESPACE_END
} // internal
VTK_ABI_NAMESPACE_BEGIN
template <typename T>
class vtkmDataArray : public vtkGenericDataArray<vtkmDataArray<T>, T>
{
@ -116,6 +119,7 @@ extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT vtkmDataArray<unsi
extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT vtkmDataArray<unsigned short>;
#endif // vtkmDataArray_cxx
VTK_ABI_NAMESPACE_END
#endif // vtkmDataArray_h
#include "vtkmlib/vtkmDataArray.hxx"

@ -30,6 +30,7 @@
#include <vtkm/filter/PolicyDefault.h>
//------------------------------------------------------------------------------
VTK_ABI_NAMESPACE_BEGIN
class vtkmOutputFilterPolicy : public vtkm::filter::PolicyBase<vtkmOutputFilterPolicy>
{
public:
@ -40,5 +41,6 @@ public:
using AllCellSetList = tovtkm::CellListAllOutVTK;
};
VTK_ABI_NAMESPACE_END
#endif
// VTK-HeaderTest-Exclude: vtkmFilterPolicy.h

@ -28,6 +28,7 @@
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
namespace
{
@ -212,4 +213,5 @@ vtkPoints* Convert(const vtkm::cont::CoordinateSystem& input)
return points;
}
VTK_ABI_NAMESPACE_END
}

@ -29,9 +29,6 @@
#include <type_traits> // for std::underlying_type
class vtkDataArray;
class vtkPoints;
namespace vtkm
{
namespace cont
@ -40,8 +37,14 @@ class CoordinateSystem;
}
}
VTK_ABI_NAMESPACE_BEGIN
class vtkDataArray;
class vtkPoints;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
/// Temporary name for arrays converted from VTK that do not have a name.
/// Unnamed arrays seem to be supported by VTK, but VTK-m requires all fields to have a name.
@ -114,10 +117,12 @@ enum class FieldsFlag
PointsAndCells = Points | Cells
};
VTK_ABI_NAMESPACE_END
}
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMCORE_EXPORT
vtkDataArray* Convert(const vtkm::cont::Field& input);
@ -128,8 +133,10 @@ vtkDataArray* Convert(const vtkm::cont::UnknownArrayHandle& input, const char* n
VTKACCELERATORSVTKMCORE_EXPORT
vtkPoints* Convert(const vtkm::cont::CoordinateSystem& input);
VTK_ABI_NAMESPACE_END
}
VTK_ABI_NAMESPACE_BEGIN
inline tovtkm::FieldsFlag operator&(const tovtkm::FieldsFlag& a, const tovtkm::FieldsFlag& b)
{
using T = std::underlying_type<tovtkm::FieldsFlag>::type;
@ -141,5 +148,7 @@ inline tovtkm::FieldsFlag operator|(const tovtkm::FieldsFlag& a, const tovtkm::F
using T = std::underlying_type<tovtkm::FieldsFlag>::type;
return static_cast<tovtkm::FieldsFlag>(static_cast<T>(a) | static_cast<T>(b));
}
VTK_ABI_NAMESPACE_END
#endif // vtkmlib_ArrayConverters_h
/* VTK-HeaderTest-Exclude: DataArrayConverters.h */

@ -25,6 +25,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
template <typename DataArrayType>
vtkm::cont::UnknownArrayHandle vtkDataArrayToUnknownArrayHandle(DataArrayType* input)
@ -82,5 +83,6 @@ vtkm::cont::Field ConvertCellField(DataArrayType* input)
return vtkm::cont::make_FieldCell(name, vhandle);
}
VTK_ABI_NAMESPACE_END
} // tovtkm
#endif

@ -26,6 +26,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
struct vtkPortalOfVecOfVecValues;
struct vtkPortalOfVecOfValues;
@ -142,6 +143,7 @@ struct vtkPortalTraits<const vtkm::Vec<vtkm::Vec<T, N>, M>>
}
};
VTK_ABI_NAMESPACE_END
} // namespace vtkmlib
#endif // vtkmlib_PortalsTraits_h

@ -21,9 +21,11 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
// T extern template instantiations
template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal<vtkm::Vec<vtkm::Float32, 3> const>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal<vtkm::Vec<vtkm::Float64, 3> const>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal<vtkm::Vec<vtkm::Float32, 3>>;
template class VTKACCELERATORSVTKMCORE_EXPORT vtkPointsPortal<vtkm::Vec<vtkm::Float64, 3>>;
VTK_ABI_NAMESPACE_END
}

@ -21,13 +21,16 @@
#include "vtkAcceleratorsVTKmCoreModule.h"
#include "vtkmConfigCore.h" //required for general vtkm setup
VTK_ABI_NAMESPACE_BEGIN
class vtkDataArray;
class vtkPoints;
VTK_ABI_NAMESPACE_END
#include <vtkm/cont/internal/IteratorFromArrayPortal.h>
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
template <typename Type, typename VTKDataArrayType_>
class VTKM_ALWAYS_EXPORT vtkArrayPortal
@ -116,12 +119,14 @@ private:
ComponentType* Array;
vtkm::Id Size;
};
VTK_ABI_NAMESPACE_END
}
#ifndef vtkmlib_Portals_cxx
#include <vtkm/cont/internal/ArrayPortalFromIterators.h>
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
// T extern template instantiations
extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT
vtkPointsPortal<vtkm::Vec<vtkm::Float32, 3> const>;
@ -131,9 +136,11 @@ extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT
vtkPointsPortal<vtkm::Vec<vtkm::Float32, 3>>;
extern template class VTKACCELERATORSVTKMCORE_TEMPLATE_EXPORT
vtkPointsPortal<vtkm::Vec<vtkm::Float64, 3>>;
VTK_ABI_NAMESPACE_END
}
#endif // defined vtkmlib_Portals_cxx
#include "Portals.hxx"
#endif // vtkmlib_Portals_h
/* VTK-HeaderTest-Exclude: Portals.h */

@ -52,6 +52,7 @@ struct fillComponents<1>
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
//------------------------------------------------------------------------------
template <typename VType, typename VTKDataArrayType>
@ -136,6 +137,7 @@ VTKM_EXEC void vtkPointsPortal<Type>::Set(vtkm::Id index, const ValueType& value
// use template magic to auto unroll insertion
fillComponents<NUM_COMPONENTS>()(rawArray, value);
}
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_Portals_hxx

@ -31,6 +31,7 @@
namespace internal
{
VTK_ABI_NAMESPACE_BEGIN
//=============================================================================
template <typename T>
class ArrayHandleWrapperBase
@ -408,8 +409,10 @@ ArrayHandleWrapperBase<T>* MakeArrayHandleWrapper(vtkIdType numberOfTuples, int
}
}
VTK_ABI_NAMESPACE_END
} // internal
VTK_ABI_NAMESPACE_BEGIN
//=============================================================================
template <typename T>
vtkmDataArray<T>::vtkmDataArray() = default;
@ -504,4 +507,5 @@ bool vtkmDataArray<T>::ReallocateTuples(vtkIdType numTuples)
return true;
}
VTK_ABI_NAMESPACE_END
#endif // vtkmDataArray_hxx

@ -17,6 +17,7 @@
#include "vtkmInitializer.h"
#include <vtkm/cont/Initialize.h>
VTK_ABI_NAMESPACE_BEGIN
void InitializeVTKm()
{
// Only Kokkos HIP backend needs to be initialized
@ -36,3 +37,4 @@ vtkmInitializer::vtkmInitializer()
{
(void)InitializeVTKm();
}
VTK_ABI_NAMESPACE_END

@ -19,9 +19,11 @@
#include "vtkAcceleratorsVTKmCoreModule.h"
VTK_ABI_NAMESPACE_BEGIN
struct VTKACCELERATORSVTKMCORE_EXPORT vtkmInitializer
{
vtkmInitializer();
};
VTK_ABI_NAMESPACE_END
#endif

@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifndef vtkConfigDataModel_h
#define vtkConfigDataModel_h
#ifndef vtkmConfigDataModel_h
#define vtkmConfigDataModel_h
/*--------------------------------------------------------------------------*/
/* Other Configuration Options */
@ -52,4 +52,4 @@
#endif
#endif // vtkConfigDataModel_h
#endif // vtkmConfigDataModel_h

@ -40,6 +40,7 @@
#include <mutex>
VTK_ABI_NAMESPACE_BEGIN
namespace
{
@ -437,3 +438,4 @@ void vtkmDataSet::DeepCopy(vtkDataObject* src)
}
}
}
VTK_ABI_NAMESPACE_END

@ -36,6 +36,8 @@ class DataSet;
}
} // vtkm::cont
VTK_ABI_NAMESPACE_BEGIN
class vtkPoints;
class vtkCell;
class vtkGenericCell;
@ -195,4 +197,5 @@ private:
vtkmInitializer Initializer;
};
VTK_ABI_NAMESPACE_END
#endif // vtkmDataSet_h

@ -30,6 +30,7 @@
#include <vtkm/filter/PolicyDefault.h>
//------------------------------------------------------------------------------
VTK_ABI_NAMESPACE_BEGIN
class vtkmOutputFilterPolicy : public vtkm::filter::PolicyBase<vtkmOutputFilterPolicy>
{
public:
@ -40,5 +41,6 @@ public:
using AllCellSetList = tovtkm::CellListAllOutVTK;
};
VTK_ABI_NAMESPACE_END
#endif
// VTK-HeaderTest-Exclude: vtkmFilterPolicy.h

@ -32,6 +32,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::FieldsFlag fields)
{
if ((fields & tovtkm::FieldsFlag::Points) != tovtkm::FieldsFlag::None)
@ -125,10 +126,12 @@ vtkm::cont::Field Convert(vtkDataArray* input, int association)
}
return field;
}
VTK_ABI_NAMESPACE_END
} // namespace tovtkm
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output)
{
@ -157,4 +160,5 @@ bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output)
}
return true;
}
VTK_ABI_NAMESPACE_END
} // namespace fromvtkm

@ -30,10 +30,6 @@
#include <type_traits> // for std::underlying_type
class vtkDataArray;
class vtkDataSet;
class vtkPoints;
namespace vtkm
{
namespace cont
@ -43,8 +39,15 @@ class CoordinateSystem;
}
}
VTK_ABI_NAMESPACE_BEGIN
class vtkDataArray;
class vtkDataSet;
class vtkPoints;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::FieldsFlag fields);
@ -52,13 +55,16 @@ void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::Fiel
// determine the type and call the proper Convert routine
VTKACCELERATORSVTKMDATAMODEL_EXPORT
vtkm::cont::Field Convert(vtkDataArray* input, int association);
VTK_ABI_NAMESPACE_END
}
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output);
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_ArrayConverters_h

@ -27,6 +27,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
template <typename DataArrayType>
vtkm::cont::Field Convert(DataArrayType* input, int association)
@ -89,5 +90,6 @@ VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate)
#endif // !defined(ArrayConverterExport_cxx)
VTK_ABI_NAMESPACE_END
} // tovtkm
#endif

@ -19,8 +19,10 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTK_EXPORT_REAL_ARRAY_CONVERSION_TO_VTKM(vtkAOSDataArrayTemplate)
VTK_EXPORT_REAL_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate)
VTK_ABI_NAMESPACE_END
} // tovtkm

@ -19,8 +19,10 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(vtkAOSDataArrayTemplate)
VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate)
VTK_ABI_NAMESPACE_END
} // tovtkm

@ -19,8 +19,10 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(vtkAOSDataArrayTemplate)
VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(vtkSOADataArrayTemplate)
VTK_ABI_NAMESPACE_END
} // tovtkm

@ -46,6 +46,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
namespace
{
@ -228,10 +229,12 @@ vtkm::cont::UnknownCellSet Convert(
return cells->Visit(BuildExplicitCellSetVisitor{}, ShapeConverter::Wrap(types), numberOfPoints);
}
VTK_ABI_NAMESPACE_END
} // namespace tovtkm
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
bool Convert(const vtkm::cont::UnknownCellSet& toConvert, vtkCellArray* cells,
vtkUnsignedCharArray* typesArray)
@ -285,4 +288,5 @@ bool Convert(const vtkm::cont::UnknownCellSet& toConvert, vtkCellArray* cells,
return true;
}
VTK_ABI_NAMESPACE_END
} // namespace fromvtkm

@ -23,12 +23,15 @@
#include <vtkType.h>
#include <vtkm/cont/UnknownCellSet.h>
VTK_ABI_NAMESPACE_BEGIN
class vtkCellArray;
class vtkUnsignedCharArray;
class vtkIdTypeArray;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
vtkm::cont::UnknownCellSet ConvertSingleType(
vtkCellArray* cells, int cellType, vtkIdType numberOfPoints);
@ -36,14 +39,17 @@ vtkm::cont::UnknownCellSet ConvertSingleType(
VTKACCELERATORSVTKMDATAMODEL_EXPORT
vtkm::cont::UnknownCellSet Convert(
vtkUnsignedCharArray* types, vtkCellArray* cells, vtkIdType numberOfPoints);
VTK_ABI_NAMESPACE_END
}
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
bool Convert(const vtkm::cont::UnknownCellSet& toConvert, vtkCellArray* cells,
vtkUnsignedCharArray* types = nullptr);
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_CellSetConverters_h

@ -47,6 +47,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
namespace
{
@ -281,10 +282,12 @@ vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields)
}
}
VTK_ABI_NAMESPACE_END
} // namespace tovtkm
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
namespace
{
@ -440,4 +443,5 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkStructuredGrid* output, vtkD
return true;
}
VTK_ABI_NAMESPACE_END
} // namespace fromvtkm

@ -25,15 +25,18 @@
#include <vtkm/cont/DataSet.h>
VTK_ABI_NAMESPACE_BEGIN
class vtkDataSet;
class vtkDataSetAttributes;
class vtkImageData;
class vtkPoints;
class vtkRectilinearGrid;
class vtkStructuredGrid;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
// convert a vtkPoints array into a coordinate system
VTKACCELERATORSVTKMDATAMODEL_EXPORT
@ -50,10 +53,12 @@ vtkm::cont::DataSet Convert(vtkRectilinearGrid* input, FieldsFlag fields);
// determine the type and call the proper Convert routine
VTKACCELERATORSVTKMDATAMODEL_EXPORT
vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields = FieldsFlag::None);
VTK_ABI_NAMESPACE_END
}
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
void PassAttributesInformation(vtkDataSetAttributes* input, vtkDataSetAttributes* output);
@ -64,6 +69,7 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkRectilinearGrid* output, vtk
VTKACCELERATORSVTKMDATAMODEL_EXPORT
bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkStructuredGrid* output, vtkDataSet* input);
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_DataSetConverters_h

@ -76,6 +76,7 @@ struct SetGlobalPointIndexStart
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
//------------------------------------------------------------------------------
// convert an image data type
@ -110,10 +111,12 @@ vtkm::cont::DataSet Convert(vtkImageData* input, FieldsFlag fields)
return dataset;
}
VTK_ABI_NAMESPACE_END
} // tovtkm
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
bool Convert(
const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, vtkDataSet* input)
@ -172,4 +175,5 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSe
return Convert(voutput, extents, output, input);
}
VTK_ABI_NAMESPACE_END
} // fromvtkm

@ -23,19 +23,24 @@
#include <vtkm/cont/DataSet.h>
VTK_ABI_NAMESPACE_BEGIN
class vtkImageData;
class vtkDataSet;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
vtkm::cont::DataSet Convert(vtkImageData* input, FieldsFlag fields = FieldsFlag::None);
VTK_ABI_NAMESPACE_END
}
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSet* input);
@ -44,5 +49,6 @@ VTKACCELERATORSVTKMDATAMODEL_EXPORT
bool Convert(
const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, vtkDataSet* input);
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_ImageDataConverter_h

@ -26,6 +26,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
inline vtkm::Vec<vtkm::FloatDefault, 3> MakeFVec3(const double x[3])
{
@ -141,4 +142,5 @@ const vtkm::ImplicitFunctionGeneral& ImplicitFunctionConverter::Get()
return this->OutFunction;
}
VTK_ABI_NAMESPACE_END
} // tovtkm

@ -22,10 +22,13 @@
#include "vtkm/ImplicitFunction.h"
VTK_ABI_NAMESPACE_BEGIN
class vtkImplicitFunction;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
class VTKACCELERATORSVTKMDATAMODEL_EXPORT ImplicitFunctionConverter
{
@ -41,6 +44,7 @@ private:
mutable vtkMTimeType MTime;
};
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_ImplicitFunctionConverter_h

@ -39,6 +39,7 @@
#include <vtkm/cont/ErrorBadType.h>
#include <vtkm/cont/Field.h>
VTK_ABI_NAMESPACE_BEGIN
namespace
{
struct build_type_array
@ -68,8 +69,10 @@ struct build_type_array
}
};
}
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
//------------------------------------------------------------------------------
// convert an polydata type
@ -174,10 +177,12 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields)
return dataset;
}
VTK_ABI_NAMESPACE_END
} // namespace tovtkm
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
//------------------------------------------------------------------------------
bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet* input)
@ -209,4 +214,5 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet
return arraysConverted;
}
VTK_ABI_NAMESPACE_END
} // namespace fromvtkm

@ -25,19 +25,25 @@
#include <vtkm/cont/DataSet.h>
VTK_ABI_NAMESPACE_BEGIN
class vtkPolyData;
class vtkDataSet;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
// convert an polydata type
VTKACCELERATORSVTKMDATAMODEL_EXPORT
vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields = FieldsFlag::None);
VTK_ABI_NAMESPACE_END
}
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet* input);
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_PolyDataConverter_h

@ -41,6 +41,7 @@
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
//------------------------------------------------------------------------------
// convert an unstructured grid type
@ -74,10 +75,12 @@ vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, FieldsFlag fields)
return dataset;
}
VTK_ABI_NAMESPACE_END
} // namespace tovtkm
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
//------------------------------------------------------------------------------
bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vtkDataSet* input)
@ -118,4 +121,5 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vt
return arraysConverted;
}
VTK_ABI_NAMESPACE_END
} // namespace fromvtkm

@ -25,20 +25,26 @@
#include <vtkm/cont/DataSet.h>
VTK_ABI_NAMESPACE_BEGIN
class vtkUnstructuredGrid;
class vtkDataSet;
VTK_ABI_NAMESPACE_END
namespace tovtkm
{
VTK_ABI_NAMESPACE_BEGIN
// convert an unstructured grid type
VTKACCELERATORSVTKMDATAMODEL_EXPORT
vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, FieldsFlag fields = FieldsFlag::None);
VTK_ABI_NAMESPACE_END
}
namespace fromvtkm
{
VTK_ABI_NAMESPACE_BEGIN
VTKACCELERATORSVTKMDATAMODEL_EXPORT
bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vtkDataSet* input);
VTK_ABI_NAMESPACE_END
}
#endif // vtkmlib_UnstructuredGridConverter_h

@ -30,6 +30,7 @@
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/filter/field_conversion/CellAverage.h>
VTK_ABI_NAMESPACE_BEGIN
vtkStandardNewMacro(vtkmAverageToCells);
//------------------------------------------------------------------------------
@ -169,3 +170,4 @@ void vtkmAverageToCells::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
}
VTK_ABI_NAMESPACE_END

@ -32,6 +32,7 @@
#include "vtkPointDataToCellData.h"
#include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m
VTK_ABI_NAMESPACE_BEGIN
class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmAverageToCells : public vtkPointDataToCellData
{
public:
@ -51,4 +52,5 @@ private:
vtkmInitializer Initializer;
};
VTK_ABI_NAMESPACE_END
#endif // vtkmAverageToCells_h

@ -35,6 +35,7 @@
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/filter/field_conversion/PointAverage.h>
VTK_ABI_NAMESPACE_BEGIN
vtkStandardNewMacro(vtkmAverageToPoints);
//------------------------------------------------------------------------------
@ -181,3 +182,4 @@ void vtkmAverageToPoints::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
}
VTK_ABI_NAMESPACE_END

@ -31,6 +31,7 @@
#include "vtkCellDataToPointData.h"
#include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m
VTK_ABI_NAMESPACE_BEGIN
class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmAverageToPoints : public vtkCellDataToPointData
{
public:
@ -50,4 +51,5 @@ private:
vtkmInitializer Initializer;
};
VTK_ABI_NAMESPACE_END
#endif // vtkmAverageToPoints_h

@ -31,6 +31,7 @@
#include <vtkm/filter/clean_grid/CleanGrid.h>
VTK_ABI_NAMESPACE_BEGIN
vtkStandardNewMacro(vtkmCleanGrid);
//------------------------------------------------------------------------------
@ -100,3 +101,4 @@ int vtkmCleanGrid::RequestData(vtkInformation* vtkNotUsed(request),
return 1;
}
VTK_ABI_NAMESPACE_END

@ -30,6 +30,7 @@
#include "vtkUnstructuredGridAlgorithm.h"
#include "vtkmlib/vtkmInitializer.h" // Need for initializing vtk-m
VTK_ABI_NAMESPACE_BEGIN
class vtkDataSet;
class vtkUnstructuredGrid;
@ -67,4 +68,5 @@ private:
vtkmInitializer Initializer;
};
VTK_ABI_NAMESPACE_END
#endif // vtkmCleanGrid_h

@ -41,6 +41,7 @@
#include <algorithm>
VTK_ABI_NAMESPACE_BEGIN
vtkStandardNewMacro(vtkmClip);
//------------------------------------------------------------------------------
@ -214,3 +215,4 @@ int vtkmClip::FillInputPortInformation(int, vtkInformation* info)
info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkImageData");
return 1;
}
VTK_ABI_NAMESPACE_END

@ -31,6 +31,7 @@
#include <memory> // For std::unique_ptr
VTK_ABI_NAMESPACE_BEGIN
class vtkImplicitFunction;
class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm
@ -93,4 +94,5 @@ private:
vtkmInitializer Initializer;
};
VTK_ABI_NAMESPACE_END
#endif // vtkmClip_h

@ -19,6 +19,7 @@
#include <vtkm/filter/contour/ClipWithField.h>
//------------------------------------------------------------------------------
VTK_ABI_NAMESPACE_BEGIN
vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField(
vtkm::cont::DataSet& in, vtkDataArray* scalars, int assoc)
{
@ -37,3 +38,4 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField(
fieldFilter.SetClipValue(this->ClipValue);
return fieldFilter.Execute(in);
}
VTK_ABI_NAMESPACE_END

@ -19,6 +19,7 @@
#include <vtkm/filter/contour/ClipWithImplicitFunction.h>
//------------------------------------------------------------------------------
VTK_ABI_NAMESPACE_BEGIN
vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::cont::DataSet& in)
{
auto function = this->ClipFunctionConverter->Get();
@ -30,3 +31,4 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::c
return result;
}
VTK_ABI_NAMESPACE_END

@ -22,6 +22,7 @@
#include <vtkm/cont/DataSet.h>
VTK_ABI_NAMESPACE_BEGIN
struct vtkmClip::internals
{
double ClipValue = .0;
@ -34,5 +35,6 @@ struct vtkmClip::internals
vtkm::cont::DataSet ExecuteClipWithField(vtkm::cont::DataSet&, vtkDataArray*, int);
};
VTK_ABI_NAMESPACE_END
#endif
// VTK-HeaderTest-Exclude: vtkmClipInternals.h

@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifnd