Merge topic 'DataSetBuilder'
6c3799f80 revert CLion's auto change 04b05ac84 remove ArrayCopy from CopyInto bb383ab76 remove #include Algorithms 1b2ea8ea8 remove ArrayCopy 942653bbe Extract implementation of MakeTestDataSet to .cxx Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kenneth Moreland <morelandkd@ornl.gov> Merge-request: !2649
This commit is contained in:
commit
bc890dc470
@ -10,7 +10,6 @@
|
|||||||
#ifndef vtk_m_cont_DataSetBuilderExplicit_h
|
#ifndef vtk_m_cont_DataSetBuilderExplicit_h
|
||||||
#define vtk_m_cont_DataSetBuilderExplicit_h
|
#define vtk_m_cont_DataSetBuilderExplicit_h
|
||||||
|
|
||||||
#include <vtkm/cont/Algorithm.h>
|
|
||||||
#include <vtkm/cont/ArrayHandleCast.h>
|
#include <vtkm/cont/ArrayHandleCast.h>
|
||||||
#include <vtkm/cont/ArrayHandleCompositeVector.h>
|
#include <vtkm/cont/ArrayHandleCompositeVector.h>
|
||||||
#include <vtkm/cont/ArrayPortalToIterators.h>
|
#include <vtkm/cont/ArrayPortalToIterators.h>
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
#ifndef vtk_m_cont_DataSetBuilderRectilinear_h
|
#ifndef vtk_m_cont_DataSetBuilderRectilinear_h
|
||||||
#define vtk_m_cont_DataSetBuilderRectilinear_h
|
#define vtk_m_cont_DataSetBuilderRectilinear_h
|
||||||
|
|
||||||
#include <vtkm/cont/ArrayCopy.h>
|
|
||||||
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
|
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
|
||||||
#include <vtkm/cont/ArrayPortalToIterators.h>
|
#include <vtkm/cont/ArrayPortalToIterators.h>
|
||||||
#include <vtkm/cont/CoordinateSystem.h>
|
#include <vtkm/cont/CoordinateSystem.h>
|
||||||
@ -35,7 +34,7 @@ class VTKM_CONT_EXPORT DataSetBuilderRectilinear
|
|||||||
VTKM_CONT static void CopyInto(const vtkm::cont::ArrayHandle<T>& input,
|
VTKM_CONT static void CopyInto(const vtkm::cont::ArrayHandle<T>& input,
|
||||||
vtkm::cont::ArrayHandle<U>& output)
|
vtkm::cont::ArrayHandle<U>& output)
|
||||||
{
|
{
|
||||||
vtkm::cont::ArrayCopy(input, output);
|
vtkm::cont::UnknownArrayHandle(output).DeepCopyFrom(input);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T, typename U>
|
template <typename T, typename U>
|
||||||
|
@ -98,6 +98,7 @@ set(unit_tests
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(library_sources
|
set(library_sources
|
||||||
|
MakeTestDataSet.cxx
|
||||||
TestEqualArrayHandles.cxx
|
TestEqualArrayHandles.cxx
|
||||||
)
|
)
|
||||||
|
|
||||||
|
1520
vtkm/cont/testing/MakeTestDataSet.cxx
Normal file
1520
vtkm/cont/testing/MakeTestDataSet.cxx
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -11,6 +11,7 @@
|
|||||||
#include <vtkm/cont/CellSetPermutation.h>
|
#include <vtkm/cont/CellSetPermutation.h>
|
||||||
#include <vtkm/cont/CellSetSingleType.h>
|
#include <vtkm/cont/CellSetSingleType.h>
|
||||||
#include <vtkm/cont/DataSet.h>
|
#include <vtkm/cont/DataSet.h>
|
||||||
|
#include <vtkm/cont/DataSetBuilderExplicit.h>
|
||||||
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
|
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
|
||||||
|
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||||
|
@ -8,10 +8,10 @@
|
|||||||
// PURPOSE. See the above copyright notice for more information.
|
// PURPOSE. See the above copyright notice for more information.
|
||||||
//============================================================================
|
//============================================================================
|
||||||
|
|
||||||
#include <vtkm/filter/ClipWithField.h>
|
#include <vtkm/cont/DataSetBuilderExplicit.h>
|
||||||
|
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||||
#include <vtkm/cont/testing/Testing.h>
|
#include <vtkm/cont/testing/Testing.h>
|
||||||
|
#include <vtkm/filter/ClipWithField.h>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include <vtkm/filter/ClipWithImplicitFunction.h>
|
#include <vtkm/filter/ClipWithImplicitFunction.h>
|
||||||
|
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/DataSetBuilderUniform.h>
|
||||||
#include <vtkm/cont/testing/Testing.h>
|
#include <vtkm/cont/testing/Testing.h>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
|
@ -13,12 +13,11 @@
|
|||||||
#include <vtkm/cont/ArrayHandle.h>
|
#include <vtkm/cont/ArrayHandle.h>
|
||||||
#include <vtkm/cont/CellSetStructured.h>
|
#include <vtkm/cont/CellSetStructured.h>
|
||||||
#include <vtkm/cont/DataSet.h>
|
#include <vtkm/cont/DataSet.h>
|
||||||
|
#include <vtkm/cont/DataSetBuilderUniform.h>
|
||||||
#include <vtkm/cont/PartitionedDataSet.h>
|
#include <vtkm/cont/PartitionedDataSet.h>
|
||||||
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
|
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
|
||||||
#include <vtkm/exec/ConnectivityStructured.h>
|
#include <vtkm/exec/ConnectivityStructured.h>
|
||||||
|
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
|
||||||
#include <vtkm/cont/testing/Testing.h>
|
#include <vtkm/cont/testing/Testing.h>
|
||||||
#include <vtkm/filter/CellAverage.h>
|
#include <vtkm/filter/CellAverage.h>
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <vtkm/filter/SplitSharpEdges.h>
|
#include <vtkm/filter/SplitSharpEdges.h>
|
||||||
#include <vtkm/filter/SurfaceNormals.h>
|
#include <vtkm/filter/SurfaceNormals.h>
|
||||||
|
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/DataSetBuilderExplicit.h>
|
||||||
#include <vtkm/cont/testing/Testing.h>
|
#include <vtkm/cont/testing/Testing.h>
|
||||||
|
|
||||||
#include <vtkm/source/Wavelet.h>
|
#include <vtkm/source/Wavelet.h>
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
#include <vtkm/io/VTKDataSetReader.h>
|
#include <vtkm/io/VTKDataSetReader.h>
|
||||||
#include <vtkm/io/VTKDataSetWriter.h>
|
#include <vtkm/io/VTKDataSetWriter.h>
|
||||||
|
|
||||||
|
#include <vtkm/cont/DataSetBuilderUniform.h>
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||||
#include <vtkm/cont/testing/Testing.h>
|
#include <vtkm/cont/testing/Testing.h>
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
//============================================================================
|
//============================================================================
|
||||||
|
|
||||||
#include <vtkm/cont/ArrayCopy.h>
|
#include <vtkm/cont/ArrayCopy.h>
|
||||||
|
#include <vtkm/cont/DataSetBuilderExplicit.h>
|
||||||
#include <vtkm/cont/DataSetBuilderUniform.h>
|
#include <vtkm/cont/DataSetBuilderUniform.h>
|
||||||
#include <vtkm/cont/DeviceAdapter.h>
|
#include <vtkm/cont/DeviceAdapter.h>
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
// PURPOSE. See the above copyright notice for more information.
|
// PURPOSE. See the above copyright notice for more information.
|
||||||
//============================================================================
|
//============================================================================
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/DataSetBuilderUniform.h>
|
||||||
#include <vtkm/cont/testing/Testing.h>
|
#include <vtkm/cont/testing/Testing.h>
|
||||||
#include <vtkm/filter/Contour.h>
|
#include <vtkm/filter/Contour.h>
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <vtkm/worklet/SplitSharpEdges.h>
|
#include <vtkm/worklet/SplitSharpEdges.h>
|
||||||
#include <vtkm/worklet/SurfaceNormals.h>
|
#include <vtkm/worklet/SurfaceNormals.h>
|
||||||
|
|
||||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
#include <vtkm/cont/DataSetBuilderExplicit.h>
|
||||||
#include <vtkm/cont/testing/Testing.h>
|
#include <vtkm/cont/testing/Testing.h>
|
||||||
#include <vtkm/worklet/DispatcherMapTopology.h>
|
#include <vtkm/worklet/DispatcherMapTopology.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user