From 1dabda4216ec6de74693058f7d59be595436b42d Mon Sep 17 00:00:00 2001
From: Thomas Otahal <tjotaha@sandia.gov>
Date: Tue, 20 Feb 2018 08:28:29 -0700
Subject: [PATCH] Bug fix for max threads in radix sort

Use PlainType to get max threads instead of
ValueType for key-value radix sorts.
---
 vtkm/cont/tbb/internal/ParallelSortTBB.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vtkm/cont/tbb/internal/ParallelSortTBB.cxx b/vtkm/cont/tbb/internal/ParallelSortTBB.cxx
index 980920627..2583dde67 100644
--- a/vtkm/cont/tbb/internal/ParallelSortTBB.cxx
+++ b/vtkm/cont/tbb/internal/ParallelSortTBB.cxx
@@ -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;