update stream.value() to just stream for detail fn calls

rapidsai · Nov 30, 2020 · 95f02a7 · 95f02a7
1 parent 05bad28
commit 95f02a7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cpp/src/reductions/nth_element.cu b/cpp/src/reductions/nth_element.cu
@@ -53,9 +53,9 @@ std::unique_ptr<cudf::scalar> cudf::reduction::nth_element(column_view const& co
                                      null_skipped_index.end(),
                                      n);
     auto null_skipped_n = n_pos - null_skipped_index.begin();
-    return cudf::detail::get_element(col, null_skipped_n, stream.value(), mr);
+    return cudf::detail::get_element(col, null_skipped_n, stream, mr);
   } else {
     n = wrap_n(col.size());
-    return cudf::detail::get_element(col, n, stream.value(), mr);
+    return cudf::detail::get_element(col, n, stream, mr);
   }
 }
diff --git a/cpp/src/reductions/reductions.cpp b/cpp/src/reductions/reductions.cpp
@@ -70,7 +70,7 @@ struct reduce_dispatch_functor {
         auto valid_sorted_indices = split(*sorted_indices, {col.size() - col.null_count()})[0];
         auto col_ptr =
           quantile(col, {0.5}, interpolation::LINEAR, valid_sorted_indices, true, stream, mr);
-        return get_element(*col_ptr, 0, stream.value(), mr);
+        return get_element(*col_ptr, 0, stream, mr);
       } break;
       case aggregation::QUANTILE: {
         auto quantile_agg = static_cast<quantile_aggregation const *>(agg.get());
@@ -86,14 +86,14 @@ struct reduce_dispatch_functor {
                                 true,
                                 stream,
                                 mr);
-        return get_element(*col_ptr, 0, stream.value(), mr);
+        return get_element(*col_ptr, 0, stream, mr);
       } break;
       case aggregation::NUNIQUE: {
         auto nunique_agg = static_cast<nunique_aggregation const *>(agg.get());
         return make_fixed_width_scalar(
           detail::distinct_count(
-            col, nunique_agg->_null_handling, nan_policy::NAN_IS_VALID, stream.value()),
-          stream.value(),
+            col, nunique_agg->_null_handling, nan_policy::NAN_IS_VALID, stream),
+          stream,
           mr);
       } break;
       case aggregation::NTH_ELEMENT: {

diff --git a/cpp/src/reductions/simple.cuh b/cpp/src/reductions/simple.cuh
@@ -225,7 +225,7 @@ struct same_element_type_dispatcher {
                                       rmm::mr::device_memory_resource* mr)
   {
     auto index = static_cast<numeric_scalar<IndexType> const&>(keys_index);
-    return cudf::detail::get_element(keys, index.value(stream.value()), stream.value(), mr);
+    return cudf::detail::get_element(keys, index.value(stream), stream, mr);
   }
 
   template <typename IndexType,

diff --git a/cpp/tests/reductions/reduction_tests.cpp b/cpp/tests/reductions/reduction_tests.cpp
@@ -1330,7 +1330,7 @@ TYPED_TEST(DictionaryReductionTest, SumOfSquare)
   };
 
   // test without nulls
-  cudf::test::fixed_width_column_wrapper<T> col(v.begin(), v.end());
+  cudf::test::dictionary_column_wrapper<T> col(v.begin(), v.end());
 
   this->reduction_test(col,
                        calc_reduction(v),