Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop deprecated CCCL functors #6389

Merged
merged 1 commit into from
Mar 9, 2025
Merged

Drop deprecated CCCL functors #6389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cpp/src/fil/infer.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <raft/util/cuda_utils.cuh>
#include <raft/util/cudart_utils.hpp>

#include <thrust/functional.h>
#include <cuda/std/functional>

#include <algorithm>
#include <cmath>
Expand Down Expand Up @@ -81,13 +81,13 @@ struct vec {
__host__ __device__ T operator[](int i) const { return data[i]; }
friend __host__ __device__ vec<N, T> operator+(const vec<N, T>& a, const vec<N, T>& b)
{
return vectorized(cub::Sum())(a, b);
return vectorized(cuda::std::plus<T>{})(a, b);
}
friend __host__ __device__ void operator+=(vec<N, T>& a, const vec<N, T>& b) { a = a + b; }
template <typename Vec>
friend __host__ __device__ vec<N, T> operator/(vec<N, T>& a, const Vec& b)
{
return vectorized(thrust::divides<T>())(a, vec<N, T>(b));
return vectorized(cuda::std::divides<T>())(a, vec<N, T>(b));
}
template <typename Vec>
friend __host__ __device__ void operator/=(vec<N, T>& a, const Vec& b)
Expand Down Expand Up @@ -295,7 +295,7 @@ struct tree_aggregator_t {
// ensure input columns can be overwritten (no threads traversing trees)
__syncthreads();
if (log2_threads_per_tree == 0) {
acc = block_reduce(acc, vectorized(cub::Sum()), tmp_storage);
acc = block_reduce(acc, vectorized(cuda::std::plus{}), tmp_storage);
} else {
auto per_thread = (vec<NITEMS, real_t>*)tmp_storage;
per_thread[threadIdx.x] = acc;
Expand Down Expand Up @@ -383,7 +383,7 @@ __device__ __forceinline__ void block_softmax(Iterator begin, Iterator end, void
for (Iterator it = begin + threadIdx.x; it < end; it += blockDim.x)
*it = vectorized(shifted_exp())(*it, max);
// sum of exponents
value_type soe = allreduce_shmem(begin, end, vectorized(cub::Sum()), tmp_storage);
value_type soe = allreduce_shmem(begin, end, vectorized(cuda::std::plus{}), tmp_storage);
// softmax phase 2: normalization
for (Iterator it = begin + threadIdx.x; it < end; it += blockDim.x)
*it /= soe;
Expand Down
5 changes: 3 additions & 2 deletions cpp/src/svm/linear.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <rmm/device_uvector.hpp>
#include <rmm/mr/device/per_device_resource.hpp>

#include <cuda/std/functional>
#include <thrust/copy.h>
#include <thrust/device_ptr.h>
#include <thrust/execution_policy.h>
Expand Down Expand Up @@ -175,7 +176,7 @@ CUML_KERNEL void predictProba(T* out, const T* z, const int nRows, const int nCl
j -= BX;
t = rowIn[j];
}
smSum = WarpRed(warpStore).Reduce(smSum, cub::Sum());
smSum = WarpRed(warpStore).Reduce(smSum, cuda::std::plus{});
smSum = cub::ShuffleIndex<BX>(smSum, 0, 0xFFFFFFFFU);

// Now, either `j` refers to the first valid column idx worked by the
Expand Down Expand Up @@ -289,7 +290,7 @@ void predictLinear(const raft::handle_t& handle,

if (fitIntercept)
raft::linalg::matrixVectorOp(
out, out, w + nCols * coefCols, coefCols, nRows, true, true, cub::Sum(), stream);
out, out, w + nCols * coefCols, coefCols, nRows, true, true, cuda::std::plus{}, stream);
}

/** A helper struct for selecting handle/stream depending on whether omp parallel is active. */
Expand Down
Loading