Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Make UnitTestArrayHandleCartesianProduct faster

Browse Source 
Reduce the number of conditions UnitTestArrayHandleCartesianProduct
tries so that it is faster. All the conditions are pretty similar, so it
should be OK to reduce some.
This commit is contained in:
Kenneth Moreland 2016-01-14 15:22:33 -07:00
parent 427f3cf57d
commit 0b2823ba55
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,15 +35,15 @@ typedef vtkm::cont::DeviceAdapterAlgorithm<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> DFA;
template <typename T> template <typename T>
void ArrayHandleCPBasic(vtkm::cont::ArrayHandle<T> x, void ArrayHandleCPBasic(vtkm::cont::ArrayHandle<T> x,
vtkm::cont::ArrayHandle<T> y, vtkm::cont::ArrayHandle<T> y,
vtkm::cont::ArrayHandle<T> z) vtkm::cont::ArrayHandle<T> z)
{ {
vtkm::cont::ArrayHandleCartesianProduct< vtkm::cont::ArrayHandleCartesianProduct<
vtkm::cont::ArrayHandle<T>, vtkm::cont::ArrayHandle<T>,
vtkm::cont::ArrayHandle<T>, vtkm::cont::ArrayHandle<T>,
vtkm::cont::ArrayHandle<T> > cpArray; vtkm::cont::ArrayHandle<T> > cpArray;
vtkm::Id nx = x.GetNumberOfValues(); vtkm::Id nx = x.GetNumberOfValues();
vtkm::Id ny = y.GetNumberOfValues(); vtkm::Id ny = y.GetNumberOfValues();
vtkm::Id nz = z.GetNumberOfValues(); vtkm::Id nz = z.GetNumberOfValues();
@ -53,21 +53,21 @@ void ArrayHandleCPBasic(vtkm::cont::ArrayHandle<T> x,
//Make sure we have the right number of values. //Make sure we have the right number of values.
VTKM_TEST_ASSERT(cpArray.GetNumberOfValues() == (nx*ny*nz), VTKM_TEST_ASSERT(cpArray.GetNumberOfValues() == (nx*ny*nz),
"Cartesian array constructor has wrong number of values"); "Cartesian array constructor has wrong number of values");
//Make sure the values are correct. //Make sure the values are correct.
vtkm::Vec<T,3> val; vtkm::Vec<T,3> val;
for (vtkm::Id i = 0; i < n; i++) for (vtkm::Id i = 0; i < n; i++)
{ {
vtkm::Id idx0 = (i % (nx*ny)) % nx; vtkm::Id idx0 = (i % (nx*ny)) % nx;
vtkm::Id idx1 = (i % (nx*ny)) / nx; vtkm::Id idx1 = (i % (nx*ny)) / nx;
vtkm::Id idx2 = i / (nx*ny); vtkm::Id idx2 = i / (nx*ny);
val = vtkm::Vec<T,3>(x.GetPortalConstControl().Get(idx0), val = vtkm::Vec<T,3>(x.GetPortalConstControl().Get(idx0),
y.GetPortalConstControl().Get(idx1), y.GetPortalConstControl().Get(idx1),
z.GetPortalConstControl().Get(idx2)); z.GetPortalConstControl().Get(idx2));
VTKM_TEST_ASSERT(test_equal(cpArray.GetPortalConstControl().Get(i), val), VTKM_TEST_ASSERT(test_equal(cpArray.GetPortalConstControl().Get(i), val),
"Wrong value in array"); "Wrong value in array");
} }
} }
@ -76,28 +76,32 @@ void createArr(std::vector<T> &arr, std::size_t n)
{ {
arr.resize(n); arr.resize(n);
for (std::size_t i = 0; i < n; i++) for (std::size_t i = 0; i < n; i++)
arr[i] = static_cast<T>(i); arr[i] = static_cast<T>(i);
} }
template <typename T> template <typename T>
void void
RunTest() RunTest()
{ {
std::size_t nX = 10, nY = 10, nZ = 10; std::size_t nX = 11, nY = 13, nZ = 11;
for (std::size_t i = 1; i < nX; i++) for (std::size_t i = 1; i < nX; i += 2)
for (std::size_t j = 1; j < nY; j++) {
for (std::size_t k = 1; k < nZ; k++) for (std::size_t j = 1; j < nY; j += 4)
{ {
std::vector<T> X,Y,Z; for (std::size_t k = 1; k < nZ; k += 5)
createArr(X, nX); {
createArr(Y, nY); std::vector<T> X,Y,Z;
createArr(Z, nZ); createArr(X, nX);
createArr(Y, nY);
ArrayHandleCPBasic(vtkm::cont::make_ArrayHandle(X), createArr(Z, nZ);
vtkm::cont::make_ArrayHandle(Y),
vtkm::cont::make_ArrayHandle(Z)); ArrayHandleCPBasic(vtkm::cont::make_ArrayHandle(X),
} vtkm::cont::make_ArrayHandle(Y),
vtkm::cont::make_ArrayHandle(Z));
}
}
}
} }
void void