Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Testing run methods now take argc/argv to init logging/runtime device

Browse Source 
`vtkm::cont::testing` now initializes with logging enabled and support
for device being passed on the command line, `vtkm::testing` only
enables logging.
This commit is contained in:
Robert Maynard 2019-01-01 17:19:02 -05:00
parent cbf913ad7c
commit d6f66d17a3
191 changed files with 432 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/cont/arg/testing/UnitTestControlSignatureTag.cxx
View File

@ -47,7 +47,7 @@ void TestControlSignatures()
} // anonymous namespace
int UnitTestControlSignatureTag(int, char* [])
int UnitTestControlSignatureTag(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestControlSignatures);
return vtkm::cont::testing::Testing::Run(TestControlSignatures, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTransportArrayIn.cxx
View File

@ -89,7 +89,7 @@ void TestArrayInTransport()
} // Anonymous namespace
int UnitTestTransportArrayIn(int, char* [])
int UnitTestTransportArrayIn(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayInTransport);
return vtkm::cont::testing::Testing::Run(TestArrayInTransport, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTransportArrayInOut.cxx
View File

@ -97,7 +97,7 @@ void TestArrayInOutTransport()
} // anonymous namespace
int UnitTestTransportArrayInOut(int, char* [])
int UnitTestTransportArrayInOut(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayInOutTransport);
return vtkm::cont::testing::Testing::Run(TestArrayInOutTransport, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTransportArrayOut.cxx
View File

@ -87,7 +87,7 @@ void TestArrayOutTransport()
} // Anonymous namespace
int UnitTestTransportArrayOut(int, char* [])
int UnitTestTransportArrayOut(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayOutTransport);
return vtkm::cont::testing::Testing::Run(TestArrayOutTransport, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx
View File

@ -96,7 +96,7 @@ void UnitTestCellSetIn()
} // Anonymous namespace
int UnitTestTransportCellSetIn(int, char* [])
int UnitTestTransportCellSetIn(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(UnitTestCellSetIn);
return vtkm::cont::testing::Testing::Run(UnitTestCellSetIn, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTransportExecObject.cxx
View File

@ -112,7 +112,7 @@ void TestExecObjectTransport()
} // Anonymous namespace
int UnitTestTransportExecObject(int, char* [])
int UnitTestTransportExecObject(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestExecObjectTransport);
return vtkm::cont::testing::Testing::Run(TestExecObjectTransport, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTransportWholeArray.cxx
View File

@ -207,7 +207,7 @@ void TestWholeArrayTransport()
} // Anonymous namespace
int UnitTestTransportWholeArray(int, char* [])
int UnitTestTransportWholeArray(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestWholeArrayTransport);
return vtkm::cont::testing::Testing::Run(TestWholeArrayTransport, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTypeCheckArray.cxx
View File

@ -87,7 +87,7 @@ void TestCheckArray()
} // anonymous namespace
int UnitTestTypeCheckArray(int, char* [])
int UnitTestTypeCheckArray(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckArray);
return vtkm::cont::testing::Testing::Run(TestCheckArray, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTypeCheckCellSet.cxx
View File

@ -59,7 +59,7 @@ void TestCheckCellSet()
} // anonymous namespace
int UnitTestTypeCheckCellSet(int, char* [])
int UnitTestTypeCheckCellSet(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckCellSet);
return vtkm::cont::testing::Testing::Run(TestCheckCellSet, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTypeCheckExecObject.cxx
View File

@ -55,7 +55,7 @@ void TestCheckExecObject()
} // anonymous namespace
int UnitTestTypeCheckExecObject(int, char* [])
int UnitTestTypeCheckExecObject(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckExecObject);
return vtkm::cont::testing::Testing::Run(TestCheckExecObject, argc, argv);
}

4
vtkm/cont/arg/testing/UnitTestTypeCheckKeys.cxx
View File

@ -55,7 +55,7 @@ void TestCheckKeys()
} // anonymous namespace
int UnitTestTypeCheckKeys(int, char* [])
int UnitTestTypeCheckKeys(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCheckKeys);
return vtkm::cont::testing::Testing::Run(TestCheckKeys, argc, argv);
}

5
vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu
View File

@ -26,9 +26,10 @@
#include <vtkm/cont/cuda/DeviceAdapterCuda.h>
#include <vtkm/cont/testing/TestingArrayHandles.h>
int UnitTestCudaArrayHandle(int, char* [])
int UnitTestCudaArrayHandle(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run();
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run(argc,
argv);
}

6
vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu
View File

@ -28,11 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingFancyArrayHandles.h>
int UnitTestCudaArrayHandleFancy(int, char* [])
int UnitTestCudaArrayHandleFancy(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result =
vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result = vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run(
argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}

4
vtkm/cont/cuda/testing/UnitTestCudaArrayHandleVirtualCoordinates.cu
View File

@ -26,10 +26,10 @@
#include <vtkm/cont/cuda/DeviceAdapterCuda.h>
#include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
int UnitTestCudaArrayHandleVirtualCoordinates(int, char* [])
int UnitTestCudaArrayHandleVirtualCoordinates(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
vtkm::cont::DeviceAdapterTagCuda>::Run();
vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
}

4
vtkm/cont/cuda/testing/UnitTestCudaCellLocatorRectilinearGrid.cu
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h>
int UnitTestCudaCellLocatorRectilinearGrid(int, char* [])
int UnitTestCudaCellLocatorRectilinearGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagCuda>());
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
}

4
vtkm/cont/cuda/testing/UnitTestCudaCellLocatorTwoLevelUniformGrid.cu
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
int UnitTestCudaCellLocatorTwoLevelUniformGrid(int, char* [])
int UnitTestCudaCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagCuda>);
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
}

4
vtkm/cont/cuda/testing/UnitTestCudaCellLocatorUniformGrid.cu
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorUniformGrid.h>
int UnitTestCudaCellLocatorUniformGrid(int, char* [])
int UnitTestCudaCellLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>());
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
}

4
vtkm/cont/cuda/testing/UnitTestCudaColorTable.cu
View File

@ -27,9 +27,9 @@
#include <vtkm/cont/testing/TestingColorTable.h>
int UnitTestCudaColorTable(int, char* [])
int UnitTestCudaColorTable(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagCuda>::Run();
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
}

5
vtkm/cont/cuda/testing/UnitTestCudaComputeRange.cu
View File

@ -28,10 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingComputeRange.h>
int UnitTestCudaComputeRange(int, char* [])
int UnitTestCudaComputeRange(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result = vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result =
vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}

5
vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu
View File

@ -27,10 +27,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingDataSetExplicit.h>
int UnitTestCudaDataSetExplicit(int, char* [])
int UnitTestCudaDataSetExplicit(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result = vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result =
vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}

6
vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu
View File

@ -28,11 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingDataSetSingleType.h>
int UnitTestCudaDataSetSingleType(int, char* [])
int UnitTestCudaDataSetSingleType(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result =
vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result = vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagCuda>::Run(
argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}

5
vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu
View File

@ -28,10 +28,11 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
#include <vtkm/cont/testing/TestingDeviceAdapter.h>
int UnitTestCudaDeviceAdapter(int, char* [])
int UnitTestCudaDeviceAdapter(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int result = vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagCuda>::Run();
int result =
vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
}

4
vtkm/cont/cuda/testing/UnitTestCudaGeometry.cu
View File

@ -29,10 +29,10 @@
#include <vtkm/cont/cuda/DeviceAdapterCuda.h>
#include <vtkm/testing/TestingGeometry.h>
int UnitTestCudaGeometry(int, char* [])
int UnitTestCudaGeometry(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagCuda>);
UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
}

4
vtkm/cont/cuda/testing/UnitTestCudaImplicitFunction.cu
View File

@ -36,9 +36,9 @@ void TestImplicitFunctions()
} // anonymous namespace
int UnitTestCudaImplicitFunction(int, char* [])
int UnitTestCudaImplicitFunction(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
}

7
vtkm/cont/cuda/testing/UnitTestCudaMath.cu
View File

@ -180,14 +180,15 @@ void RunEdgeCases()
} //namespace
int UnitTestCudaMath(int, char* [])
int UnitTestCudaMath(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int tests_valid = vtkm::cont::testing::Testing::Run(
UnitTestMathNamespace::RunMathTests<vtkm::cont::DeviceAdapterTagCuda>);
UnitTestMathNamespace::RunMathTests<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
tests_valid += vtkm::cont::testing::Testing::Run(RunEdgeCases<vtkm::cont::DeviceAdapterTagCuda>);
tests_valid +=
vtkm::cont::testing::Testing::Run(RunEdgeCases<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
return tests_valid;
}

4
vtkm/cont/cuda/testing/UnitTestCudaPointLocatorUniformGrid.cu
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
int UnitTestCudaPointLocatorUniformGrid(int, char* [])
int UnitTestCudaPointLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
return vtkm::cont::testing::Testing::Run(
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>());
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
}

4
vtkm/cont/cuda/testing/UnitTestCudaShareUserProvidedManagedMemory.cu
View File

@ -280,10 +280,10 @@ void Launch()
} // end anon namespace
int UnitTestCudaShareUserProvidedManagedMemory(int, char* [])
int UnitTestCudaShareUserProvidedManagedMemory(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
int ret = vtkm::cont::testing::Testing::Run(Launch);
int ret = vtkm::cont::testing::Testing::Run(Launch, argc, argv);
return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(ret);
}

4
vtkm/cont/cuda/testing/UnitTestCudaVirtualObjectHandle.cu
View File

@ -44,7 +44,7 @@ void TestVirtualObjectHandle()
} // anonymous namespace
int UnitTestCudaVirtualObjectHandle(int, char* [])
int UnitTestCudaVirtualObjectHandle(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle);
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle, argc, argv);
}

4
vtkm/cont/internal/testing/UnitTestArrayManagerExecutionShareWithControl.cxx
View File

@ -162,7 +162,7 @@ void TestArrayManagerShare()
} // Anonymous namespace
int UnitTestArrayManagerExecutionShareWithControl(int, char* [])
int UnitTestArrayManagerExecutionShareWithControl(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayManagerShare);
return vtkm::cont::testing::Testing::Run(TestArrayManagerShare, argc, argv);
}

4
vtkm/cont/internal/testing/UnitTestArrayPortalFromIterators.cxx
View File

@ -160,7 +160,7 @@ void TestArrayPortalFromIterators()
} // Anonymous namespace
int UnitTestArrayPortalFromIterators(int, char* [])
int UnitTestArrayPortalFromIterators(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayPortalFromIterators);
return vtkm::cont::testing::Testing::Run(TestArrayPortalFromIterators, argc, argv);
}

4
vtkm/cont/internal/testing/UnitTestDynamicTransform.cxx
View File

@ -200,7 +200,7 @@ void TestDynamicTransform()
} // anonymous namespace
int UnitTestDynamicTransform(int, char* [])
int UnitTestDynamicTransform(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestDynamicTransform);
return vtkm::cont::testing::Testing::Run(TestDynamicTransform, argc, argv);
}

4
vtkm/cont/internal/testing/UnitTestIteratorFromArrayPortal.cxx
View File

@ -163,7 +163,7 @@ void TestArrayIteratorFromArrayPortal()
} // Anonymous namespace
int UnitTestIteratorFromArrayPortal(int, char* [])
int UnitTestIteratorFromArrayPortal(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayIteratorFromArrayPortal);
return vtkm::cont::testing::Testing::Run(TestArrayIteratorFromArrayPortal, argc, argv);
}

5
vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandle.cxx
View File

@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingArrayHandles.h>
int UnitTestOpenMPArrayHandle(int, char* [])
int UnitTestOpenMPArrayHandle(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}

5
vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleFancy.cxx
View File

@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingFancyArrayHandles.h>
int UnitTestOpenMPArrayHandleFancy(int, char* [])
int UnitTestOpenMPArrayHandleFancy(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run(
argc, argv);
}

4
vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleVirtualCoordinates.cxx
View File

@ -23,10 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
int UnitTestOpenMPArrayHandleVirtualCoordinates(int, char* [])
int UnitTestOpenMPArrayHandleVirtualCoordinates(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
vtkm::cont::DeviceAdapterTagOpenMP>::Run();
vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc, argv);
}

4
vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorRectilinearGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h>
int UnitTestOpenMPCellLocatorRectilinearGrid(int, char* [])
int UnitTestOpenMPCellLocatorRectilinearGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>());
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
}

4
vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorTwoLevelUniformGrid.cxx
View File

@ -23,10 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
int UnitTestOpenMPCellLocatorTwoLevelUniformGrid(int, char* [])
int UnitTestOpenMPCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>);
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>, argc, argv);
}

4
vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorUniformGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorUniformGrid.h>
int UnitTestOpenMPCellLocatorUniformGrid(int, char* [])
int UnitTestOpenMPCellLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
}

5
vtkm/cont/openmp/testing/UnitTestOpenMPColorTable.cxx
View File

@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingColorTable.h>
int UnitTestOpenMPColorTable(int, char* [])
int UnitTestOpenMPColorTable(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}

5
vtkm/cont/openmp/testing/UnitTestOpenMPComputeRange.cxx
View File

@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingComputeRange.h>
int UnitTestOpenMPComputeRange(int, char* [])
int UnitTestOpenMPComputeRange(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}

5
vtkm/cont/openmp/testing/UnitTestOpenMPDataSetExplicit.cxx
View File

@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingDataSetExplicit.h>
int UnitTestOpenMPDataSetExplicit(int, char* [])
int UnitTestOpenMPDataSetExplicit(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}

5
vtkm/cont/openmp/testing/UnitTestOpenMPDataSetSingleType.cxx
View File

@ -23,9 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingDataSetSingleType.h>
int UnitTestOpenMPDataSetSingleType(int, char* [])
int UnitTestOpenMPDataSetSingleType(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagOpenMP>::Run(
argc, argv);
}

5
vtkm/cont/openmp/testing/UnitTestOpenMPDeviceAdapter.cxx
View File

@ -24,9 +24,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingDeviceAdapter.h>
int UnitTestOpenMPDeviceAdapter(int, char* [])
int UnitTestOpenMPDeviceAdapter(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagOpenMP>::Run();
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
argv);
}

4
vtkm/cont/openmp/testing/UnitTestOpenMPImplicitFunction.cxx
View File

@ -37,7 +37,7 @@ void TestImplicitFunctions()
} // anonymous namespace
int UnitTestOpenMPImplicitFunction(int, char* [])
int UnitTestOpenMPImplicitFunction(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
}

4
vtkm/cont/openmp/testing/UnitTestOpenMPPointLocatorUniformGrid.cxx
View File

@ -23,10 +23,10 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
int UnitTestOpenMPPointLocatorUniformGrid(int, char* [])
int UnitTestOpenMPPointLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
return vtkm::cont::testing::Testing::Run(
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>());
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>(), argc, argv);
}

4
vtkm/cont/openmp/testing/UnitTestOpenMPVirtualObjectHandle.cxx
View File

@ -44,7 +44,7 @@ void TestVirtualObjectHandle()
} // anonymous namespace
int UnitTestOpenMPVirtualObjectHandle(int, char* [])
int UnitTestOpenMPVirtualObjectHandle(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle);
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle, argc, argv);
}

5
vtkm/cont/serial/testing/UnitTestSerialArrayHandle.cxx
View File

@ -26,9 +26,10 @@
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/cont/testing/TestingArrayHandles.h>
int UnitTestSerialArrayHandle(int, char* [])
int UnitTestSerialArrayHandle(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run();
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
argv);
}

5
vtkm/cont/serial/testing/UnitTestSerialArrayHandleFancy.cxx
View File

@ -29,9 +29,10 @@
#include <vtkm/cont/testing/TestingFancyArrayHandles.h>
int UnitTestSerialArrayHandleFancy(int, char* [])
int UnitTestSerialArrayHandleFancy(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run();
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run(
argc, argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialArrayHandleVirtualCoordinates.cxx
View File

@ -27,10 +27,10 @@
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
int UnitTestSerialArrayHandleVirtualCoordinates(int, char* [])
int UnitTestSerialArrayHandleVirtualCoordinates(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
vtkm::cont::DeviceAdapterTagSerial>::Run();
vtkm::cont::DeviceAdapterTagSerial>::Run(argc, argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialCellLocatorRectilinearGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h>
int UnitTestSerialCellLocatorRectilinearGrid(int, char* [])
int UnitTestSerialCellLocatorRectilinearGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>());
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialCellLocatorTwoLevelUniformGrid.cxx
View File

@ -26,10 +26,10 @@
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
int UnitTestSerialCellLocatorTwoLevelUniformGrid(int, char* [])
int UnitTestSerialCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagSerial>);
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagSerial>, argc, argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialCellLocatorUniformGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorUniformGrid.h>
int UnitTestSerialCellLocatorUniformGrid(int, char* [])
int UnitTestSerialCellLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
}

5
vtkm/cont/serial/testing/UnitTestSerialColorTable.cxx
View File

@ -27,8 +27,9 @@
#include <vtkm/cont/testing/TestingColorTable.h>
int UnitTestSerialColorTable(int, char* [])
int UnitTestSerialColorTable(int argc, char* argv[])
{
//TestingColorTable forces the device
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagSerial>::Run();
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
argv);
}

5
vtkm/cont/serial/testing/UnitTestSerialComputeRange.cxx
View File

@ -27,8 +27,9 @@
#include <vtkm/cont/testing/TestingComputeRange.h>
int UnitTestSerialComputeRange(int, char* [])
int UnitTestSerialComputeRange(int argc, char* argv[])
{
//TestingComputeRange forces the device
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagSerial>::Run();
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
argv);
}

5
vtkm/cont/serial/testing/UnitTestSerialDataSetExplicit.cxx
View File

@ -26,9 +26,10 @@
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/cont/testing/TestingDataSetExplicit.h>
int UnitTestSerialDataSetExplicit(int, char* [])
int UnitTestSerialDataSetExplicit(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagSerial>::Run();
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
argv);
}

5
vtkm/cont/serial/testing/UnitTestSerialDataSetSingleType.cxx
View File

@ -26,9 +26,10 @@
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/cont/testing/TestingDataSetSingleType.h>
int UnitTestSerialDataSetSingleType(int, char* [])
int UnitTestSerialDataSetSingleType(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagSerial>::Run();
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagSerial>::Run(
argc, argv);
}

5
vtkm/cont/serial/testing/UnitTestSerialDeviceAdapter.cxx
View File

@ -27,9 +27,10 @@
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/cont/testing/TestingDeviceAdapter.h>
int UnitTestSerialDeviceAdapter(int, char* [])
int UnitTestSerialDeviceAdapter(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagSerial>::Run();
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialGeometry.cxx
View File

@ -29,10 +29,10 @@
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/testing/TestingGeometry.h>
int UnitTestSerialGeometry(int, char* [])
int UnitTestSerialGeometry(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagSerial>);
UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagSerial>, argc, argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialImplicitFunction.cxx
View File

@ -36,9 +36,9 @@ void TestImplicitFunctions()
} // anonymous namespace
int UnitTestSerialImplicitFunction(int, char* [])
int UnitTestSerialImplicitFunction(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialPointLocatorUniformGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
int UnitTestSerialPointLocatorUniformGrid(int, char* [])
int UnitTestSerialPointLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
}

4
vtkm/cont/serial/testing/UnitTestSerialVirtualObjectHandle.cxx
View File

@ -37,9 +37,9 @@ void TestVirtualObjectHandle()
} // anonymous namespace
int UnitTestSerialVirtualObjectHandle(int, char* [])
int UnitTestSerialVirtualObjectHandle(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle);
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle, argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBArrayHandle.cxx
View File

@ -26,9 +26,9 @@
#include <vtkm/cont/tbb/DeviceAdapterTBB.h>
#include <vtkm/cont/testing/TestingArrayHandles.h>
int UnitTestTBBArrayHandle(int, char* [])
int UnitTestTBBArrayHandle(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run();
return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
}

5
vtkm/cont/tbb/testing/UnitTestTBBArrayHandleFancy.cxx
View File

@ -26,9 +26,10 @@
#include <vtkm/cont/tbb/DeviceAdapterTBB.h>
#include <vtkm/cont/testing/TestingFancyArrayHandles.h>
int UnitTestTBBArrayHandleFancy(int, char* [])
int UnitTestTBBArrayHandleFancy(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run();
return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBArrayHandleVirtualCoordinates.cxx
View File

@ -26,10 +26,10 @@
#include <vtkm/cont/tbb/DeviceAdapterTBB.h>
#include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
int UnitTestTBBArrayHandleVirtualCoordinates(int, char* [])
int UnitTestTBBArrayHandleVirtualCoordinates(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
vtkm::cont::DeviceAdapterTagTBB>::Run();
vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBCellLocatorRectilinearGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h>
int UnitTestTBBCellLocatorRectilinearGrid(int, char* [])
int UnitTestTBBCellLocatorRectilinearGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagTBB>());
TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagTBB>(), argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBCellLocatorTwoLevelUniformGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
int UnitTestTBBCellLocatorTwoLevelUniformGrid(int, char* [])
int UnitTestTBBCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagTBB>);
TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagTBB>, argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBCellLocatorUniformGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingCellLocatorUniformGrid.h>
int UnitTestTBBCellLocatorUniformGrid(int, char* [])
int UnitTestTBBCellLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::Testing::Run(
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagTBB>());
TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagTBB>(), argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBColorTable.cxx
View File

@ -27,9 +27,9 @@
#include <vtkm/cont/testing/TestingColorTable.h>
int UnitTestTBBColorTable(int, char* [])
int UnitTestTBBColorTable(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagTBB>::Run();
return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBComputeRange.cxx
View File

@ -27,9 +27,9 @@
#include <vtkm/cont/testing/TestingComputeRange.h>
int UnitTestTBBComputeRange(int, char* [])
int UnitTestTBBComputeRange(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagTBB>::Run();
return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
}

5
vtkm/cont/tbb/testing/UnitTestTBBDataSetExplicit.cxx
View File

@ -27,9 +27,10 @@
#include <vtkm/cont/testing/TestingDataSetExplicit.h>
int UnitTestTBBDataSetExplicit(int, char* [])
int UnitTestTBBDataSetExplicit(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagTBB>::Run();
return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
argv);
}

5
vtkm/cont/tbb/testing/UnitTestTBBDataSetSingleType.cxx
View File

@ -27,9 +27,10 @@
#include <vtkm/cont/testing/TestingDataSetSingleType.h>
int UnitTestTBBDataSetSingleType(int, char* [])
int UnitTestTBBDataSetSingleType(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagTBB>::Run();
return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
argv);
}

5
vtkm/cont/tbb/testing/UnitTestTBBDeviceAdapter.cxx
View File

@ -27,9 +27,10 @@
#include <vtkm/cont/tbb/DeviceAdapterTBB.h>
#include <vtkm/cont/testing/TestingDeviceAdapter.h>
int UnitTestTBBDeviceAdapter(int, char* [])
int UnitTestTBBDeviceAdapter(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagTBB>::Run();
return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBImplicitFunction.cxx
View File

@ -36,9 +36,9 @@ void TestImplicitFunctions()
} // anonymous namespace
int UnitTestTBBImplicitFunction(int, char* [])
int UnitTestTBBImplicitFunction(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBPointLocatorUniformGrid.cxx
View File

@ -25,10 +25,10 @@
#include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
int UnitTestTBBPointLocatorUniformGrid(int, char* [])
int UnitTestTBBPointLocatorUniformGrid(int argc, char* argv[])
{
auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
return vtkm::cont::testing::Testing::Run(
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagTBB>());
TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagTBB>(), argc, argv);
}

4
vtkm/cont/tbb/testing/UnitTestTBBVirtualObjectHandle.cxx
View File

@ -46,7 +46,7 @@ void TestVirtualObjectHandle()
} // anonymous namespace
int UnitTestTBBVirtualObjectHandle(int, char* [])
int UnitTestTBBVirtualObjectHandle(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle);
return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle, argc, argv);
}

2
vtkm/cont/testing/Testing.h
View File

@ -51,7 +51,7 @@ struct Testing
public:
template <class Func>
static VTKM_CONT int Run(Func function, int argc = 0, char* argv[] = nullptr)
static VTKM_CONT int Run(Func function, int argc, char* argv[])
{
vtkm::cont::Initialize(argc, argv);

4
vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h
View File

@ -141,10 +141,10 @@ private:
}
public:
static int Run()
static int Run(int argc, char* argv[])
{
vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
return vtkm::cont::testing::Testing::Run(TestAll);
return vtkm::cont::testing::Testing::Run(TestAll, argc, argv);
}
};
}

4
vtkm/cont/testing/TestingArrayHandles.h
View File

@ -456,10 +456,10 @@ private:
};
public:
static VTKM_CONT int Run()
static VTKM_CONT int Run(int argc, char* argv[])
{
vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
return vtkm::cont::testing::Testing::Run(TryArrayHandleType());
return vtkm::cont::testing::Testing::Run(TryArrayHandleType(), argc, argv);
}
};
}

4
vtkm/cont/testing/TestingColorTable.h
View File

@ -589,12 +589,12 @@ public:
}
};
static int Run()
static int Run(int argc, char* argv[])
{
//We need to verify the color table runs on this specific device
//so we need to force our single device
vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
return vtkm::cont::testing::Testing::Run(TestAll());
return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
}
};
}

4
vtkm/cont/testing/TestingComputeRange.h
View File

@ -157,10 +157,10 @@ private:
};
public:
static VTKM_CONT int Run()
static VTKM_CONT int Run(int argc, char* argv[])
{
vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
return vtkm::cont::testing::Testing::Run(TestAll());
return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
}
};
}

5
vtkm/cont/testing/TestingDataSetExplicit.h
View File

@ -165,7 +165,10 @@ private:
};
public:
static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); }
static VTKM_CONT int Run(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
}
};
}
}

5
vtkm/cont/testing/TestingDataSetSingleType.h
View File

@ -157,7 +157,10 @@ private:
};
public:
static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); }
static VTKM_CONT int Run(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
}
};
}
}

5
vtkm/cont/testing/TestingDeviceAdapter.h
View File

@ -2457,7 +2457,10 @@ public:
/// all members and classes required for driving vtkm algorithms. Returns an
/// error code that can be returned from the main function of a test.
///
static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); }
static VTKM_CONT int Run(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
}
};
#undef ERROR_MESSAGE

4
vtkm/cont/testing/TestingFancyArrayHandles.h
View File

@ -1375,10 +1375,10 @@ public:
/// all the fancy array handles that vtkm supports. Returns an
/// error code that can be returned from the main function of a test.
///
static VTKM_CONT int Run()
static VTKM_CONT int Run(int argc, char* argv[])
{
vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
return vtkm::cont::testing::Testing::Run(TestAll());
return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
}
};
}

4
vtkm/cont/testing/UnitTestAlgorithm.cxx
View File

@ -191,7 +191,7 @@ void TestAll()
} // anonymous namespace
int UnitTestAlgorithm(int, char* [])
int UnitTestAlgorithm(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestAll);
return vtkm::cont::testing::Testing::Run(TestAll, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayCopy.cxx
View File

@ -63,7 +63,7 @@ void TestArrayCopy()
} // anonymous namespace
int UnitTestArrayCopy(int, char* [])
int UnitTestArrayCopy(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayCopy);
return vtkm::cont::testing::Testing::Run(TestArrayCopy, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleCartesianProduct.cxx
View File

@ -113,8 +113,8 @@ void TestArrayHandleCartesianProduct()
} // namespace ArrayHandleCartesianProductNamespace
int UnitTestArrayHandleCartesianProduct(int, char* [])
int UnitTestArrayHandleCartesianProduct(int argc, char* argv[])
{
using namespace ArrayHandleCartesianProductNamespace;
return vtkm::cont::testing::Testing::Run(TestArrayHandleCartesianProduct);
return vtkm::cont::testing::Testing::Run(TestArrayHandleCartesianProduct, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx
View File

@ -302,7 +302,7 @@ void TestCompositeVector()
} // anonymous namespace
int UnitTestArrayHandleCompositeVector(int, char* [])
int UnitTestArrayHandleCompositeVector(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestCompositeVector);
return vtkm::cont::testing::Testing::Run(TestCompositeVector, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleConcatenate.cxx
View File

@ -75,9 +75,9 @@ void TestConcatenateEmptyArray()
} // namespace UnitTestArrayHandleIndexNamespace
int UnitTestArrayHandleConcatenate(int, char* [])
int UnitTestArrayHandleConcatenate(int argc, char* argv[])
{
using namespace UnitTestArrayHandleConcatenateNamespace;
//TestConcatenateEmptyArray();
return vtkm::cont::testing::Testing::Run(TestArrayHandleConcatenate);
return vtkm::cont::testing::Testing::Run(TestArrayHandleConcatenate, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleCounting.cxx
View File

@ -143,8 +143,8 @@ void TestArrayHandleCounting()
} // namespace UnitTestArrayHandleCountingNamespace
int UnitTestArrayHandleCounting(int, char* [])
int UnitTestArrayHandleCounting(int argc, char* argv[])
{
using namespace UnitTestArrayHandleCountingNamespace;
return vtkm::cont::testing::Testing::Run(TestArrayHandleCounting);
return vtkm::cont::testing::Testing::Run(TestArrayHandleCounting, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleDiscard.cxx
View File

@ -135,8 +135,8 @@ void TestArrayHandleDiscard()
} // end namespace UnitTestArrayHandleDiscardDetail
int UnitTestArrayHandleDiscard(int, char* [])
int UnitTestArrayHandleDiscard(int argc, char* argv[])
{
using namespace UnitTestArrayHandleDiscardDetail;
return vtkm::cont::testing::Testing::Run(TestArrayHandleDiscard);
return vtkm::cont::testing::Testing::Run(TestArrayHandleDiscard, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleExtractComponent.cxx
View File

@ -236,7 +236,7 @@ void TestArrayHandleExtractComponent()
} // end anon namespace
int UnitTestArrayHandleExtractComponent(int, char* [])
int UnitTestArrayHandleExtractComponent(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayHandleExtractComponent);
return vtkm::cont::testing::Testing::Run(TestArrayHandleExtractComponent, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleImplicit.cxx
View File

@ -84,7 +84,7 @@ void TestArrayHandleImplicit()
} // anonymous namespace
int UnitTestArrayHandleImplicit(int, char* [])
int UnitTestArrayHandleImplicit(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayHandleImplicit);
return vtkm::cont::testing::Testing::Run(TestArrayHandleImplicit, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleIndex.cxx
View File

@ -41,8 +41,8 @@ void TestArrayHandleIndex()
} // namespace UnitTestArrayHandleIndexNamespace
int UnitTestArrayHandleIndex(int, char* [])
int UnitTestArrayHandleIndex(int argc, char* argv[])
{
using namespace UnitTestArrayHandleIndexNamespace;
return vtkm::cont::testing::Testing::Run(TestArrayHandleIndex);
return vtkm::cont::testing::Testing::Run(TestArrayHandleIndex, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandlePermutation.cxx
View File

@ -260,7 +260,7 @@ void TestArrayHandlePermutation()
} // anonymous namespace
int UnitTestArrayHandlePermutation(int, char* [])
int UnitTestArrayHandlePermutation(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayHandlePermutation);
return vtkm::cont::testing::Testing::Run(TestArrayHandlePermutation, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleReverse.cxx
View File

@ -106,8 +106,8 @@ void TestArrayHandleReverse()
}; // namespace UnitTestArrayHandleReverseNamespace
int UnitTestArrayHandleReverse(int, char* [])
int UnitTestArrayHandleReverse(int argc, char* argv[])
{
using namespace UnitTestArrayHandleReverseNamespace;
return vtkm::cont::testing::Testing::Run(TestArrayHandleReverse);
return vtkm::cont::testing::Testing::Run(TestArrayHandleReverse, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleSwizzle.cxx
View File

@ -361,7 +361,7 @@ void TestComponentMapValidator()
} // end anon namespace
int UnitTestArrayHandleSwizzle(int, char* [])
int UnitTestArrayHandleSwizzle(int argc, char* argv[])
{
try
{
@ -373,5 +373,5 @@ int UnitTestArrayHandleSwizzle(int, char* [])
return EXIT_FAILURE;
}
return vtkm::cont::testing::Testing::Run(TestArrayHandleSwizzle);
return vtkm::cont::testing::Testing::Run(TestArrayHandleSwizzle, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleTransform.cxx
View File

@ -188,7 +188,7 @@ void TestArrayHandleTransform()
} // anonymous namespace
int UnitTestArrayHandleTransform(int, char* [])
int UnitTestArrayHandleTransform(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayHandleTransform);
return vtkm::cont::testing::Testing::Run(TestArrayHandleTransform, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleUniformPointCoordinates.cxx
View File

@ -76,7 +76,7 @@ void TestArrayHandleUniformPointCoordinates()
} // anonymous namespace
int UnitTestArrayHandleUniformPointCoordinates(int, char* [])
int UnitTestArrayHandleUniformPointCoordinates(int argc, char* argv[])
{
return vtkm::cont::testing::Testing::Run(TestArrayHandleUniformPointCoordinates);
return vtkm::cont::testing::Testing::Run(TestArrayHandleUniformPointCoordinates, argc, argv);
}

4
vtkm/cont/testing/UnitTestArrayHandleVirtual.cxx
View File

@ -242,8 +242,8 @@ void TestArrayHandleVirtual()
} // end namespace UnitTestArrayHandleVirtualDetail
int UnitTestArrayHandleVirtual(int, char* [])
int UnitTestArrayHandleVirtual(int argc, char* argv[])
{
using namespace UnitTestArrayHandleVirtualDetail;
return vtkm::cont::testing::Testing::Run(TestArrayHandleVirtual);
return vtkm::cont::testing::Testing::Run(TestArrayHandleVirtual, argc, argv);
}

Some files were not shown because too many files have changed in this diff Show More