Kokkos: fix Sort bug with empty bins

See #2471 and kokkos/kokkos#1503 Out-of-bounds access when sorting an empty bin.
trilinos · Mar 29, 2018 · 2305cfe · 2305cfe
1 parent d4aa58e
commit 2305cfe
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/kokkos/algorithms/src/Kokkos_Sort.hpp b/packages/kokkos/algorithms/src/Kokkos_Sort.hpp
@@ -362,8 +362,10 @@ class BinSort {
 
  KOKKOS_INLINE_FUNCTION
  void operator() (const bin_sort_bins_tag& tag, const int&i ) const {
+ auto bin_size = bin_count_const(i);
+ if (bin_size <= 1) return;
+ int upper_bound = bin_offsets(i)+bin_size;
  bool sorted = false;
- int upper_bound = bin_offsets(i)+bin_count_const(i);
  while(!sorted) {
  sorted = true;
  int old_idx = sort_order(bin_offsets(i));