vtkm::filter now run each test with an explicit device adapter set
This allows the filters to be tested with each device
This commit is contained in:
parent
c4bf46ecf0
commit
fda9113779
@ -73,6 +73,7 @@ struct Pair
|
||||
{
|
||||
}
|
||||
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
VTKM_EXEC_CONT
|
||||
Pair(FirstType&& firstSrc, SecondType&& secondSrc)
|
||||
: first(std::move(firstSrc))
|
||||
|
@ -66,4 +66,4 @@ set(unit_tests
|
||||
UnitTestZFP.cxx
|
||||
)
|
||||
|
||||
vtkm_unit_tests(SOURCES ${unit_tests})
|
||||
vtkm_unit_tests(SOURCES ${unit_tests} ALL_BACKENDS)
|
||||
|
@ -143,7 +143,7 @@ void TestCellAverage()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestCellAverageFilter(int, char* [])
|
||||
int UnitTestCellAverageFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestCellAverage);
|
||||
return vtkm::cont::testing::Testing::Run(TestCellAverage, argc, argv);
|
||||
}
|
||||
|
@ -102,7 +102,7 @@ void TestCellMeasures()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestCellMeasuresFilter(int, char* [])
|
||||
int UnitTestCellMeasuresFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestCellMeasures);
|
||||
return vtkm::cont::testing::Testing::Run(TestCellMeasures, argc, argv);
|
||||
}
|
||||
|
@ -81,7 +81,7 @@ void RunTest()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestCleanGrid(int, char* [])
|
||||
int UnitTestCleanGrid(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(RunTest);
|
||||
return vtkm::cont::testing::Testing::Run(RunTest, argc, argv);
|
||||
}
|
||||
|
@ -98,7 +98,7 @@ void TestClip()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestClipWithFieldFilter(int, char* [])
|
||||
int UnitTestClipWithFieldFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestClip);
|
||||
return vtkm::cont::testing::Testing::Run(TestClip, argc, argv);
|
||||
}
|
||||
|
@ -139,7 +139,7 @@ void TestClip()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestClipWithImplicitFunctionFilter(int, char* [])
|
||||
int UnitTestClipWithImplicitFunctionFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestClip);
|
||||
return vtkm::cont::testing::Testing::Run(TestClip, argc, argv);
|
||||
}
|
||||
|
@ -261,8 +261,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestContourTreeUniformAugmentedFilter(int, char* [])
|
||||
int UnitTestContourTreeUniformAugmentedFilter(int argc, char* argv[])
|
||||
{
|
||||
vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
|
||||
return vtkm::cont::testing::Testing::Run(TestContourTreeUniform());
|
||||
return vtkm::cont::testing::Testing::Run(TestContourTreeUniform(), argc, argv);
|
||||
}
|
||||
|
@ -168,7 +168,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestContourTreeUniformFilter(int, char* [])
|
||||
int UnitTestContourTreeUniformFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestContourTreeUniform());
|
||||
return vtkm::cont::testing::Testing::Run(TestContourTreeUniform(), argc, argv);
|
||||
}
|
||||
|
@ -198,7 +198,7 @@ void TestCoordinateSystemTransform()
|
||||
}
|
||||
|
||||
|
||||
int UnitTestCoordinateSystemTransform(int, char* [])
|
||||
int UnitTestCoordinateSystemTransform(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestCoordinateSystemTransform);
|
||||
return vtkm::cont::testing::Testing::Run(TestCoordinateSystemTransform, argc, argv);
|
||||
}
|
||||
|
@ -221,7 +221,7 @@ void TestCrossProduct()
|
||||
}
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestCrossProductFilter(int, char* [])
|
||||
int UnitTestCrossProductFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestCrossProduct);
|
||||
return vtkm::cont::testing::Testing::Run(TestCrossProduct, argc, argv);
|
||||
}
|
||||
|
@ -172,7 +172,7 @@ void TestDotProduct()
|
||||
}
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestDotProductFilter(int, char* [])
|
||||
int UnitTestDotProductFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestDotProduct);
|
||||
return vtkm::cont::testing::Testing::Run(TestDotProduct, argc, argv);
|
||||
}
|
||||
|
@ -136,7 +136,7 @@ void TestEntropy()
|
||||
} // TestFieldEntropy
|
||||
}
|
||||
|
||||
int UnitTestEntropyFilter(int, char* [])
|
||||
int UnitTestEntropyFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestEntropy);
|
||||
return vtkm::cont::testing::Testing::Run(TestEntropy, argc, argv);
|
||||
}
|
||||
|
@ -154,7 +154,7 @@ void TestExternalFacesFilter()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestExternalFacesFilter(int, char* [])
|
||||
int UnitTestExternalFacesFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestExternalFacesFilter);
|
||||
return vtkm::cont::testing::Testing::Run(TestExternalFacesFilter, argc, argv);
|
||||
}
|
||||
|
@ -152,7 +152,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestExtractGeometryFilter(int, char* [])
|
||||
int UnitTestExtractGeometryFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingExtractGeometry());
|
||||
return vtkm::cont::testing::Testing::Run(TestingExtractGeometry(), argc, argv);
|
||||
}
|
||||
|
@ -169,7 +169,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestExtractPointsFilter(int, char* [])
|
||||
int UnitTestExtractPointsFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingExtractPoints());
|
||||
return vtkm::cont::testing::Testing::Run(TestingExtractPoints(), argc, argv);
|
||||
}
|
||||
|
@ -527,7 +527,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestExtractStructuredFilter(int, char* [])
|
||||
int UnitTestExtractStructuredFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingExtractStructured());
|
||||
return vtkm::cont::testing::Testing::Run(TestingExtractStructured(), argc, argv);
|
||||
}
|
||||
|
@ -89,7 +89,7 @@ void TestFieldMetadata()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestFieldMetadata(int, char* [])
|
||||
int UnitTestFieldMetadata(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestFieldMetadata);
|
||||
return vtkm::cont::testing::Testing::Run(TestFieldMetadata, argc, argv);
|
||||
}
|
||||
|
@ -175,7 +175,7 @@ void TestFieldSelection()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestFieldSelection(int, char* [])
|
||||
int UnitTestFieldSelection(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestFieldSelection);
|
||||
return vtkm::cont::testing::Testing::Run(TestFieldSelection, argc, argv);
|
||||
}
|
||||
|
@ -91,7 +91,7 @@ void TestFieldToColors()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestFieldToColors(int, char* [])
|
||||
int UnitTestFieldToColors(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestFieldToColors);
|
||||
return vtkm::cont::testing::Testing::Run(TestFieldToColors, argc, argv);
|
||||
}
|
||||
|
@ -289,7 +289,7 @@ void TestGhostZone()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestGhostZone(int, char* [])
|
||||
int UnitTestGhostZone(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestGhostZone);
|
||||
return vtkm::cont::testing::Testing::Run(TestGhostZone, argc, argv);
|
||||
}
|
||||
|
@ -248,7 +248,7 @@ void TestGradient()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestGradient(int, char* [])
|
||||
int UnitTestGradient(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestGradient);
|
||||
return vtkm::cont::testing::Testing::Run(TestGradient, argc, argv);
|
||||
}
|
||||
|
@ -349,7 +349,7 @@ void TestHistogram()
|
||||
|
||||
} // TestFieldHistogram
|
||||
|
||||
int UnitTestHistogramFilter(int, char* [])
|
||||
int UnitTestHistogramFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestHistogram);
|
||||
return vtkm::cont::testing::Testing::Run(TestHistogram, argc, argv);
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ void TestLagrangian()
|
||||
TestLagrangianFilterMultiStepInterval();
|
||||
}
|
||||
|
||||
int UnitTestLagrangianFilter(int, char* [])
|
||||
int UnitTestLagrangianFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestLagrangian);
|
||||
return vtkm::cont::testing::Testing::Run(TestLagrangian, argc, argv);
|
||||
}
|
||||
|
@ -517,7 +517,7 @@ void TestMarchingCubesFilter()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestMarchingCubesFilter(int, char* [])
|
||||
int UnitTestMarchingCubesFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(vtkm_ut_mc_filter::TestMarchingCubesFilter);
|
||||
return vtkm::cont::testing::Testing::Run(vtkm_ut_mc_filter::TestMarchingCubesFilter, argc, argv);
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestMaskFilter(int, char* [])
|
||||
int UnitTestMaskFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingMask());
|
||||
return vtkm::cont::testing::Testing::Run(TestingMask(), argc, argv);
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestMaskPointsFilter(int, char* [])
|
||||
int UnitTestMaskPointsFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingMaskPoints());
|
||||
return vtkm::cont::testing::Testing::Run(TestingMaskPoints(), argc, argv);
|
||||
}
|
||||
|
@ -130,7 +130,7 @@ void TestMultiBlockFilters()
|
||||
Result_Verify(result, cellAverage, Blocks, std::string("pointvar"));
|
||||
}
|
||||
|
||||
int UnitTestMultiBlockFilters(int, char* [])
|
||||
int UnitTestMultiBlockFilters(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestMultiBlockFilters);
|
||||
return vtkm::cont::testing::Testing::Run(TestMultiBlockFilters, argc, argv);
|
||||
}
|
||||
|
@ -130,7 +130,7 @@ static void TestMultiBlockHistogram()
|
||||
std::cout << std::endl;
|
||||
};
|
||||
|
||||
int UnitTestMultiBlockHistogramFilter(int, char* [])
|
||||
int UnitTestMultiBlockHistogramFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestMultiBlockHistogram);
|
||||
return vtkm::cont::testing::Testing::Run(TestMultiBlockHistogram, argc, argv);
|
||||
}
|
||||
|
@ -208,7 +208,7 @@ void RunTest()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestNDEntropyFilter(int, char* [])
|
||||
int UnitTestNDEntropyFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(RunTest);
|
||||
return vtkm::cont::testing::Testing::Run(RunTest, argc, argv);
|
||||
}
|
||||
|
@ -125,7 +125,7 @@ void RunTest()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestNDHistogramFilter(int, char* [])
|
||||
int UnitTestNDHistogramFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(RunTest);
|
||||
return vtkm::cont::testing::Testing::Run(RunTest, argc, argv);
|
||||
}
|
||||
|
@ -142,7 +142,7 @@ void TestPointAverage()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestPointAverageFilter(int, char* [])
|
||||
int UnitTestPointAverageFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestPointAverage);
|
||||
return vtkm::cont::testing::Testing::Run(TestPointAverage, argc, argv);
|
||||
}
|
||||
|
@ -138,7 +138,7 @@ void TestPointElevation()
|
||||
TestPointElevationWithPolicy();
|
||||
}
|
||||
|
||||
int UnitTestPointElevationFilter(int, char* [])
|
||||
int UnitTestPointElevationFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestPointElevation);
|
||||
return vtkm::cont::testing::Testing::Run(TestPointElevation, argc, argv);
|
||||
}
|
||||
|
@ -203,7 +203,7 @@ void TestPointTransform()
|
||||
}
|
||||
|
||||
|
||||
int UnitTestPointTransform(int, char* [])
|
||||
int UnitTestPointTransform(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestPointTransform);
|
||||
return vtkm::cont::testing::Testing::Run(TestPointTransform, argc, argv);
|
||||
}
|
||||
|
@ -219,7 +219,7 @@ public:
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestProbe(int, char* [])
|
||||
int UnitTestProbe(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestProbe::Run);
|
||||
return vtkm::cont::testing::Testing::Run(TestProbe::Run, argc, argv);
|
||||
}
|
||||
|
@ -219,7 +219,7 @@ void TestSplitSharpEdgesFilter()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestSplitSharpEdgesFilter(int, char* [])
|
||||
int UnitTestSplitSharpEdgesFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestSplitSharpEdgesFilter);
|
||||
return vtkm::cont::testing::Testing::Run(TestSplitSharpEdgesFilter, argc, argv);
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ void TestStreamline()
|
||||
VTKM_TEST_ASSERT(dcells.GetNumberOfCells() == 3, "Wrong number of cells");
|
||||
}
|
||||
|
||||
int UnitTestStreamlineFilter(int, char* [])
|
||||
int UnitTestStreamlineFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestStreamline);
|
||||
return vtkm::cont::testing::Testing::Run(TestStreamline, argc, argv);
|
||||
}
|
||||
|
@ -101,7 +101,7 @@ void TestSurfaceNormals()
|
||||
} // anonymous namespace
|
||||
|
||||
|
||||
int UnitTestSurfaceNormalsFilter(int, char* [])
|
||||
int UnitTestSurfaceNormalsFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestSurfaceNormals);
|
||||
return vtkm::cont::testing::Testing::Run(TestSurfaceNormals, argc, argv);
|
||||
}
|
||||
|
@ -87,7 +87,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestTetrahedralizeFilter(int, char* [])
|
||||
int UnitTestTetrahedralizeFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingTetrahedralize());
|
||||
return vtkm::cont::testing::Testing::Run(TestingTetrahedralize(), argc, argv);
|
||||
}
|
||||
|
@ -137,7 +137,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestThresholdFilter(int, char* [])
|
||||
int UnitTestThresholdFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingThreshold());
|
||||
return vtkm::cont::testing::Testing::Run(TestingThreshold(), argc, argv);
|
||||
}
|
||||
|
@ -129,7 +129,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestThresholdPointsFilter(int, char* [])
|
||||
int UnitTestThresholdPointsFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingThresholdPoints());
|
||||
return vtkm::cont::testing::Testing::Run(TestingThresholdPoints(), argc, argv);
|
||||
}
|
||||
|
@ -81,7 +81,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
int UnitTestTriangulateFilter(int, char* [])
|
||||
int UnitTestTriangulateFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestingTriangulate());
|
||||
return vtkm::cont::testing::Testing::Run(TestingTriangulate(), argc, argv);
|
||||
}
|
||||
|
@ -67,7 +67,7 @@ void TestVectorMagnitude()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestVectorMagnitudeFilter(int, char* [])
|
||||
int UnitTestVectorMagnitudeFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestVectorMagnitude);
|
||||
return vtkm::cont::testing::Testing::Run(TestVectorMagnitude, argc, argv);
|
||||
}
|
||||
|
@ -109,7 +109,7 @@ void TestVertexClustering()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestVertexClusteringFilter(int, char* [])
|
||||
int UnitTestVertexClusteringFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestVertexClustering);
|
||||
return vtkm::cont::testing::Testing::Run(TestVertexClustering, argc, argv);
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ void TestWarpScalarFilter()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestWarpScalarFilter(int, char* [])
|
||||
int UnitTestWarpScalarFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestWarpScalarFilter);
|
||||
return vtkm::cont::testing::Testing::Run(TestWarpScalarFilter, argc, argv);
|
||||
}
|
||||
|
@ -131,7 +131,7 @@ void TestWarpVectorFilter()
|
||||
}
|
||||
}
|
||||
|
||||
int UnitTestWarpVectorFilter(int, char* [])
|
||||
int UnitTestWarpVectorFilter(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestWarpVectorFilter);
|
||||
return vtkm::cont::testing::Testing::Run(TestWarpVectorFilter, argc, argv);
|
||||
}
|
||||
|
@ -157,7 +157,7 @@ void TestZFPFilter()
|
||||
}
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestZFP(int, char* [])
|
||||
int UnitTestZFP(int argc, char* argv[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(vtkm_ut_zfp_filter::TestZFPFilter);
|
||||
return vtkm::cont::testing::Testing::Run(vtkm_ut_zfp_filter::TestZFPFilter, argc, argv);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user