Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'msvc-problems'

Browse Source
This commit is contained in:
Kenneth Moreland 2015-05-18 07:39:17 -06:00
commit f514a9c72a
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -887,14 +887,15 @@ private:
std::cout << "-------------------------------------------------" << std::endl; std::cout << "-------------------------------------------------" << std::endl;
std::cout << "Sort by keys" << std::endl; std::cout << "Sort by keys" << std::endl;
vtkm::Id testKeys[ARRAY_SIZE]; typedef vtkm::Vec<FloatDefault,3> Vec3;
vtkm::Vec<FloatDefault,3> testValues[ARRAY_SIZE];
vtkm::Id testKeys[ARRAY_SIZE];
Vec3 testValues[ARRAY_SIZE];
vtkm::Vec<FloatDefault,3> grad(1.0,1.0,1.0);
for(vtkm::Id i=0; i < ARRAY_SIZE; ++i) for(vtkm::Id i=0; i < ARRAY_SIZE; ++i)
{ {
testKeys[i] = ARRAY_SIZE - i; testKeys[i] = ARRAY_SIZE - i;
testValues[i] = vtkm::Vec<FloatDefault,3>(i); testValues[i] = TestValue(i, Vec3());
} }
IdArrayHandle keys = MakeArrayHandle(testKeys, ARRAY_SIZE); IdArrayHandle keys = MakeArrayHandle(testKeys, ARRAY_SIZE);
@ -911,12 +912,11 @@ private:
{ {
//keys should be sorted from 1 to ARRAY_SIZE //keys should be sorted from 1 to ARRAY_SIZE
//values should be sorted from (ARRAY_SIZE-1) to 0 //values should be sorted from (ARRAY_SIZE-1) to 0
vtkm::FloatDefault sorted_value = Vec3 sorted_value = sorted_values.GetPortalConstControl().Get(i);
sorted_values.GetPortalConstControl().Get(i)[0];
vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i); vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT( (sorted_key == (i+1)) , "Got bad SortByKeys key"); VTKM_TEST_ASSERT( (sorted_key == (i+1)) , "Got bad SortByKeys key");
VTKM_TEST_ASSERT( (sorted_value == (ARRAY_SIZE-1-i)), VTKM_TEST_ASSERT( test_equal(sorted_value, TestValue(ARRAY_SIZE-1-i, Vec3())),
"Got bad SortByKeys value"); "Got bad SortByKeys value");
} }
@ -926,29 +926,27 @@ private:
{ {
//keys should be sorted from ARRAY_SIZE to 1 //keys should be sorted from ARRAY_SIZE to 1
//values should be sorted from 0 to (ARRAY_SIZE-1) //values should be sorted from 0 to (ARRAY_SIZE-1)
vtkm::FloatDefault sorted_value = Vec3 sorted_value = sorted_values.GetPortalConstControl().Get(i);
sorted_values.GetPortalConstControl().Get(i)[0];
vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i); vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT( (sorted_key == (ARRAY_SIZE-i)), VTKM_TEST_ASSERT( (sorted_key == (ARRAY_SIZE-i)),
"Got bad SortByKeys key"); "Got bad SortByKeys key");
VTKM_TEST_ASSERT( (sorted_value == i), VTKM_TEST_ASSERT( test_equal(sorted_value, TestValue(i, Vec3())),
"Got bad SortByKeys value"); "Got bad SortByKeys value");
} }
//this is here to verify we can sort by vtkm::Tuples //this is here to verify we can sort by vtkm::Vec
Algorithm::SortByKey(sorted_values,sorted_keys); Algorithm::SortByKey(sorted_values,sorted_keys);
for(vtkm::Id i=0; i < ARRAY_SIZE; ++i) for(vtkm::Id i=0; i < ARRAY_SIZE; ++i)
{ {
//keys should be sorted from ARRAY_SIZE to 1 //keys should be sorted from ARRAY_SIZE to 1
//values should be sorted from 0 to (ARRAY_SIZE-1) //values should be sorted from 0 to (ARRAY_SIZE-1)
vtkm::FloatDefault sorted_value = Vec3 sorted_value = sorted_values.GetPortalConstControl().Get(i);
sorted_values.GetPortalConstControl().Get(i)[0];
vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i); vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT( (sorted_key == (ARRAY_SIZE-i)), VTKM_TEST_ASSERT( (sorted_key == (ARRAY_SIZE-i)),
"Got bad SortByKeys key"); "Got bad SortByKeys key");
VTKM_TEST_ASSERT( (sorted_value == i), VTKM_TEST_ASSERT( test_equal(sorted_value, TestValue(i, Vec3())),
"Got bad SortByKeys value"); "Got bad SortByKeys value");
} }
} }

4
vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx
View File

@ -282,12 +282,14 @@ void TestInvokeWithBadType()
vtkm::Id array[ARRAY_SIZE]; vtkm::Id array[ARRAY_SIZE];
TestExecObjectType execObject; TestExecObjectType execObject;
execObject.Value = EXPECTED_EXEC_OBJECT_VALUE;
TestDispatcher<TestWorklet> dispatcher; TestDispatcher<TestWorklet> dispatcher;
try try
{ {
std::cout << " First argument bad." << std::endl; std::cout << " First argument bad." << std::endl;
dispatcher.Invoke(NULL, execObject, array); dispatcher.Invoke(NULL, execObject, array);
VTKM_TEST_FAIL("Dispatcher did not throw expected error.");
} }
catch (vtkm::cont::ErrorControlBadType error) catch (vtkm::cont::ErrorControlBadType error)
{ {
@ -301,6 +303,7 @@ void TestInvokeWithBadType()
{ {
std::cout << " Second argument bad." << std::endl; std::cout << " Second argument bad." << std::endl;
dispatcher.Invoke(array, NULL, array); dispatcher.Invoke(array, NULL, array);
VTKM_TEST_FAIL("Dispatcher did not throw expected error.");
} }
catch (vtkm::cont::ErrorControlBadType error) catch (vtkm::cont::ErrorControlBadType error)
{ {
@ -314,6 +317,7 @@ void TestInvokeWithBadType()
{ {
std::cout << " Third argument bad." << std::endl; std::cout << " Third argument bad." << std::endl;
dispatcher.Invoke(array, execObject, NULL); dispatcher.Invoke(array, execObject, NULL);
VTKM_TEST_FAIL("Dispatcher did not throw expected error.");
} }
catch (vtkm::cont::ErrorControlBadType error) catch (vtkm::cont::ErrorControlBadType error)
{ {