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

remove if 0 blocks in averageByKey

Browse Source
This commit is contained in:
Jimmy 2015-06-25 10:38:34 -04:00
parent a5a4fb36ad
commit 314c1b9da2
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtkm/worklet/AverageByKey.h
View File

@ -81,29 +81,17 @@ void AverageByKey( const vtkm::cont::ArrayHandle<KeyType> &keyArray,
typedef vtkm::cont::ArrayHandlePermutation<IdArray, ValueArray > PermutatedValueArray;
PermutatedValueArray valueArraySorted = vtkm::cont::make_ArrayHandlePermutation( indexArraySorted, valueArray );
// reduce by key
// reduce both sumArray and countArray by key
typedef vtkm::cont::ArrayHandleConstant<vtkm::Id> ConstIdArray;
ConstIdArray constOneArray(1, valueArray.GetNumberOfValues());
IdArray countArray;
ValueArray sumArray;
#if 0 // reduce twice
vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>::ReduceByKey(
keyArraySorted, valueArraySorted,
outputKeyArray, sumArray,
vtkm::internal::Add() );
vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>::ReduceByKey(
keyArraySorted, constOneArray,
outputKeyArray, countArray,
vtkm::internal::Add() );
#else // use zip
vtkm::cont::ArrayHandleZip< PermutatedValueArray, ConstIdArray > inputZipHandle(valueArraySorted, constOneArray);
vtkm::cont::ArrayHandleZip< ValueArray, IdArray > outputZipHandle(sumArray, countArray);
Algorithm::ReduceByKey( keyArraySorted, inputZipHandle,
outputKeyArray, outputZipHandle,
vtkm::internal::Add() );
#endif
// get average
DispatcherMapField<DivideWorklet<ValueType> >().Invoke(