Remove Raft deprecated headers

cpp/bench/common/ml_benchmark.hpp

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

cpp/bench/prims/add.cu

@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/add.hpp>
+#include <raft/linalg/add.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/distance_common.cuh

@@ -15,9 +15,9 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/cudart_utils.h>
-#include <raft/distance/distance.hpp>
-#include <raft/distance/specializations.hpp>
+#include <raft/core/cudart_utils.hpp>
+#include <raft/distance/distance.cuh>
+#include <raft/distance/specializations.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/fused_l2_nn.cu

@@ -16,12 +16,12 @@
 
 #include <common/ml_benchmark.hpp>
 #include <limits>
-#include <raft/cudart_utils.h>
-#include <raft/distance/fused_l2_nn.hpp>
-#include <raft/handle.hpp>
-#include <raft/linalg/norm.hpp>
-#include <raft/random/rng.hpp>
-#include <raft/spatial/knn/specializations.hpp>
+#include <raft/core/cudart_utils.hpp>
+#include <raft/distance/fused_l2_nn.cuh>
+#include <raft/core/handle.hpp>
+#include <raft/linalg/norm.cuh>
+#include <raft/random/rng.cuh>
+#include <raft/spatial/knn/specializations.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/gram_matrix.cu

@@ -21,7 +21,7 @@
 #include <memory>
 // #TODO: Replace with public header when ready
 #include <raft/linalg/detail/cublas_wrappers.hpp>
-#include <raft/random/rng.hpp>
+#include <raft/random/rng.cuh>
 #include <sstream>
 #include <string>
 #include <vector>

cpp/bench/prims/make_blobs.cu

@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/random/make_blobs.hpp>
+#include <raft/random/make_blobs.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/map_then_reduce.cu

@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/map_then_reduce.hpp>
+#include <raft/linalg/map_then_reduce.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/matrix_vector_op.cu

@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/matrix_vector_op.hpp>
+#include <raft/linalg/matrix_vector_op.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/permute.cu

@@ -15,9 +15,9 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/cudart_utils.h>
-#include <raft/random/permute.hpp>
-#include <raft/random/rng.hpp>
+#include <raft/core/cudart_utils.hpp>
+#include <raft/random/permute.cuh>
+#include <raft/random/rng.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/reduce.cu

@@ -15,7 +15,7 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/linalg/reduce.hpp>
+#include <raft/linalg/reduce.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/prims/rng.cu

@@ -15,8 +15,8 @@
  */
 
 #include <common/ml_benchmark.hpp>
-#include <raft/cudart_utils.h>
-#include <raft/random/rng.hpp>
+#include <raft/core/cudart_utils.hpp>
+#include <raft/random/rng.cuh>
 
 namespace MLCommon {
 namespace Bench {

cpp/bench/sg/arima_loglikelihood.cu

@@ -20,12 +20,12 @@
 
 #include <cuml/tsa/arima_common.h>
 #include <cuml/tsa/batched_arima.hpp>
-#include <raft/handle.hpp>
-#include <raft/random/rng.hpp>
+#include <raft/core/handle.hpp>
+#include <raft/random/rng.cuh>
 #include <rmm/device_uvector.hpp>
 
 #include "benchmark.cuh"
-#include <raft/cudart_utils.h>
+#include <raft/core/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/cudart_utils.h>
-#include <raft/handle.hpp>
+#include <raft/core/cudart_utils.hpp>
+#include <raft/core/handle.hpp>
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/dataset.cuh

@@ -20,11 +20,11 @@
 #include <fstream>
 #include <iostream>
 #include <raft/cuda_utils.cuh>
-#include <raft/cudart_utils.h>
-#include <raft/handle.hpp>
-#include <raft/linalg/transpose.hpp>
-#include <raft/linalg/unary_op.hpp>
-#include <raft/random/make_regression.hpp>
+#include <raft/core/cudart_utils.hpp>
+#include <raft/core/handle.hpp>
+#include <raft/linalg/transpose.cuh>
+#include <raft/linalg/unary_op.cuh>
+#include <raft/random/make_regression.cuh>
 #include <sstream>
 #include <string>
 #include <vector>

cpp/bench/sg/dataset_ts.cuh

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

cpp/cmake/thirdparty/get_cumlprims_mg.cmake

@@ -28,12 +28,13 @@ function(find_and_configure_cumlprims_mg)
     endif()
 
     rapids_cpm_find(cumlprims_mg ${PKG_VERSION}
-      GLOBAL_TARGETS      cumlprims_mg::cumlprims_mg
-      BUILD_EXPORT_SET    cuml-exports
-      INSTALL_EXPORT_SET  cuml-exports
+        GLOBAL_TARGETS      cumlprims_mg::cumlprims_mg
+        BUILD_EXPORT_SET    cuml-exports
+        INSTALL_EXPORT_SET  cuml-exports
+        SOURCE_SUBDIR       cpp
         CPM_ARGS
-            GIT_REPOSITORY git@github.com:${PKG_FORK}/cumlprims_mg.git
-            GIT_TAG        ${PKG_PINNED_TAG}
+        GIT_REPOSITORY      git@github.com:${PKG_FORK}/cumlprims_mg.git
+        GIT_TAG             ${PKG_PINNED_TAG}
     )
 
 endfunction()
@@ -49,8 +50,8 @@ endfunction()
 # `-D CPM_cumlprims_mg_SOURCE=/path/to/cumlprims_mg`
 ###
 find_and_configure_cumlprims_mg(VERSION    ${CUML_MIN_VERSION_cumlprims_mg}
-                                FORK       rapidsai
-                                PINNED_TAG branch-${CUML_BRANCH_VERSION_cumlprims_mg}
+                                FORK       lowener
+                                PINNED_TAG 22.10-raft-headers
                                 # When PINNED_TAG above doesn't match cuml,
                                 # force local cumlprims_mg clone in build directory
                                 # even if it's already installed.

cpp/cmake/thirdparty/get_raft.cmake

@@ -81,8 +81,8 @@ endfunction()
 # To use a different RAFT locally, set the CMake variable
 # CPM_raft_SOURCE=/path/to/local/raft
 find_and_configure_raft(VERSION          ${CUML_MIN_VERSION_raft}
-                        FORK             rapidsai
-                        PINNED_TAG       branch-${CUML_BRANCH_VERSION_raft}
+                        FORK             lowener
+                        PINNED_TAG       22.10-rm-deprecated
 
                         # When PINNED_TAG above doesn't match cuml,
                         # force local raft clone in build directory

cpp/examples/dbscan/dbscan_example.cpp

@@ -23,7 +23,7 @@
 #include <sstream>
 #include <vector>
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 #include <cuml/cluster/dbscan.hpp>
 

cpp/examples/kmeans/kmeans_example.cpp

@@ -23,7 +23,7 @@
 
 #include <cuda_runtime.h>
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 #include <cuml/cluster/kmeans.hpp>
 

cpp/examples/symreg/symreg_example.cpp

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

cpp/include/cuml/cluster/hdbscan.hpp

@@ -18,7 +18,7 @@
 
 #include <raft/distance/distance_type.hpp>
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 #include <rmm/device_uvector.hpp>
 

cpp/include/cuml/cluster/linkage.hpp

@@ -19,7 +19,7 @@
 #include <raft/distance/distance_type.hpp>
 #include <raft/sparse/hierarchy/common.h>
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 namespace raft {
 class handle_t;

cpp/include/cuml/common/utils.hpp

@@ -18,11 +18,11 @@
 
 #include <cuda_runtime.h>
 #include <execinfo.h>
-#include <raft/cudart_utils.h>
+#include <raft/core/cudart_utils.hpp>
 
 #include <cstdio>
 
-#include <raft/error.hpp>
+#include <raft/core/error.hpp>
 #include <sstream>
 #include <stdexcept>
 #include <string>

cpp/include/cuml/decomposition/sign_flip_mg.hpp

@@ -18,7 +18,7 @@
 
 #include <cumlprims/opg/matrix/data.hpp>
 #include <cumlprims/opg/matrix/part_descriptor.hpp>
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 namespace ML {
 namespace PCA {

cpp/include/cuml/genetic/genetic.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 #include "common.h"
 #include "program.h"

cpp/include/cuml/genetic/program.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 #include <random>
 
 #include "common.h"

cpp/include/cuml/linear_model/glm.hpp

@@ -17,7 +17,7 @@
 
 #include <cuml/linear_model/qn.h>
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 namespace ML {
 namespace GLM {

cpp/include/cuml/linear_model/preprocess_mg.hpp

@@ -18,8 +18,8 @@
 
 #include <cumlprims/opg/matrix/data.hpp>
 #include <cumlprims/opg/matrix/part_descriptor.hpp>
-#include <raft/comms/comms.hpp>
-#include <raft/handle.hpp>
+#include <raft/core/comms.hpp>
+#include <raft/core/handle.hpp>
 
 namespace ML {
 namespace GLM {

cpp/include/cuml/neighbors/knn_mg.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 #include <vector>
 
 #include <cumlprims/opg/matrix/data.hpp>

cpp/include/cuml/random_projection/rproj_c.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 #include <rmm/device_uvector.hpp>
 
 namespace ML {

cpp/include/cuml/solvers/lars.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 namespace ML {
 namespace Solver {

cpp/include/cuml/svm/linear.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 namespace ML {
 namespace SVM {

cpp/include/cuml/svm/svc.hpp

@@ -20,7 +20,7 @@
 #include "svm_parameter.h"
 #include <cuml/common/logger.hpp>
 #include <cuml/matrix/kernelparams.h>
-#include <raft/handle.hpp>
+#include <raft/core/handle.hpp>
 
 // namespace raft {
 // class handle_t;

cpp/include/cuml/tsa/arima_common.h

@@ -20,7 +20,7 @@
 
 #include <algorithm>
 
-#include <raft/cudart_utils.h>
+#include <raft/core/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

@@ -32,11 +32,11 @@
 #include <common/nvtx.hpp>
 #include <linalg/batched/matrix.cuh>
 #include <metrics/batched/information_criterion.cuh>
-#include <raft/common/nvtx.hpp>
+#include <raft/core/nvtx.hpp>
 #include <raft/cuda_utils.cuh>
-#include <raft/cudart_utils.h>
-#include <raft/handle.hpp>
-#include <raft/linalg/matrix_vector_op.hpp>
+#include <raft/core/cudart_utils.hpp>
+#include <raft/core/handle.hpp>
+#include <raft/linalg/matrix_vector_op.cuh>
 #include <rmm/device_uvector.hpp>
 #include <timeSeries/arima_helpers.cuh>
 #include <timeSeries/fillna.cuh>