Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'correct_tbb_sort_by_key'

Browse Source 
c7756c78 TBB SortByKey works now when the key is a ArrayHandleZip.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !301
This commit is contained in:
Robert Maynard 2016-01-05 10:40:33 -05:00 committed by Kitware Robot
commit a6088807c0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
View File

@ -229,7 +229,7 @@ public:
/// Move value indexes when sorting and reorder the value array at last
typedef vtkm::cont::ArrayHandle<U,StorageU> ValueType;
typedef vtkm::cont::ArrayHandle<vtkm::Id,StorageU> IndexType;
typedef vtkm::cont::ArrayHandle<vtkm::Id> IndexType;
typedef vtkm::cont::ArrayHandleZip<KeyType,IndexType> ZipHandleType;
IndexType indexArray;