Updating RAFT linalg headers (rapidsai#4515)

Depends on rapidsai/raft#383 Authors: - Divye Gala (https://github.com/divyegala) - Corey J. Nolet (https://github.com/cjnolet) Approvers: - Corey J. Nolet (https://github.com/cjnolet) URL: rapidsai#4515
vimarsh6739 · Feb 8, 2022 · 94166bc · 94166bc
1 parent 5671fa7
commit 94166bc
Show file tree

Hide file tree

Showing 129 changed files with 944 additions and 888 deletions.
diff --git a/cpp/bench/prims/add.cu b/cpp/bench/prims/add.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/add.cuh>
+#include <raft/linalg/add.hpp>
 
 namespace MLCommon {
 namespace Bench {

diff --git a/cpp/bench/prims/fused_l2_nn.cu b/cpp/bench/prims/fused_l2_nn.cu
@@ -19,7 +19,7 @@
 #include <raft/cudart_utils.h>
 #include <raft/distance/fused_l2_nn.hpp>
 #include <raft/handle.hpp>
-#include <raft/linalg/norm.cuh>
+#include <raft/linalg/norm.hpp>
 #include <raft/random/rng.hpp>
 #include <raft/spatial/knn/specializations.hpp>
 

diff --git a/cpp/bench/prims/gram_matrix.cu b/cpp/bench/prims/gram_matrix.cu
@@ -19,7 +19,8 @@
 #include <matrix/grammatrix.cuh>
 #include <matrix/kernelfactory.cuh>
 #include <memory>
-#include <raft/linalg/cublas_wrappers.h>
+// #TODO: Replace with public header when ready
+#include <raft/linalg/detail/cublas_wrappers.hpp>
 #include <raft/random/rng.hpp>
 #include <sstream>
 #include <string>

diff --git a/cpp/bench/prims/map_then_reduce.cu b/cpp/bench/prims/map_then_reduce.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/map_then_reduce.cuh>
+#include <raft/linalg/map_then_reduce.hpp>
 
 namespace MLCommon {
 namespace Bench {

diff --git a/cpp/bench/prims/matrix_vector_op.cu b/cpp/bench/prims/matrix_vector_op.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/matrix_vector_op.cuh>
+#include <raft/linalg/matrix_vector_op.hpp>
 
 namespace MLCommon {
 namespace Bench {

diff --git a/cpp/bench/prims/reduce.cu b/cpp/bench/prims/reduce.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/reduce.cuh>
+#include <raft/linalg/reduce.hpp>
 
 namespace MLCommon {
 namespace Bench {

diff --git a/cpp/bench/sg/dataset.cuh b/cpp/bench/sg/dataset.cuh
@@ -22,8 +22,8 @@
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
-#include <raft/linalg/transpose.h>
-#include <raft/linalg/unary_op.cuh>
+#include <raft/linalg/transpose.hpp>
+#include <raft/linalg/unary_op.hpp>
 #include <random/make_regression.cuh>
 #include <sstream>
 #include <string>

diff --git a/cpp/bench/sg/linkage.cu b/cpp/bench/sg/linkage.cu
@@ -17,7 +17,7 @@
 #include "benchmark.cuh"
 #include <cuml/cluster/linkage.hpp>
 #include <cuml/common/logger.hpp>
-#include <raft/linalg/distance_type.h>
+#include <raft/distance/distance_type.hpp>
 #include <raft/sparse/hierarchy/common.h>
 #include <utility>
 

diff --git a/cpp/include/cuml/cluster/dbscan.hpp b/cpp/include/cuml/cluster/dbscan.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/linalg/distance_type.h>
+#include <raft/distance/distance_type.hpp>
 
 #include <cuml/common/log_levels.hpp>
 

diff --git a/cpp/include/cuml/cluster/hdbscan.hpp b/cpp/include/cuml/cluster/hdbscan.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/linalg/distance_type.h>
+#include <raft/distance/distance_type.hpp>
 
 #include <raft/handle.hpp>
 

diff --git a/cpp/include/cuml/cluster/linkage.hpp b/cpp/include/cuml/cluster/linkage.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/linalg/distance_type.h>
+#include <raft/distance/distance_type.hpp>
 #include <raft/sparse/hierarchy/common.h>
 
 #include <raft/handle.hpp>

diff --git a/cpp/include/cuml/metrics/metrics.hpp b/cpp/include/cuml/metrics/metrics.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.
+ * Copyright (c) 2021-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/linalg/distance_type.h>
+#include <raft/distance/distance_type.hpp>
 
 #include <cstdint>
 

diff --git a/cpp/include/cuml/neighbors/knn.hpp b/cpp/include/cuml/neighbors/knn.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/linalg/distance_type.h>
+#include <raft/distance/distance_type.hpp>
 #include <raft/spatial/knn/ann_common.h>
 #include <raft/spatial/knn/ball_cover_common.h>
 

diff --git a/cpp/include/cuml/neighbors/knn_sparse.hpp b/cpp/include/cuml/neighbors/knn_sparse.hpp
@@ -19,7 +19,7 @@
 #include <cusparse_v2.h>
 
 #include <cuml/neighbors/knn.hpp>
-#include <raft/linalg/distance_type.h>
+#include <raft/distance/distance_type.hpp>
 
 namespace raft {
 class handle_t;

diff --git a/cpp/src/arima/batched_arima.cu b/cpp/src/arima/batched_arima.cu
@@ -35,7 +35,7 @@
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
-#include <raft/linalg/matrix_vector_op.cuh>
+#include <raft/linalg/matrix_vector_op.hpp>
 #include <rmm/device_uvector.hpp>
 #include <timeSeries/arima_helpers.cuh>
 #include <timeSeries/fillna.cuh>

diff --git a/cpp/src/arima/batched_kalman.cu b/cpp/src/arima/batched_kalman.cu
@@ -26,8 +26,9 @@
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
-#include <raft/linalg/binary_op.cuh>
-#include <raft/linalg/cublas_wrappers.h>
+#include <raft/linalg/add.hpp>
+// #TODO: Replace with public header when ready
+#include <raft/linalg/detail/cublas_wrappers.hpp>
 #include <rmm/device_uvector.hpp>
 
 #include <linalg/batched/matrix.cuh>
@@ -1222,48 +1223,50 @@ void _batched_kalman_filter(raft::handle_t& handle,
 
     double alpha = 1.0;
     double beta  = 0.0;
-    RAFT_CUBLAS_TRY(raft::linalg::cublasgemmStridedBatched(cublasHandle,
-                                                           CUBLAS_OP_N,
-                                                           CUBLAS_OP_N,
-                                                           nobs,
-                                                           1,
-                                                           order.n_exog,
-                                                           &alpha,
-                                                           d_exog,
-                                                           nobs,
-                                                           nobs * order.n_exog,
-                                                           d_beta,
-                                                           order.n_exog,
-                                                           order.n_exog,
-                                                           &beta,
-                                                           obs_intercept.data(),
-                                                           nobs,
-                                                           nobs,
-                                                           batch_size,
-                                                           stream));
+    // #TODO: Call from public API when ready
+    RAFT_CUBLAS_TRY(raft::linalg::detail::cublasgemmStridedBatched(cublasHandle,
+                                                                   CUBLAS_OP_N,
+                                                                   CUBLAS_OP_N,
+                                                                   nobs,
+                                                                   1,
+                                                                   order.n_exog,
+                                                                   &alpha,
+                                                                   d_exog,
+                                                                   nobs,
+                                                                   nobs * order.n_exog,
+                                                                   d_beta,
+                                                                   order.n_exog,
+                                                                   order.n_exog,
+                                                                   &beta,
+                                                                   obs_intercept.data(),
+                                                                   nobs,
+                                                                   nobs,
+                                                                   batch_size,
+                                                                   stream));
 
     if (fc_steps > 0) {
       obs_intercept_fut.resize(fc_steps * batch_size, stream);
 
-      RAFT_CUBLAS_TRY(raft::linalg::cublasgemmStridedBatched(cublasHandle,
-                                                             CUBLAS_OP_N,
-                                                             CUBLAS_OP_N,
-                                                             fc_steps,
-                                                             1,
-                                                             order.n_exog,
-                                                             &alpha,
-                                                             d_exog_fut,
-                                                             fc_steps,
-                                                             fc_steps * order.n_exog,
-                                                             d_beta,
-                                                             order.n_exog,
-                                                             order.n_exog,
-                                                             &beta,
-                                                             obs_intercept_fut.data(),
-                                                             fc_steps,
-                                                             fc_steps,
-                                                             batch_size,
-                                                             stream));
+      // #TODO: Call from public API when ready
+      RAFT_CUBLAS_TRY(raft::linalg::detail::cublasgemmStridedBatched(cublasHandle,
+                                                                     CUBLAS_OP_N,
+                                                                     CUBLAS_OP_N,
+                                                                     fc_steps,
+                                                                     1,
+                                                                     order.n_exog,
+                                                                     &alpha,
+                                                                     d_exog_fut,
+                                                                     fc_steps,
+                                                                     fc_steps * order.n_exog,
+                                                                     d_beta,
+                                                                     order.n_exog,
+                                                                     order.n_exog,
+                                                                     &beta,
+                                                                     obs_intercept_fut.data(),
+                                                                     fc_steps,
+                                                                     fc_steps,
+                                                                     batch_size,
+                                                                     stream));
     }
   }
 

diff --git a/cpp/src/common/cumlHandle.cpp b/cpp/src/common/cumlHandle.cpp
@@ -18,8 +18,10 @@
 
 #include <cuml/common/logger.hpp>
 #include <raft/cudart_utils.h>
-#include <raft/linalg/cublas_wrappers.h>
-#include <raft/linalg/cusolver_wrappers.h>
+// #TODO: Replace with public header when ready
+#include <raft/linalg/detail/cublas_wrappers.hpp>
+// #TODO: Replace with public header when ready
+#include <raft/linalg/detail/cusolver_wrappers.hpp>
 #include <raft/mr/device/allocator.hpp>
 #include <raft/mr/host/allocator.hpp>
 #include <raft/sparse/cusparse_wrappers.h>

diff --git a/cpp/src/dbscan/vertexdeg/precomputed.cuh b/cpp/src/dbscan/vertexdeg/precomputed.cuh
@@ -22,8 +22,8 @@
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
 #include <raft/device_atomics.cuh>
-#include <raft/linalg/coalesced_reduction.cuh>
-#include <raft/linalg/reduce.cuh>
+#include <raft/linalg/coalesced_reduction.hpp>
+#include <raft/linalg/reduce.hpp>
 
 #include "pack.h"
 

diff --git a/cpp/src/decisiontree/batched-levelalgo/split.cuh b/cpp/src/decisiontree/batched-levelalgo/split.cuh
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <raft/cuda_utils.cuh>
-#include <raft/linalg/unary_op.cuh>
+#include <raft/linalg/unary_op.hpp>
 
 namespace ML {
 namespace DT {

diff --git a/cpp/src/genetic/fitness.cuh b/cpp/src/genetic/fitness.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.
+ * Copyright (c) 2021-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 
 #include <raft/cuda_utils.cuh>
-#include <raft/linalg/eltwise.cuh>
-#include <raft/linalg/matrix_vector_op.cuh>
-#include <raft/linalg/strided_reduction.cuh>
-#include <raft/linalg/unary_op.cuh>
+#include <raft/linalg/eltwise.hpp>
+#include <raft/linalg/matrix_vector_op.hpp>
+#include <raft/linalg/strided_reduction.hpp>
+#include <raft/linalg/unary_op.hpp>
 #include <raft/matrix/math.hpp>
 #include <raft/stats/mean.hpp>
 #include <raft/stats/mean_center.hpp>

diff --git a/cpp/src/genetic/genetic.cu b/cpp/src/genetic/genetic.cu
@@ -23,8 +23,8 @@
 
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
-#include <raft/linalg/binary_op.cuh>
-#include <raft/linalg/unary_op.cuh>
+#include <raft/linalg/add.hpp>
+#include <raft/linalg/unary_op.hpp>
 #include <raft/random/rng.hpp>
 
 #include <algorithm>

diff --git a/cpp/src/genetic/program.cu b/cpp/src/genetic/program.cu
@@ -18,7 +18,7 @@
 #include <cuml/genetic/node.h>
 #include <cuml/genetic/program.h>
 #include <raft/cudart_utils.h>
-#include <raft/linalg/unary_op.cuh>
+#include <raft/linalg/unary_op.hpp>
 #include <rmm/device_uvector.hpp>
 
 #include <algorithm>

diff --git a/cpp/src/glm/ols.cuh b/cpp/src/glm/ols.cuh
@@ -17,10 +17,10 @@
 #pragma once
 
 #include <linalg/lstsq.cuh>
-#include <raft/linalg/add.cuh>
-#include <raft/linalg/gemv.h>
-#include <raft/linalg/norm.cuh>
-#include <raft/linalg/subtract.cuh>
+#include <raft/linalg/add.hpp>
+#include <raft/linalg/gemv.hpp>
+#include <raft/linalg/norm.hpp>
+#include <raft/linalg/subtract.hpp>
 #include <raft/matrix/math.hpp>
 #include <raft/matrix/matrix.hpp>
 #include <raft/stats/mean.hpp>

diff --git a/cpp/src/glm/ols_mg.cu b/cpp/src/glm/ols_mg.cu
@@ -22,8 +22,8 @@
 
 #include <raft/comms/comms.hpp>
 #include <raft/cuda_utils.cuh>
-#include <raft/linalg/add.cuh>
-#include <raft/linalg/gemm.cuh>
+#include <raft/linalg/add.hpp>
+#include <raft/linalg/gemm.hpp>
 #include <raft/matrix/math.hpp>
 #include <raft/matrix/matrix.hpp>
 #include <raft/mr/device/allocator.hpp>

diff --git a/cpp/src/glm/preprocess.cuh b/cpp/src/glm/preprocess.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2018-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <raft/cudart_utils.h>
-#include <raft/linalg/gemm.cuh>
-#include <raft/linalg/norm.cuh>
+#include <raft/linalg/gemm.hpp>
+#include <raft/linalg/norm.hpp>
 #include <raft/matrix/math.hpp>
 #include <raft/matrix/matrix.hpp>
 #include <raft/stats/mean.hpp>