1919#include " reduction_operators.cuh"
2020
2121#include < cudf/column/column_factories.hpp>
22+ #include < cudf/detail/device_scalar.hpp>
2223#include < cudf/detail/utilities/cast_functor.cuh>
2324#include < cudf/utilities/memory_resource.hpp>
2425#include < cudf/utilities/type_dispatcher.hpp>
2526
2627#include < rmm/cuda_stream_view.hpp>
2728#include < rmm/device_buffer.hpp>
28- #include < rmm/device_scalar.hpp>
2929#include < rmm/exec_policy.hpp>
3030
3131#include < cub/device/device_reduce.cuh>
@@ -123,7 +123,7 @@ std::unique_ptr<scalar> reduce(InputIterator d_in,
123123{
124124 auto const binary_op = cudf::detail::cast_functor<OutputType>(op.get_binary_op ());
125125 auto const initial_value = init.value_or (op.template get_identity <OutputType>());
126- auto dev_result = rmm ::device_scalar<OutputType>{initial_value, stream};
126+ auto dev_result = cudf::detail ::device_scalar<OutputType>{initial_value, stream};
127127
128128 // Allocate temporary storage
129129 rmm::device_buffer d_temp_storage;
@@ -167,7 +167,6 @@ std::unique_ptr<scalar> reduce(InputIterator d_in,
167167 * @param op the reduction operator
168168 * @param valid_count Number of valid items
169169 * @param ddof Delta degrees of freedom used for standard deviation and variance
170- * @param init Optional initial value of the reduction
171170 * @param stream CUDA stream used for device memory operations and kernel launches
172171 * @param mr Device memory resource used to allocate the returned scalar's device memory
173172 * @returns Output scalar in device memory
@@ -187,7 +186,7 @@ std::unique_ptr<scalar> reduce(InputIterator d_in,
187186 auto const binary_op = cudf::detail::cast_functor<IntermediateType>(op.get_binary_op ());
188187 auto const initial_value = op.template get_identity <IntermediateType>();
189188
190- rmm ::device_scalar<IntermediateType> intermediate_result{initial_value, stream};
189+ cudf::detail ::device_scalar<IntermediateType> intermediate_result{initial_value, stream};
191190
192191 // Allocate temporary storage
193192 rmm::device_buffer d_temp_storage;
0 commit comments