Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit f514a9c7 authored by Kenneth Moreland's avatar Kenneth Moreland

Merge branch 'msvc-problems'

parents 84ea9b84 0011e9d8
......@@ -887,14 +887,15 @@ private:
std::cout << "-------------------------------------------------" << std::endl;
std::cout << "Sort by keys" << std::endl;
typedef vtkm::Vec<FloatDefault,3> Vec3;
vtkm::Id testKeys[ARRAY_SIZE];
vtkm::Vec<FloatDefault,3> testValues[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)
{
testKeys[i] = ARRAY_SIZE - i;
testValues[i] = vtkm::Vec<FloatDefault,3>(i);
testValues[i] = TestValue(i, Vec3());
}
IdArrayHandle keys = MakeArrayHandle(testKeys, ARRAY_SIZE);
......@@ -911,12 +912,11 @@ private:
{
//keys should be sorted from 1 to ARRAY_SIZE
//values should be sorted from (ARRAY_SIZE-1) to 0
vtkm::FloatDefault sorted_value =
sorted_values.GetPortalConstControl().Get(i)[0];
Vec3 sorted_value = sorted_values.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_value == (ARRAY_SIZE-1-i)),
VTKM_TEST_ASSERT( test_equal(sorted_value, TestValue(ARRAY_SIZE-1-i, Vec3())),
"Got bad SortByKeys value");
}
......@@ -926,29 +926,27 @@ private:
{
//keys should be sorted from ARRAY_SIZE to 1
//values should be sorted from 0 to (ARRAY_SIZE-1)
vtkm::FloatDefault sorted_value =
sorted_values.GetPortalConstControl().Get(i)[0];
Vec3 sorted_value = sorted_values.GetPortalConstControl().Get(i);
vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT( (sorted_key == (ARRAY_SIZE-i)),
"Got bad SortByKeys key");
VTKM_TEST_ASSERT( (sorted_value == i),
VTKM_TEST_ASSERT( test_equal(sorted_value, TestValue(i, Vec3())),
"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);
for(vtkm::Id i=0; i < ARRAY_SIZE; ++i)
{
//keys should be sorted from ARRAY_SIZE to 1
//values should be sorted from 0 to (ARRAY_SIZE-1)
vtkm::FloatDefault sorted_value =
sorted_values.GetPortalConstControl().Get(i)[0];
Vec3 sorted_value = sorted_values.GetPortalConstControl().Get(i);
vtkm::Id sorted_key = sorted_keys.GetPortalConstControl().Get(i);
VTKM_TEST_ASSERT( (sorted_key == (ARRAY_SIZE-i)),
"Got bad SortByKeys key");
VTKM_TEST_ASSERT( (sorted_value == i),
VTKM_TEST_ASSERT( test_equal(sorted_value, TestValue(i, Vec3())),
"Got bad SortByKeys value");
}
}
......
......@@ -282,12 +282,14 @@ void TestInvokeWithBadType()
vtkm::Id array[ARRAY_SIZE];
TestExecObjectType execObject;
execObject.Value = EXPECTED_EXEC_OBJECT_VALUE;
TestDispatcher<TestWorklet> dispatcher;
try
{
std::cout << " First argument bad." << std::endl;
dispatcher.Invoke(NULL, execObject, array);
VTKM_TEST_FAIL("Dispatcher did not throw expected error.");
}
catch (vtkm::cont::ErrorControlBadType error)
{
......@@ -301,6 +303,7 @@ void TestInvokeWithBadType()
{
std::cout << " Second argument bad." << std::endl;
dispatcher.Invoke(array, NULL, array);
VTKM_TEST_FAIL("Dispatcher did not throw expected error.");
}
catch (vtkm::cont::ErrorControlBadType error)
{
......@@ -314,6 +317,7 @@ void TestInvokeWithBadType()
{
std::cout << " Third argument bad." << std::endl;
dispatcher.Invoke(array, execObject, NULL);
VTKM_TEST_FAIL("Dispatcher did not throw expected error.");
}
catch (vtkm::cont::ErrorControlBadType error)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment