Replace deprecated raft headers (rapidsai#5134)

Linking rapidsai/raft#1145

Authors:
  - Micka (https://github.com/lowener)
  - Corey J. Nolet (https://github.com/cjnolet)

Approvers:
  - Corey J. Nolet (https://github.com/cjnolet)

URL: rapidsai#5134

cpp/bench/common/ml_benchmark.hpp

@@ -21,7 +21,7 @@
 #include <cuml/common/logger.hpp>
 #include <cuml/common/utils.hpp>
 #include <memory>
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 #include <sstream>
 #include <string>
 #include <vector>

cpp/bench/sg/arima_loglikelihood.cu

@@ -25,7 +25,7 @@
 #include <rmm/device_uvector.hpp>
 
 #include "benchmark.cuh"
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/benchmark.cuh

@@ -22,8 +22,8 @@
 #include <benchmark/benchmark.h>
 #include <cuda_runtime.h>
 #include <cuml/common/logger.hpp>
-#include <raft/core/cudart_utils.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/dataset.cuh

@@ -19,12 +19,12 @@
 #include <cuml/datasets/make_blobs.hpp>
 #include <fstream>
 #include <iostream>
-#include <raft/core/cudart_utils.hpp>
 #include <raft/core/handle.hpp>
-#include <raft/cuda_utils.cuh>
 #include <raft/linalg/transpose.cuh>
 #include <raft/linalg/unary_op.cuh>
 #include <raft/random/make_regression.cuh>
+#include <raft/util/cuda_utils.cuh>
+#include <raft/util/cudart_utils.hpp>
 #include <sstream>
 #include <string>
 #include <vector>

cpp/bench/sg/dataset_ts.cuh

@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <raft/core/cudart_utils.hpp>
 #include <raft/core/handle.hpp>
-#include <raft/cuda_utils.cuh>
 #include <raft/random/rng.cuh>
+#include <raft/util/cuda_utils.cuh>
+#include <raft/util/cudart_utils.hpp>
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/umap.cu

@@ -17,7 +17,7 @@
 #include "benchmark.cuh"
 #include <cuml/manifold/umap.hpp>
 #include <cuml/manifold/umapparams.h>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 #include <utility>
 
 namespace ML {

cpp/examples/symreg/symreg_example.cpp

@@ -28,7 +28,7 @@
 #include <cuml/genetic/genetic.h>
 #include <cuml/genetic/program.h>
 
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
 

cpp/include/cuml/common/utils.hpp

@@ -18,7 +18,7 @@
 
 #include <cuda_runtime.h>
 #include <execinfo.h>
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 #include <cstdio>
 

cpp/include/cuml/fil/multi_sum.cuh

@@ -15,7 +15,7 @@
  */
 /** @file multi_sum.cuh */
 #pragma once
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 /**
  template parameters: data [T]ype, reduction [R]adix
  function parameters:

cpp/include/cuml/neighbors/knn.hpp

@@ -18,7 +18,7 @@
 
 #include <raft/distance/distance_types.hpp>
 #include <raft/spatial/knn/ann_common.h>
-#include <raft/spatial/knn/ball_cover_common.h>
+#include <raft/spatial/knn/ball_cover_types.hpp>
 
 namespace raft {
 class handle_t;

cpp/include/cuml/tsa/arima_common.h

@@ -20,7 +20,7 @@
 
 #include <algorithm>
 
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 #include <thrust/execution_policy.h>
 #include <thrust/for_each.h>
 #include <thrust/iterator/counting_iterator.h>

cpp/src/arima/batched_arima.cu

@@ -34,8 +34,8 @@
 #include <raft/core/handle.hpp>
 #include <raft/core/nvtx.hpp>
 #include <raft/linalg/matrix_vector_op.cuh>
-#include <raft/stats/common.hpp>
 #include <raft/stats/information_criterion.cuh>
+#include <raft/stats/stats_types.hpp>
 #include <raft/util/cuda_utils.cuh>
 #include <raft/util/cudart_utils.hpp>
 #include <rmm/device_uvector.hpp>

cpp/src/common/cumlHandle.cpp

@@ -17,7 +17,7 @@
 #include "cumlHandle.hpp"
 
 #include <cuml/common/logger.hpp>
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 // #TODO: Replace with public header when ready
 #include <raft/linalg/detail/cublas_wrappers.hpp>
 // #TODO: Replace with public header when ready

cpp/src/common/cuml_api.cpp

@@ -19,7 +19,7 @@
 #include <cuml/common/utils.hpp>
 #include <cuml/cuml_api.h>
 
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 #include <cstddef>
 #include <functional>

cpp/src/dbscan/dbscan.cu

@@ -17,7 +17,7 @@
 #include <cuml/cluster/dbscan.hpp>
 
 #include "dbscan.cuh"
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 namespace ML {
 namespace Dbscan {

cpp/src/dbscan/runner.cuh

@@ -23,10 +23,10 @@
 #include "mergelabels/tree_reduction.cuh"
 #include "vertexdeg/runner.cuh"
 #include <common/nvtx.hpp>
-#include <raft/core/cudart_utils.hpp>
 #include <raft/core/nvtx.hpp>
 #include <raft/label/classlabels.cuh>
 #include <raft/sparse/csr.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 #include <cuml/common/logger.hpp>
 

cpp/src/dbscan/vertexdeg/precomputed.cuh

@@ -19,11 +19,11 @@
 #include <cub/cub.cuh>
 #include <cuda_runtime.h>
 #include <math.h>
-#include <raft/core/cudart_utils.hpp>
-#include <raft/cuda_utils.cuh>
-#include <raft/device_atomics.cuh>
 #include <raft/linalg/coalesced_reduction.cuh>
 #include <raft/linalg/reduce.cuh>
+#include <raft/util/cuda_utils.cuh>
+#include <raft/util/cudart_utils.hpp>
+#include <raft/util/device_atomics.cuh>
 
 #include "pack.h"
 

cpp/src/decisiontree/batched-levelalgo/bins.cuh

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #pragma once
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 namespace ML {
 namespace DT {

cpp/src/decisiontree/batched-levelalgo/builder.cuh

@@ -25,7 +25,7 @@
 #include <common/Timer.h>
 #include <cuml/common/pinned_host_vector.hpp>
 #include <cuml/tree/flatnode.h>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 #include <deque>
 #include <raft/core/nvtx.hpp>

cpp/src/decisiontree/batched-levelalgo/kernels/builder_kernels_impl.cuh

@@ -19,7 +19,7 @@
 
 #include <common/grid_sync.cuh>
 #include <cub/cub.cuh>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 #include <thrust/binary_search.h>
 
 #include "builder_kernels.cuh"

cpp/src/decisiontree/batched-levelalgo/quantiles.cuh

@@ -20,7 +20,7 @@
 #include <iostream>
 #include <memory>
 #include <raft/core/handle.hpp>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 #include <thrust/fill.h>

cpp/src/decisiontree/batched-levelalgo/split.cuh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <raft/cuda_utils.cuh>
 #include <raft/linalg/unary_op.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 namespace ML {
 namespace DT {

cpp/src/decisiontree/decisiontree.cuh

@@ -19,8 +19,8 @@
 #include <cuml/common/logger.hpp>
 #include <cuml/tree/flatnode.h>
 
-#include <raft/core/cudart_utils.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 #include "treelite_util.h"
 #include <treelite/c_api.h>

cpp/src/explainer/kernel_shap.cu

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <raft/core/cudart_utils.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 #include <cuml/explainer/kernel_shap.hpp>
 

cpp/src/explainer/permutation_shap.cu

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <raft/core/cudart_utils.hpp>
 #include <raft/core/handle.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 #include <cuml/explainer/permutation_shap.hpp>
 

cpp/src/fil/common.cuh

@@ -24,7 +24,7 @@
 #include <string>
 
 #include <cuml/fil/fil.h>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 #include "internal.cuh"
 

cpp/src/fil/fil.cu

@@ -22,9 +22,9 @@ creation and prediction (the main inference kernel is defined in infer.cu). */
 
 #include <cuml/fil/fil.h>  // for algo_t,
 
-#include <raft/core/cudart_utils.hpp>  // for RAFT_CUDA_TRY, cudaStream_t,
 #include <raft/core/error.hpp>         // for ASSERT
 #include <raft/core/handle.hpp>        // for handle_t
+#include <raft/util/cudart_utils.hpp>  // for RAFT_CUDA_TRY, cudaStream_t,
 #include <rmm/device_uvector.hpp>      // for device_uvector
 #include <thrust/host_vector.h>        // for host_vector
 

cpp/src/fil/infer.cu

@@ -20,8 +20,8 @@
 
 #include <cuml/fil/multi_sum.cuh>
 
-#include <raft/core/cudart_utils.hpp>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
+#include <raft/util/cudart_utils.hpp>
 
 #include <thrust/functional.h>
 

cpp/src/fil/internal.cuh

@@ -23,7 +23,7 @@
 #include <iostream>
 #include <numeric>
 #include <raft/core/error.hpp>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 #include <rmm/device_uvector.hpp>
 #include <treelite/c_api.h>
 #include <treelite/tree.h>

cpp/src/fil/treelite_import.cu

@@ -24,9 +24,9 @@
 #include <cuml/fil/fil.h>  // for algo_t, from_treelite, storage_type_repr, storage_type_t, treelite_params_t
 #include <cuml/fil/fnv_hash.h>  // for fowler_noll_vo_fingerprint64_32
 
-#include <raft/core/cudart_utils.hpp>  // for RAFT_CUDA_TRY
 #include <raft/core/error.hpp>         // for ASSERT
 #include <raft/core/handle.hpp>        // for handle_t
+#include <raft/util/cudart_utils.hpp>  // for RAFT_CUDA_TRY
 
 #include <treelite/base.h>   // for Operator, SplitFeatureType, kGE, kGT, kLE, kLT, kNumerical
 #include <treelite/c_api.h>  // for ModelHandle

cpp/src/genetic/fitness.cuh

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <raft/cuda_utils.cuh>
 #include <raft/linalg/eltwise.cuh>
 #include <raft/linalg/matrix_vector_op.cuh>
 #include <raft/linalg/strided_reduction.cuh>
@@ -24,6 +23,7 @@
 #include <raft/stats/mean_center.cuh>
 #include <raft/stats/stddev.cuh>
 #include <raft/stats/sum.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
@@ -40,7 +40,7 @@
 #include <thrust/sort.h>
 #include <thrust/transform.h>
 
-#include <raft/core/cudart_utils.hpp>
+#include <raft/util/cudart_utils.hpp>
 
 namespace cuml {
 namespace genetic {

cpp/src/genetic/node.cuh

@@ -17,7 +17,7 @@
 #pragma once
 
 #include <cuml/genetic/node.h>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 namespace cuml {
 namespace genetic {

cpp/src/genetic/reg_stack.cuh

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 #ifndef CUDA_PRAGMA_UNROLL
 #ifdef __CUDA_ARCH__

cpp/src/glm/qn/glm_linear.cuh

@@ -18,8 +18,8 @@
 
 #include "glm_base.cuh"
 #include "simple_mat.cuh"
-#include <raft/cuda_utils.cuh>
 #include <raft/linalg/add.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 namespace ML {
 namespace GLM {

cpp/src/glm/qn/glm_logistic.cuh

@@ -18,8 +18,8 @@
 
 #include "glm_base.cuh"
 #include "simple_mat.cuh"
-#include <raft/cuda_utils.cuh>
 #include <raft/linalg/add.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 namespace ML {
 namespace GLM {

cpp/src/glm/qn/glm_softmax.cuh

@@ -18,8 +18,8 @@
 
 #include "glm_base.cuh"
 #include "simple_mat.cuh"
-#include <raft/cuda_utils.cuh>
 #include <raft/linalg/add.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 namespace ML {
 namespace GLM {

cpp/src/glm/qn/glm_svm.cuh

@@ -18,8 +18,8 @@
 
 #include "glm_base.cuh"
 #include "simple_mat.cuh"
-#include <raft/cuda_utils.cuh>
 #include <raft/linalg/add.cuh>
+#include <raft/util/cuda_utils.cuh>
 
 namespace ML {
 namespace GLM {

cpp/src/glm/qn/qn_solvers.cuh

@@ -44,7 +44,7 @@
 #include "qn_util.cuh"
 #include "simple_mat.cuh"
 #include <cuml/common/logger.hpp>
-#include <raft/cuda_utils.cuh>
+#include <raft/util/cuda_utils.cuh>
 #include <rmm/device_uvector.hpp>
 
 namespace ML {