Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'DataSetBuilder'

Browse Source 
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:
Li-Ta Lo 2021-12-15 14:16:20 +00:00 committed by Kitware Robot
commit bc890dc470
14 changed files with 1537 additions and 1513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vtkm/cont/DataSetBuilderExplicit.h
View File

@ -10,7 +10,6 @@
#ifndef vtk_m_cont_DataSetBuilderExplicit_h
#define vtk_m_cont_DataSetBuilderExplicit_h
#include <vtkm/cont/Algorithm.h>
#include <vtkm/cont/ArrayHandleCast.h>
#include <vtkm/cont/ArrayHandleCompositeVector.h>
#include <vtkm/cont/ArrayPortalToIterators.h>

3
vtkm/cont/DataSetBuilderRectilinear.h
View File

@ -10,7 +10,6 @@
#ifndef vtk_m_cont_DataSetBuilderRectilinear_h
#define vtk_m_cont_DataSetBuilderRectilinear_h
#include <vtkm/cont/ArrayCopy.h>
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
#include <vtkm/cont/ArrayPortalToIterators.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::ArrayHandle<U>& output)
{
vtkm::cont::ArrayCopy(input, output);
vtkm::cont::UnknownArrayHandle(output).DeepCopyFrom(input);
}
template <typename T, typename U>

1
vtkm/cont/testing/CMakeLists.txt
View File

@ -98,6 +98,7 @@ set(unit_tests
)
set(library_sources
MakeTestDataSet.cxx
TestEqualArrayHandles.cxx
)

1520
vtkm/cont/testing/MakeTestDataSet.cxx Normal file
View File

File diff suppressed because it is too large Load Diff

1507
vtkm/cont/testing/MakeTestDataSet.h
View File

File diff suppressed because it is too large Load Diff

1
vtkm/cont/testing/UnitTestDataSetPermutation.cxx
View File

@ -11,6 +11,7 @@
#include <vtkm/cont/CellSetPermutation.h>
#include <vtkm/cont/CellSetSingleType.h>
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderExplicit.h>
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>

4
vtkm/filter/testing/UnitTestClipWithFieldFilter.cxx
View File

@ -8,10 +8,10 @@
// 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/Testing.h>
#include <vtkm/filter/ClipWithField.h>
namespace
{

2
vtkm/filter/testing/UnitTestClipWithImplicitFunctionFilter.cxx
View File

@ -10,7 +10,7 @@
#include <vtkm/filter/ClipWithImplicitFunction.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/testing/Testing.h>
namespace

3
vtkm/filter/testing/UnitTestPartitionedDataSetFilters.cxx
View File

@ -13,12 +13,11 @@
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/CellSetStructured.h>
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/PartitionedDataSet.h>
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/exec/ConnectivityStructured.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/CellAverage.h>

2
vtkm/filter/testing/UnitTestSplitSharpEdgesFilter.cxx
View File

@ -12,7 +12,7 @@
#include <vtkm/filter/SplitSharpEdges.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/source/Wavelet.h>

1
vtkm/io/testing/UnitTestVTKDataSetWriter.cxx
View File

@ -15,6 +15,7 @@
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>

1
vtkm/rendering/testing/UnitTestMapperWireframer.cxx
View File

@ -9,6 +9,7 @@
//============================================================================
#include <vtkm/cont/ArrayCopy.h>
#include <vtkm/cont/DataSetBuilderExplicit.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>

2
vtkm/worklet/testing/UnitTestImageConnectivity.cxx
View File

@ -7,7 +7,7 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// 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/filter/Contour.h>

2
vtkm/worklet/testing/UnitTestSplitSharpEdges.cxx
View File

@ -10,7 +10,7 @@
#include <vtkm/worklet/SplitSharpEdges.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/worklet/DispatcherMapTopology.h>