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

Merge topic 'cpu_parallel_radix_sort_thread_fix'

Browse Source 
1dabda42 Bug fix for max threads in radix sort

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1087
This commit is contained in:
Robert Maynard 2018-02-21 18:04:25 +00:00 committed by Kitware Robot
commit 85058b3e25
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtkm/cont/tbb/internal/ParallelSortTBB.cxx
View File

@ -640,7 +640,7 @@ public:
void Next() {}
};
template <typename ValueType, int Base>
template <typename PlainType, typename ValueType, int Base>
class PairValueManager
{
public:
@ -694,13 +694,13 @@ private:
void DeleteAll();
};
template <typename ValueType, int Base>
void PairValueManager<ValueType, Base>::Init(size_t max_elems)
template <typename PlainType, typename ValueType, int Base>
void PairValueManager<PlainType, ValueType, Base>::Init(size_t max_elems)
{
DeleteAll();
max_elems_ = max_elems;
max_threads_ = utility::GetMaxThreads(max_elems_ * sizeof(ValueType));
max_threads_ = utility::GetMaxThreads(max_elems_ * sizeof(PlainType));
tmp_ = new ValueType[max_elems];
@ -715,8 +715,8 @@ void PairValueManager<ValueType, Base>::Init(size_t max_elems)
}
}
template <typename ValueType, int Base>
void PairValueManager<ValueType, Base>::DeleteAll()
template <typename PlainType, typename ValueType, int Base>
void PairValueManager<PlainType, ValueType, Base>::DeleteAll()
{
delete[] tmp_;
tmp_ = NULL;
@ -772,7 +772,7 @@ template <typename PlainType,
int Base = 8>
class PairSort
{
typedef value_manager::PairValueManager<ValueType, Base> ValueManager;
typedef value_manager::PairValueManager<PlainType, ValueType, Base> ValueManager;
typedef internal::
ParallelRadixSortInternal<PlainType, CompareType, UnsignedType, Encoder, ValueManager, Base>
Internal;