mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Merge topic 'fix-cuda-runtime-errors'
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:
commit
f05f2edd33
@ -18,7 +18,7 @@
|
||||
#include <vtkm/worklet/MaskSelect.h>
|
||||
#include <vtkm/worklet/ScatterUniform.h>
|
||||
|
||||
namespace maptopology3d
|
||||
namespace
|
||||
{
|
||||
|
||||
class TestWorkletMapTopo : public vtkm::worklet::WorkletVisitPointsWithCells
|
||||
@ -171,35 +171,36 @@ void TestWorkletMapField3d(vtkm::cont::DeviceAdapterId id)
|
||||
using HandleTypesToTest3D =
|
||||
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::endl;
|
||||
|
||||
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoIdentity>(),
|
||||
vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoIdentity>(),
|
||||
HandleTypesToTest3D());
|
||||
|
||||
std::cout << "Testing WorkletMapTopology with ScatterUniform on device adapter: " << id.GetName()
|
||||
<< std::endl;
|
||||
|
||||
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoUniform>(),
|
||||
vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoUniform>(),
|
||||
HandleTypesToTest3D());
|
||||
|
||||
std::cout << "Testing WorkletMapTopology with MaskNone on device adapter: " << id.GetName()
|
||||
<< std::endl;
|
||||
|
||||
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoNone>(),
|
||||
HandleTypesToTest3D());
|
||||
vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoNone>(), HandleTypesToTest3D());
|
||||
|
||||
std::cout << "Testing WorkletMapTopology with MaskSelect on device adapter: " << id.GetName()
|
||||
<< std::endl;
|
||||
|
||||
vtkm::testing::Testing::TryTypes(maptopology3d::DoTestWorklet<TestWorkletMapTopoSelect>(),
|
||||
HandleTypesToTest3D());
|
||||
vtkm::testing::Testing::TryTypes(DoTestWorklet<TestWorkletMapTopoSelect>(),
|
||||
HandleTypesToTest1D());
|
||||
}
|
||||
|
||||
} // maptopology3d namespace
|
||||
} // namespace
|
||||
|
||||
int UnitTestScatterAndMaskWithTopology(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::RunOnDevice(
|
||||
maptopology3d::TestWorkletMapField3d, argc, argv);
|
||||
return vtkm::cont::testing::Testing::RunOnDevice(TestWorkletMapField3d, argc, argv);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user