Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix unit tests to handle vtk-m with compuled with double precision.

Browse Source
This commit is contained in:
Gunther H. Weber 2020-10-19 17:43:31 -07:00
parent eb776059ca
commit 4594c1e4c6
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vtkm/filter/testing/TestingContourTreeUniformDistributedFilter.h
View File

@ -61,6 +61,7 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/ContourTreeUniformDistributed.h>
#include <vtkm/filter/MapFieldPermutation.h>
#include <vtkm/io/ErrorIO.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
@ -186,29 +187,24 @@ inline vtkm::cont::DataSet CreateSubDataSet(const vtkm::cont::DataSet& ds,
}
// DEBUG: std::cout << copyIdsPortal.GetNumberOfValues() << std::endl;
vtkm::cont::ArrayHandle<vtkm::Float32> inputArrayHandle;
ds.GetPointField(fieldName).GetData().CopyTo(inputArrayHandle);
auto permutedInArray = make_ArrayHandlePermutation(copyIdsArray, inputArrayHandle);
vtkm::cont::ArrayHandle<vtkm::Float32> outputArrayHandle;
vtkm::cont::ArrayCopy(permutedInArray, outputArrayHandle);
outputArrayHandle.SyncControlArray();
VTKM_ASSERT(outputArrayHandle.GetNumberOfValues() == nOutValues);
// DEBUG: auto rp = outputArrayHandle.ReadPortal();
// DEBUG: for (vtkm::Id i = 0; i < nOutValues; ++i) std::cout << rp.Get(i) << " ";
// DEBUG: std::cout << std::endl;
vtkm::cont::Field permutedField;
bool success =
vtkm::filter::MapFieldPermutation(ds.GetPointField(fieldName), copyIdsArray, permutedField);
if (!success)
throw vtkm::cont::ErrorBadType("Field copy failed (probably due to invalid type)");
vtkm::cont::DataSetBuilderUniform dsb;
if (globalSize[2] <= 1) // 2D Data Set
{
vtkm::Id2 dimensions{ blockSize[0], blockSize[1] };
vtkm::cont::DataSet dataSet = dsb.Create(dimensions);
dataSet.AddPointField(fieldName, outputArrayHandle);
dataSet.AddField(permutedField);
return dataSet;
}
else
{
vtkm::cont::DataSet dataSet = dsb.Create(blockSize);
dataSet.AddPointField(fieldName, outputArrayHandle);
dataSet.AddField(permutedField);
return dataSet;
}
}

3
vtkm/worklet/contourtree_distributed/TreeCompiler.h
View File

@ -225,8 +225,7 @@ inline void TreeCompiler::AddHierarchicalTree(const vtkm::cont::DataSet& addedTr
vtkm::cont::VariantArrayHandle dataValues_array = addedTree.GetField("DataValues").GetData();
std::vector<vtkm::FloatDefault> dataValues(dataValues_array.GetNumberOfValues());
auto dataValues_handle = vtkm::cont::make_ArrayHandle(dataValues, vtkm::CopyFlag::Off);
vtkm::cont::ArrayCopy(dataValues_array.ResetTypes(vtkm::List<vtkm::FloatDefault>{}),
dataValues_handle);
vtkm::cont::ArrayCopy(dataValues_array.ResetTypes(vtkm::TypeListScalarAll{}), dataValues_handle);
dataValues_handle.SyncControlArray();
auto regularNodeGlobalIds_array = addedTree.GetField("RegularNodeGlobalIds").GetData();