Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-cuda-runtime-errors'

Browse Source 
873f6bab0 check more types in UnitTestScatterAndMaskWithTopology

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2006
This commit is contained in:
Vicente Bolea 2020-03-25 16:04:01 +00:00 committed by Kitware Robot
commit f05f2edd33
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vtkm/worklet/testing/UnitTestScatterAndMaskWithTopology.cxx
View File

@ -18,7 +18,7 @@
#include <vtkm/worklet/MaskSelect.h> #include <vtkm/worklet/MaskSelect.h>
#include <vtkm/worklet/ScatterUniform.h> #include <vtkm/worklet/ScatterUniform.h>
namespace maptopology3d namespace
{ {
class TestWorkletMapTopo : public vtkm::worklet::WorkletVisitPointsWithCells class TestWorkletMapTopo : public vtkm::worklet::WorkletVisitPointsWithCells
@ -171,35 +171,36 @@ void TestWorkletMapField3d(vtkm::cont::DeviceAdapterId id)
using HandleTypesToTest3D = using HandleTypesToTest3D =
vtkm::List<vtkm::Id, vtkm::Vec2i_32, vtkm::FloatDefault, vtkm::Vec3f_64>; vtkm::List<vtkm::Id, vtkm::Vec2i_32, vtkm::FloatDefault, vtkm::Vec3f_64>;
using HandleTypesToTest1D =
vtkm::List<vtkm::Int32, vtkm::Int64, vtkm::UInt32, vtkm::UInt64, vtkm::Int8, vtkm::UInt8, char>;
std::cout << "Testing WorkletMapTopology with ScatterIdentity on device adapter: " << id.GetName() std::cout << "Testing WorkletMapTopology with ScatterIdentity on device adapter: " << id.GetName()
<< std::endl; << std::endl;
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoIdentity>(), vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoIdentity>(),
HandleTypesToTest3D()); HandleTypesToTest3D());
std::cout << "Testing WorkletMapTopology with ScatterUniform on device adapter: " << id.GetName() std::cout << "Testing WorkletMapTopology with ScatterUniform on device adapter: " << id.GetName()
<< std::endl; << std::endl;
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoUniform>(), vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoUniform>(),
HandleTypesToTest3D()); HandleTypesToTest3D());
std::cout << "Testing WorkletMapTopology with MaskNone on device adapter: " << id.GetName() std::cout << "Testing WorkletMapTopology with MaskNone on device adapter: " << id.GetName()
<< std::endl; << std::endl;
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoNone>(), vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoNone>(), HandleTypesToTest3D());
HandleTypesToTest3D());
std::cout << "Testing WorkletMapTopology with MaskSelect on device adapter: " << id.GetName() std::cout << "Testing WorkletMapTopology with MaskSelect on device adapter: " << id.GetName()
<< std::endl; << std::endl;
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoSelect>(), vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoSelect>(),
HandleTypesToTest3D()); HandleTypesToTest1D());
} }
} // maptopology3d namespace } // namespace
int UnitTestScatterAndMaskWithTopology(int argc, char* argv[]) int UnitTestScatterAndMaskWithTopology(int argc, char* argv[])
{ {
return vtkm::cont::testing::Testing::RunOnDevice( return vtkm::cont::testing::Testing::RunOnDevice(TestWorkletMapField3d, argc, argv);
maptopology3d::TestWorkletMapField3d, argc, argv);
} }