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

Fix multiple issue in the cuda array handle unit tests.

Browse Source 
The namespaces need to be different for each test, or else only the first
implementation of the function will be used for all tests that call that
function.

Also updated the test to verify that we can count starting from a non zero
number.
This commit is contained in:
Robert Maynard 2015-01-19 16:12:33 -05:00
parent f8bb4214ad
commit 04bc41cad3
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
namespace ut_implicit{
namespace ut_handle_explicit{
const vtkm::Id ARRAY_SIZE = 300;
@ -61,15 +61,15 @@ struct CountingTest
vtkm::cont::ArrayHandle< ValueType > input =
vtkm::cont::make_ArrayHandle( inputVector );
vtkm::cont::ArrayHandle< ValueType > result;
vtkm::worklet::DispatcherMapField< ut_implicit::PassThrough > dispatcher;
vtkm::worklet::DispatcherMapField< ut_handle_explicit::PassThrough > dispatcher;
dispatcher.Invoke(input, result);
//verify that the control portal works
for(int i=0; i < ARRAY_SIZE; ++i)
for(int i=v; i < ARRAY_SIZE; ++i)
{
const ValueType v = result.GetPortalConstControl().Get(i);
const ValueType correct_value = ValueType(i);
VTKM_TEST_ASSERT(v == correct_value, "Counting Handle Failed");
const ValueType result_v = result.GetPortalConstControl().Get(i);
const ValueType correct_value = v + ValueType(i);
VTKM_TEST_ASSERT(result_v == correct_value, "Counting Handle Failed");
}
}
@ -85,17 +85,17 @@ void RunCountingTest(const T t)
void TestArrayHandle()
{
RunCountingTest( vtkm::Id(0) );
RunCountingTest( vtkm::Float32(0) );
RunCountingTest( vtkm::Id(42) );
RunCountingTest( vtkm::Float32(3) );
// RunCountingTest( vtkm::Vec< vtkm::Float32, 3>() );
}
} // ut_implicit namespace
} // ut_handle_explicit namespace
int UnitTestCudaArrayHandle(int, char *[])
{
return vtkm::cont::cuda::internal::Testing::Run(
ut_implicit::TestArrayHandle);
ut_handle_explicit::TestArrayHandle);
}

21
vtkm/cont/cuda/testing/UnitTestCudaArrayHandleCounting.cu
View File

@ -31,7 +31,7 @@
#include <vtkm/cont/cuda/internal/testing/Testing.h>
namespace ut_implicit{
namespace ut_handle_counting{
const vtkm::Id ARRAY_SIZE = 300;
@ -60,15 +60,16 @@ struct CountingTest
vtkm::cont::ArrayHandleCounting< ValueType > implicit =
vtkm::cont::make_ArrayHandleCounting(start, end);
vtkm::cont::ArrayHandle< ValueType > result;
vtkm::worklet::DispatcherMapField< ut_implicit::PassThrough > dispatcher;
vtkm::worklet::DispatcherMapField< ut_handle_counting::PassThrough > dispatcher;
dispatcher.Invoke(implicit, result);
//verify that the control portal works
for(int i=0; i < ARRAY_SIZE; ++i)
for(int i=v; i < ARRAY_SIZE; ++i)
{
const ValueType v = result.GetPortalConstControl().Get(i);
const ValueType correct_value = ValueType(i);
VTKM_TEST_ASSERT(v == correct_value, "Counting Handle Failed");
const ValueType result_v = result.GetPortalConstControl().Get(i);
const ValueType correct_value = v + ValueType(i);
VTKM_TEST_ASSERT(result_v == correct_value, "Counting Handle Failed");
}
}
@ -84,17 +85,17 @@ void RunCountingTest(const T t)
void TestArrayHandleCounting()
{
RunCountingTest( vtkm::Id(0) );
RunCountingTest( vtkm::Float32(0) );
RunCountingTest( vtkm::Id(42) );
RunCountingTest( vtkm::Float32(3) );
// RunCountingTest( vtkm::Vec< vtkm::Float32, 3>() );
}
} // ut_implicit namespace
} // ut_handle_counting namespace
int UnitTestCudaArrayHandleCounting(int, char *[])
{
return vtkm::cont::cuda::internal::Testing::Run(
ut_implicit::TestArrayHandleCounting);
ut_handle_counting::TestArrayHandleCounting);
}