Remove RAFT MM includes (#4637)

Authors: - Victor Lafargue (https://github.com/viclafargue) Approvers: - Corey J. Nolet (https://github.com/cjnolet) URL: #4637
rapidsai · Mar 21, 2022 · 3f54aec · 3f54aec
1 parent 48120ce
commit 3f54aec
Show file tree

Hide file tree

Showing 28 changed files with 2 additions and 34 deletions.
diff --git a/cpp/examples/symreg/symreg_example.cpp b/cpp/examples/symreg/symreg_example.cpp
@@ -29,7 +29,6 @@
 #include <cuml/genetic/program.h>
 
 #include <raft/cudart_utils.h>
-#include <raft/mr/device/allocator.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/include/cuml/linear_model/preprocess_mg.hpp b/cpp/include/cuml/linear_model/preprocess_mg.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-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.
@@ -20,7 +20,6 @@
 #include <opg/matrix/part_descriptor.hpp>
 #include <raft/comms/comms.hpp>
 #include <raft/handle.hpp>
-#include <raft/mr/device/allocator.hpp>
 
 namespace ML {
 namespace GLM {

diff --git a/cpp/src/common/cumlHandle.cpp b/cpp/src/common/cumlHandle.cpp
@@ -22,8 +22,6 @@
 #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>
 
 namespace ML {
 

diff --git a/cpp/src/common/cumlHandle.hpp b/cpp/src/common/cumlHandle.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.
@@ -19,8 +19,6 @@
 #include <cuml/cuml_api.h>
 
 #include <raft/handle.hpp>
-#include <raft/mr/device/allocator.hpp>
-#include <raft/mr/host/allocator.hpp>
 
 namespace ML {
 

diff --git a/cpp/src/glm/ols_mg.cu b/cpp/src/glm/ols_mg.cu
@@ -26,8 +26,6 @@
 #include <raft/linalg/gemm.hpp>
 #include <raft/matrix/math.hpp>
 #include <raft/matrix/matrix.hpp>
-#include <raft/mr/device/allocator.hpp>
-#include <raft/mr/host/allocator.hpp>
 
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/src/glm/qn/simple_mat/sparse.hpp b/cpp/src/glm/qn/simple_mat/sparse.hpp
@@ -28,7 +28,6 @@
 #include <raft/linalg/map_then_reduce.hpp>
 #include <raft/linalg/norm.hpp>
 #include <raft/linalg/unary_op.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <raft/sparse/detail/cusparse_wrappers.h>
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/src/holtwinters/internal/hw_utils.cuh b/cpp/src/holtwinters/internal/hw_utils.cuh
@@ -20,7 +20,6 @@
 #include <iostream>
 #include <raft/cudart_utils.h>
 #include <raft/linalg/eltwise.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <vector>
 
 #define IDX(n, m, N) (n + (m) * (N))

diff --git a/cpp/src/knn/knn_opg_common.cuh b/cpp/src/knn/knn_opg_common.cuh
@@ -27,7 +27,6 @@
 #include <raft/comms/comms.hpp>
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
-#include <raft/mr/device/allocator.hpp>
 #include <raft/spatial/knn/knn.hpp>
 
 #include <cstddef>

diff --git a/cpp/src/randomforest/randomforest.cuh b/cpp/src/randomforest/randomforest.cuh
@@ -27,7 +27,6 @@
 #include <raft/random/rng.hpp>
 
 #include <raft/cudart_utils.h>
-#include <raft/mr/device/allocator.hpp>
 #include <raft/random/rng.hpp>
 
 #ifdef _OPENMP

diff --git a/cpp/src/umap/simpl_set_embed/runner.cuh b/cpp/src/umap/simpl_set_embed/runner.cuh
@@ -18,7 +18,6 @@
 
 #include "algo.cuh"
 #include <cuml/manifold/umapparams.h>
-#include <raft/mr/device/allocator.hpp>
 
 #include <raft/sparse/coo.hpp>
 

diff --git a/cpp/src_prims/cache/cache.cuh b/cpp/src_prims/cache/cache.cuh
@@ -24,7 +24,6 @@
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
 #include <raft/interruptible.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/src_prims/metrics/homogeneity_score.cuh b/cpp/src_prims/metrics/homogeneity_score.cuh
@@ -22,7 +22,6 @@
 
 #include "entropy.cuh"
 #include "mutual_info_score.cuh"
-#include <raft/mr/device/allocator.hpp>
 
 namespace MLCommon {
 

diff --git a/cpp/src_prims/selection/knn.cuh b/cpp/src_prims/selection/knn.cuh
@@ -27,7 +27,6 @@
 #include <raft/cudart_utils.h>
 #include <raft/distance/distance.hpp>
 #include <raft/distance/distance_type.hpp>
-#include <raft/mr/device/allocator.hpp>
 
 #include <faiss/gpu/GpuDistance.h>
 #include <faiss/gpu/GpuIndexFlat.h>

diff --git a/cpp/src_prims/timeSeries/arima_helpers.cuh b/cpp/src_prims/timeSeries/arima_helpers.cuh
@@ -25,7 +25,6 @@
 #include <raft/cudart_utils.h>
 #include <raft/linalg/matrix_vector_op.hpp>
 #include <raft/linalg/unary_op.hpp>
-#include <raft/mr/device/allocator.hpp>
 
 // Private helper functions and kernels in the anonymous namespace
 namespace {

diff --git a/cpp/src_prims/timeSeries/fillna.cuh b/cpp/src_prims/timeSeries/fillna.cuh
@@ -26,7 +26,6 @@
 #include <raft/cudart_utils.h>
 #include <raft/linalg/matrix_vector_op.hpp>
 #include <raft/linalg/unary_op.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <rmm/device_uvector.hpp>
 
 // Auxiliary functions in anonymous namespace

diff --git a/cpp/test/mg/knn_classify.cu b/cpp/test/mg/knn_classify.cu
@@ -15,7 +15,6 @@
  */
 
 #include "knn_test_helper.cuh"
-#include <raft/mr/device/allocator.hpp>
 
 namespace ML {
 namespace KNN {

diff --git a/cpp/test/mg/knn_test_helper.cuh b/cpp/test/mg/knn_test_helper.cuh
@@ -26,8 +26,6 @@
 #include <raft/linalg/reduce_rows_by_key.cuh>
 #include <selection/knn.cuh>
 
-#include <raft/mr/device/allocator.hpp>
-
 #include <raft/cuda_utils.cuh>
 
 namespace ML {

diff --git a/cpp/test/prims/batched/csr.cu b/cpp/test/prims/batched/csr.cu
@@ -21,7 +21,6 @@
 #include <sparse/batched/csr.cuh>
 
 #include <raft/cudart_utils.h>
-#include <raft/mr/device/allocator.hpp>
 
 #include <gtest/gtest.h>
 

diff --git a/cpp/test/prims/batched/matrix.cu b/cpp/test/prims/batched/matrix.cu
@@ -21,7 +21,6 @@
 
 #include <raft/cudart_utils.h>
 #include <raft/linalg/add.hpp>
-#include <raft/mr/device/allocator.hpp>
 
 #include <gtest/gtest.h>
 

diff --git a/cpp/test/prims/fillna.cu b/cpp/test/prims/fillna.cu
@@ -22,7 +22,6 @@
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <rmm/device_uvector.hpp>
 
 #include "test_utils.h"

diff --git a/cpp/test/prims/gram.cu b/cpp/test/prims/gram.cu
@@ -23,7 +23,6 @@
 #include <memory>
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
-#include <raft/mr/host/allocator.hpp>
 #include <raft/random/rng.hpp>
 #include <rmm/device_uvector.hpp>
 

diff --git a/cpp/test/prims/merge_labels.cu b/cpp/test/prims/merge_labels.cu
@@ -20,7 +20,6 @@
 #include "test_utils.h"
 #include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <rmm/device_uvector.hpp>
 #include <thrust/device_ptr.h>
 

diff --git a/cpp/test/sg/hdbscan_test.cu b/cpp/test/sg/hdbscan_test.cu
@@ -32,7 +32,6 @@
 
 #include <raft/distance/distance_type.hpp>
 #include <raft/linalg/transpose.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <raft/sparse/coo.hpp>
 #include <raft/sparse/op/sort.hpp>
 #include <rmm/device_uvector.hpp>

diff --git a/cpp/test/sg/kmeans_test.cu b/cpp/test/sg/kmeans_test.cu
@@ -26,7 +26,6 @@
 #include <cuml/common/logger.hpp>
 #include <cuml/datasets/make_blobs.hpp>
 #include <cuml/metrics/metrics.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <thrust/fill.h>
 
 namespace ML {

diff --git a/cpp/test/sg/linkage_test.cu b/cpp/test/sg/linkage_test.cu
@@ -22,7 +22,6 @@
 #include <cuml/cluster/linkage.hpp>
 #include <cuml/datasets/make_blobs.hpp>
 #include <hierarchy/pw_dist_graph.cuh>
-#include <raft/mr/device/allocator.hpp>
 
 #include <raft/distance/distance_type.hpp>
 #include <raft/linalg/transpose.hpp>

diff --git a/cpp/test/sg/ols.cu b/cpp/test/sg/ols.cu
@@ -18,7 +18,6 @@
 #include <gtest/gtest.h>
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
-#include <raft/mr/device/allocator.hpp>
 #include <rmm/cuda_stream_pool.hpp>
 #include <test_utils.h>
 #include <vector>

diff --git a/cpp/test/sg/shap_kernel.cu b/cpp/test/sg/shap_kernel.cu
@@ -21,7 +21,6 @@
 #include <raft/cuda_utils.cuh>
 #include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <rmm/device_uvector.hpp>
 
 #include <thrust/device_ptr.h>

diff --git a/cpp/test/sg/umap_parametrizable_test.cu b/cpp/test/sg/umap_parametrizable_test.cu
@@ -35,7 +35,6 @@
 #include <raft/cudart_utils.h>
 #include <raft/distance/distance.hpp>
 #include <raft/handle.hpp>
-#include <raft/mr/device/allocator.hpp>
 #include <selection/knn.cuh>
 #include <umap/runner.cuh>