From cda461fc502ee446574a22a248707c6b3b64ff4e Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Mon, 16 Jan 2023 15:36:45 +0100 Subject: [PATCH 1/7] Remove deprecated headers --- cpp/bench/common/benchmark.hpp | 4 +-- cpp/bench/random/permute.cu | 2 +- cpp/bench/random/rng.cu | 2 +- cpp/doxygen/Doxyfile.in | 22 ++++++------- cpp/include/raft/cache/cache_util.cuh | 31 ------------------ cpp/include/raft/cluster/kmeans_params.hpp | 22 ------------- cpp/include/raft/comms/detail/util.hpp | 2 +- cpp/include/raft/cuda_utils.cuh | 31 ------------------ cpp/include/raft/cudart_utils.h | 23 ------------- cpp/include/raft/device_atomics.cuh | 31 ------------------ cpp/include/raft/device_utils.cuh | 31 ------------------ cpp/include/raft/distance/distance.hpp | 23 ------------- cpp/include/raft/distance/fused_l2_nn.hpp | 31 ------------------ cpp/include/raft/distance/specializations.hpp | 31 ------------------ cpp/include/raft/error.hpp | 23 ------------- cpp/include/raft/handle.hpp | 24 -------------- cpp/include/raft/integer_utils.h | 31 ------------------ cpp/include/raft/interruptible.hpp | 23 ------------- cpp/include/raft/label/classlabels.hpp | 31 ------------------ cpp/include/raft/label/merge_labels.hpp | 31 ------------------ cpp/include/raft/linalg/add.hpp | 31 ------------------ cpp/include/raft/linalg/axpy.hpp | 31 ------------------ cpp/include/raft/linalg/binary_op.hpp | 31 ------------------ .../raft/linalg/cholesky_r1_update.hpp | 31 ------------------ .../raft/linalg/coalesced_reduction.hpp | 31 ------------------ cpp/include/raft/linalg/contractions.hpp | 31 ------------------ cpp/include/raft/linalg/divide.hpp | 31 ------------------ cpp/include/raft/linalg/eig.hpp | 31 ------------------ cpp/include/raft/linalg/eltwise.hpp | 31 ------------------ cpp/include/raft/linalg/gemm.hpp | 31 ------------------ cpp/include/raft/linalg/gemv.hpp | 31 ------------------ cpp/include/raft/linalg/init.hpp | 31 ------------------ cpp/include/raft/linalg/lanczos.hpp | 31 ------------------ cpp/include/raft/linalg/lstsq.hpp | 31 ------------------ cpp/include/raft/linalg/map.hpp | 23 ------------- cpp/include/raft/linalg/map_then_reduce.hpp | 31 ------------------ cpp/include/raft/linalg/matrix_vector_op.hpp | 31 ------------------ .../raft/linalg/mean_squared_error.hpp | 31 ------------------ cpp/include/raft/linalg/multiply.hpp | 31 ------------------ cpp/include/raft/linalg/norm.hpp | 31 ------------------ cpp/include/raft/linalg/power.hpp | 31 ------------------ cpp/include/raft/linalg/qr.hpp | 23 ------------- cpp/include/raft/linalg/reduce.hpp | 31 ------------------ .../raft/linalg/reduce_cols_by_key.hpp | 31 ------------------ .../raft/linalg/reduce_rows_by_key.hpp | 31 ------------------ cpp/include/raft/linalg/rsvd.hpp | 31 ------------------ cpp/include/raft/linalg/sqrt.hpp | 31 ------------------ cpp/include/raft/linalg/strided_reduction.cuh | 2 +- cpp/include/raft/linalg/strided_reduction.hpp | 31 ------------------ cpp/include/raft/linalg/subtract.hpp | 31 ------------------ cpp/include/raft/linalg/svd.hpp | 31 ------------------ cpp/include/raft/linalg/ternary_op.hpp | 31 ------------------ cpp/include/raft/linalg/transpose.hpp | 31 ------------------ cpp/include/raft/linalg/unary_op.hpp | 31 ------------------ cpp/include/raft/matrix/col_wise_sort.hpp | 31 ------------------ cpp/include/raft/mdarray.hpp | 23 ------------- cpp/include/raft/pow2_utils.cuh | 31 ------------------ cpp/include/raft/random/make_blobs.hpp | 24 -------------- cpp/include/raft/random/make_regression.cuh | 2 +- cpp/include/raft/random/make_regression.hpp | 31 ------------------ .../raft/random/multi_variable_gaussian.hpp | 31 ------------------ cpp/include/raft/random/permute.hpp | 31 ------------------ cpp/include/raft/random/rng.hpp | 31 ------------------ cpp/include/raft/span.hpp | 23 ------------- cpp/include/raft/sparse/convert/coo.hpp | 27 ---------------- cpp/include/raft/sparse/convert/csr.hpp | 32 ------------------- cpp/include/raft/sparse/convert/dense.hpp | 27 ---------------- cpp/include/raft/sparse/distance/distance.hpp | 23 ------------- .../raft/sparse/hierarchy/single_linkage.hpp | 27 ---------------- cpp/include/raft/sparse/linalg/add.hpp | 31 ------------------ cpp/include/raft/sparse/linalg/degree.hpp | 31 ------------------ cpp/include/raft/sparse/linalg/norm.hpp | 31 ------------------ cpp/include/raft/sparse/linalg/spectral.hpp | 31 ------------------ cpp/include/raft/sparse/linalg/symmetrize.hpp | 23 ------------- cpp/include/raft/sparse/linalg/transpose.hpp | 31 ------------------ cpp/include/raft/sparse/op/filter.hpp | 31 ------------------ cpp/include/raft/sparse/op/reduce.hpp | 31 ------------------ cpp/include/raft/sparse/op/row_op.hpp | 31 ------------------ cpp/include/raft/sparse/op/slice.hpp | 31 ------------------ cpp/include/raft/sparse/op/sort.hpp | 31 ------------------ .../sparse/selection/connect_components.hpp | 31 ------------------ cpp/include/raft/sparse/selection/knn.hpp | 31 ------------------ .../raft/sparse/selection/knn_graph.hpp | 31 ------------------ cpp/include/raft/spatial/knn/ann.hpp | 23 ------------- cpp/include/raft/spatial/knn/ball_cover.hpp | 23 ------------- .../raft/spatial/knn/ball_cover_common.h | 23 ------------- .../raft/spatial/knn/epsilon_neighborhood.hpp | 31 ------------------ cpp/include/raft/spatial/knn/knn.hpp | 23 ------------- .../raft/spatial/knn/specializations.hpp | 31 ------------------ cpp/include/raft/spectral/cluster_solvers.hpp | 24 -------------- cpp/include/raft/spectral/eigen_solvers.hpp | 31 ------------------ .../raft/spectral/modularity_maximization.hpp | 23 ------------- cpp/include/raft/spectral/partition.hpp | 23 ------------- cpp/include/raft/stats/accuracy.hpp | 31 ------------------ .../raft/stats/adjusted_rand_index.hpp | 31 ------------------ cpp/include/raft/stats/common.hpp | 22 ------------- cpp/include/raft/stats/completeness_score.hpp | 23 ------------- cpp/include/raft/stats/contingency_matrix.hpp | 31 ------------------ cpp/include/raft/stats/cov.hpp | 31 ------------------ cpp/include/raft/stats/detail/dispersion.cuh | 2 +- .../raft/stats/detail/mutual_info_score.cuh | 2 +- cpp/include/raft/stats/detail/rand_index.cuh | 2 +- cpp/include/raft/stats/dispersion.hpp | 31 ------------------ cpp/include/raft/stats/entropy.hpp | 31 ------------------ cpp/include/raft/stats/histogram.hpp | 31 ------------------ cpp/include/raft/stats/homogeneity_score.hpp | 31 ------------------ .../raft/stats/information_criterion.hpp | 31 ------------------ cpp/include/raft/stats/kl_divergence.hpp | 31 ------------------ cpp/include/raft/stats/mean.hpp | 31 ------------------ cpp/include/raft/stats/mean_center.hpp | 31 ------------------ cpp/include/raft/stats/meanvar.hpp | 31 ------------------ cpp/include/raft/stats/minmax.hpp | 31 ------------------ cpp/include/raft/stats/mutual_info_score.hpp | 31 ------------------ cpp/include/raft/stats/r2_score.hpp | 31 ------------------ cpp/include/raft/stats/rand_index.hpp | 31 ------------------ cpp/include/raft/stats/regression_metrics.hpp | 31 ------------------ cpp/include/raft/stats/silhouette_score.hpp | 31 ------------------ cpp/include/raft/stats/specializations.hpp | 31 ------------------ cpp/include/raft/stats/stddev.hpp | 31 ------------------ cpp/include/raft/stats/sum.hpp | 31 ------------------ .../raft/stats/trustworthiness_score.hpp | 31 ------------------ cpp/include/raft/stats/v_measure.hpp | 31 ------------------ cpp/include/raft/stats/weighted_mean.hpp | 31 ------------------ cpp/include/raft/vectorized.cuh | 31 ------------------ cpp/src/distance/cluster/cluster_cost.cuh | 2 +- .../distance/cluster/cluster_cost_double.cu | 2 +- .../distance/cluster/cluster_cost_float.cu | 2 +- cpp/src/distance/cluster/kmeans_fit_double.cu | 2 +- cpp/src/distance/cluster/kmeans_fit_float.cu | 2 +- cpp/src/distance/cluster/update_centroids.cuh | 2 +- .../cluster/update_centroids_double.cu | 2 +- .../cluster/update_centroids_float.cu | 2 +- .../distance/distance/pairwise_distance.cu | 2 +- cpp/test/core/interruptible.cu | 2 +- cpp/test/core/test_span.hpp | 2 +- cpp/test/distance/distance_base.cuh | 2 +- cpp/test/linalg/reduce_cols_by_key.cu | 2 +- cpp/test/stats/accuracy.cu | 2 +- cpp/test/stats/contingencyMatrix.cu | 2 +- cpp/test/stats/dispersion.cu | 2 +- cpp/test/stats/entropy.cu | 2 +- cpp/test/stats/histogram.cu | 2 +- cpp/test/stats/r2_score.cu | 2 +- cpp/test/stats/regression_metrics.cu | 2 +- 144 files changed, 41 insertions(+), 3389 deletions(-) delete mode 100644 cpp/include/raft/cache/cache_util.cuh delete mode 100644 cpp/include/raft/cluster/kmeans_params.hpp delete mode 100644 cpp/include/raft/cuda_utils.cuh delete mode 100644 cpp/include/raft/cudart_utils.h delete mode 100644 cpp/include/raft/device_atomics.cuh delete mode 100644 cpp/include/raft/device_utils.cuh delete mode 100644 cpp/include/raft/distance/distance.hpp delete mode 100644 cpp/include/raft/distance/fused_l2_nn.hpp delete mode 100644 cpp/include/raft/distance/specializations.hpp delete mode 100644 cpp/include/raft/error.hpp delete mode 100644 cpp/include/raft/handle.hpp delete mode 100644 cpp/include/raft/integer_utils.h delete mode 100644 cpp/include/raft/interruptible.hpp delete mode 100644 cpp/include/raft/label/classlabels.hpp delete mode 100644 cpp/include/raft/label/merge_labels.hpp delete mode 100644 cpp/include/raft/linalg/add.hpp delete mode 100644 cpp/include/raft/linalg/axpy.hpp delete mode 100644 cpp/include/raft/linalg/binary_op.hpp delete mode 100644 cpp/include/raft/linalg/cholesky_r1_update.hpp delete mode 100644 cpp/include/raft/linalg/coalesced_reduction.hpp delete mode 100644 cpp/include/raft/linalg/contractions.hpp delete mode 100644 cpp/include/raft/linalg/divide.hpp delete mode 100644 cpp/include/raft/linalg/eig.hpp delete mode 100644 cpp/include/raft/linalg/eltwise.hpp delete mode 100644 cpp/include/raft/linalg/gemm.hpp delete mode 100644 cpp/include/raft/linalg/gemv.hpp delete mode 100644 cpp/include/raft/linalg/init.hpp delete mode 100644 cpp/include/raft/linalg/lanczos.hpp delete mode 100644 cpp/include/raft/linalg/lstsq.hpp delete mode 100644 cpp/include/raft/linalg/map.hpp delete mode 100644 cpp/include/raft/linalg/map_then_reduce.hpp delete mode 100644 cpp/include/raft/linalg/matrix_vector_op.hpp delete mode 100644 cpp/include/raft/linalg/mean_squared_error.hpp delete mode 100644 cpp/include/raft/linalg/multiply.hpp delete mode 100644 cpp/include/raft/linalg/norm.hpp delete mode 100644 cpp/include/raft/linalg/power.hpp delete mode 100644 cpp/include/raft/linalg/qr.hpp delete mode 100644 cpp/include/raft/linalg/reduce.hpp delete mode 100644 cpp/include/raft/linalg/reduce_cols_by_key.hpp delete mode 100644 cpp/include/raft/linalg/reduce_rows_by_key.hpp delete mode 100644 cpp/include/raft/linalg/rsvd.hpp delete mode 100644 cpp/include/raft/linalg/sqrt.hpp delete mode 100644 cpp/include/raft/linalg/strided_reduction.hpp delete mode 100644 cpp/include/raft/linalg/subtract.hpp delete mode 100644 cpp/include/raft/linalg/svd.hpp delete mode 100644 cpp/include/raft/linalg/ternary_op.hpp delete mode 100644 cpp/include/raft/linalg/transpose.hpp delete mode 100644 cpp/include/raft/linalg/unary_op.hpp delete mode 100644 cpp/include/raft/matrix/col_wise_sort.hpp delete mode 100644 cpp/include/raft/mdarray.hpp delete mode 100644 cpp/include/raft/pow2_utils.cuh delete mode 100644 cpp/include/raft/random/make_blobs.hpp delete mode 100644 cpp/include/raft/random/make_regression.hpp delete mode 100644 cpp/include/raft/random/multi_variable_gaussian.hpp delete mode 100644 cpp/include/raft/random/permute.hpp delete mode 100644 cpp/include/raft/random/rng.hpp delete mode 100644 cpp/include/raft/span.hpp delete mode 100644 cpp/include/raft/sparse/convert/coo.hpp delete mode 100644 cpp/include/raft/sparse/convert/csr.hpp delete mode 100644 cpp/include/raft/sparse/convert/dense.hpp delete mode 100644 cpp/include/raft/sparse/distance/distance.hpp delete mode 100644 cpp/include/raft/sparse/hierarchy/single_linkage.hpp delete mode 100644 cpp/include/raft/sparse/linalg/add.hpp delete mode 100644 cpp/include/raft/sparse/linalg/degree.hpp delete mode 100644 cpp/include/raft/sparse/linalg/norm.hpp delete mode 100644 cpp/include/raft/sparse/linalg/spectral.hpp delete mode 100644 cpp/include/raft/sparse/linalg/symmetrize.hpp delete mode 100644 cpp/include/raft/sparse/linalg/transpose.hpp delete mode 100644 cpp/include/raft/sparse/op/filter.hpp delete mode 100644 cpp/include/raft/sparse/op/reduce.hpp delete mode 100644 cpp/include/raft/sparse/op/row_op.hpp delete mode 100644 cpp/include/raft/sparse/op/slice.hpp delete mode 100644 cpp/include/raft/sparse/op/sort.hpp delete mode 100644 cpp/include/raft/sparse/selection/connect_components.hpp delete mode 100644 cpp/include/raft/sparse/selection/knn.hpp delete mode 100644 cpp/include/raft/sparse/selection/knn_graph.hpp delete mode 100644 cpp/include/raft/spatial/knn/ann.hpp delete mode 100644 cpp/include/raft/spatial/knn/ball_cover.hpp delete mode 100644 cpp/include/raft/spatial/knn/ball_cover_common.h delete mode 100644 cpp/include/raft/spatial/knn/epsilon_neighborhood.hpp delete mode 100644 cpp/include/raft/spatial/knn/knn.hpp delete mode 100644 cpp/include/raft/spatial/knn/specializations.hpp delete mode 100644 cpp/include/raft/spectral/cluster_solvers.hpp delete mode 100644 cpp/include/raft/spectral/eigen_solvers.hpp delete mode 100644 cpp/include/raft/spectral/modularity_maximization.hpp delete mode 100644 cpp/include/raft/spectral/partition.hpp delete mode 100644 cpp/include/raft/stats/accuracy.hpp delete mode 100644 cpp/include/raft/stats/adjusted_rand_index.hpp delete mode 100644 cpp/include/raft/stats/common.hpp delete mode 100644 cpp/include/raft/stats/completeness_score.hpp delete mode 100644 cpp/include/raft/stats/contingency_matrix.hpp delete mode 100644 cpp/include/raft/stats/cov.hpp delete mode 100644 cpp/include/raft/stats/dispersion.hpp delete mode 100644 cpp/include/raft/stats/entropy.hpp delete mode 100644 cpp/include/raft/stats/histogram.hpp delete mode 100644 cpp/include/raft/stats/homogeneity_score.hpp delete mode 100644 cpp/include/raft/stats/information_criterion.hpp delete mode 100644 cpp/include/raft/stats/kl_divergence.hpp delete mode 100644 cpp/include/raft/stats/mean.hpp delete mode 100644 cpp/include/raft/stats/mean_center.hpp delete mode 100644 cpp/include/raft/stats/meanvar.hpp delete mode 100644 cpp/include/raft/stats/minmax.hpp delete mode 100644 cpp/include/raft/stats/mutual_info_score.hpp delete mode 100644 cpp/include/raft/stats/r2_score.hpp delete mode 100644 cpp/include/raft/stats/rand_index.hpp delete mode 100644 cpp/include/raft/stats/regression_metrics.hpp delete mode 100644 cpp/include/raft/stats/silhouette_score.hpp delete mode 100644 cpp/include/raft/stats/specializations.hpp delete mode 100644 cpp/include/raft/stats/stddev.hpp delete mode 100644 cpp/include/raft/stats/sum.hpp delete mode 100644 cpp/include/raft/stats/trustworthiness_score.hpp delete mode 100644 cpp/include/raft/stats/v_measure.hpp delete mode 100644 cpp/include/raft/stats/weighted_mean.hpp delete mode 100644 cpp/include/raft/vectorized.cuh diff --git a/cpp/bench/common/benchmark.hpp b/cpp/bench/common/benchmark.hpp index 13ca40a033..5d7173858a 100644 --- a/cpp/bench/common/benchmark.hpp +++ b/cpp/bench/common/benchmark.hpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include +#include #include +#include #include diff --git a/cpp/bench/random/permute.cu b/cpp/bench/random/permute.cu index 5364bb44e3..11159cddbd 100644 --- a/cpp/bench/random/permute.cu +++ b/cpp/bench/random/permute.cu @@ -15,9 +15,9 @@ */ #include -#include #include #include +#include #include diff --git a/cpp/bench/random/rng.cu b/cpp/bench/random/rng.cu index dab5b119d4..147adf26ae 100644 --- a/cpp/bench/random/rng.cu +++ b/cpp/bench/random/rng.cu @@ -15,8 +15,8 @@ */ #include -#include #include +#include #include diff --git a/cpp/doxygen/Doxyfile.in b/cpp/doxygen/Doxyfile.in index 07056e503d..ee24ff913e 100644 --- a/cpp/doxygen/Doxyfile.in +++ b/cpp/doxygen/Doxyfile.in @@ -887,18 +887,18 @@ EXCLUDE = @CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/linalg/s @CMAKE_CURRENT_SOURCE_DIR@/include/raft/sparse/csr.hpp \ @CMAKE_CURRENT_SOURCE_DIR@/include/raft/linalg/lanczos.cuh \ @CMAKE_CURRENT_SOURCE_DIR@/include/raft/linalg/lanczos.hpp \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/cuda_utils.cuh \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/cudart_utils.h \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/cuda_utils.cuh \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/cudart_utils.hpp \ @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/device_atomics.cuh \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/device_utils.cuh \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/error.hpp \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/handle.hpp \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/integer_utils.h \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/interruptible.hpp \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/mdarray.hpp \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/pow2_utils.cuh \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/span.hpp \ - @CMAKE_CURRENT_SOURCE_DIR@/include/raft/vectorized.cuh \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/device_utils.cuh \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/error.hpp \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/handle.hpp \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/integer_utils.hpp \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/interruptible.hpp \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/mdarray.hpp \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/pow2_utils.cuh \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/span.hpp \ + @CMAKE_CURRENT_SOURCE_DIR@/include/raft/util/vectorized.cuh \ @CMAKE_CURRENT_SOURCE_DIR@/include/raft/raft.hpp \ @CMAKE_CURRENT_SOURCE_DIR@/include/raft/core/cudart_utils.hpp \ @CMAKE_CURRENT_SOURCE_DIR@/include/raft/matrix/math.cuh \ diff --git a/cpp/include/raft/cache/cache_util.cuh b/cpp/include/raft/cache/cache_util.cuh deleted file mode 100644 index 60da09ca7c..0000000000 --- a/cpp/include/raft/cache/cache_util.cuh +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lap.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") - -#include diff --git a/cpp/include/raft/cluster/kmeans_params.hpp b/cpp/include/raft/cluster/kmeans_params.hpp deleted file mode 100644 index a1532d9dd4..0000000000 --- a/cpp/include/raft/cluster/kmeans_params.hpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/cluster/kmeans_types.hpp version instead.") - -#include diff --git a/cpp/include/raft/comms/detail/util.hpp b/cpp/include/raft/comms/detail/util.hpp index 969a8789dd..85084f0eae 100644 --- a/cpp/include/raft/comms/detail/util.hpp +++ b/cpp/include/raft/comms/detail/util.hpp @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include diff --git a/cpp/include/raft/cuda_utils.cuh b/cpp/include/raft/cuda_utils.cuh deleted file mode 100644 index 6ce414aceb..0000000000 --- a/cpp/include/raft/cuda_utils.cuh +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lap.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") - -#include diff --git a/cpp/include/raft/cudart_utils.h b/cpp/include/raft/cudart_utils.h deleted file mode 100644 index 591f41629d..0000000000 --- a/cpp/include/raft/cudart_utils.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use util/cudart_utils.hpp instead. - */ - -#pragma once -#include diff --git a/cpp/include/raft/device_atomics.cuh b/cpp/include/raft/device_atomics.cuh deleted file mode 100644 index a8bfc4d778..0000000000 --- a/cpp/include/raft/device_atomics.cuh +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lap.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") - -#include diff --git a/cpp/include/raft/device_utils.cuh b/cpp/include/raft/device_utils.cuh deleted file mode 100644 index 5e6cf47c7d..0000000000 --- a/cpp/include/raft/device_utils.cuh +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lap.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") - -#include diff --git a/cpp/include/raft/distance/distance.hpp b/cpp/include/raft/distance/distance.hpp deleted file mode 100644 index e5d39be86b..0000000000 --- a/cpp/include/raft/distance/distance.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include \ No newline at end of file diff --git a/cpp/include/raft/distance/fused_l2_nn.hpp b/cpp/include/raft/distance/fused_l2_nn.hpp deleted file mode 100644 index 74ad0974f4..0000000000 --- a/cpp/include/raft/distance/fused_l2_nn.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use fused_l2_nn.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "fused_l2_nn.cuh" diff --git a/cpp/include/raft/distance/specializations.hpp b/cpp/include/raft/distance/specializations.hpp deleted file mode 100644 index 04afb73036..0000000000 --- a/cpp/include/raft/distance/specializations.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use specializations.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "specializations.cuh" diff --git a/cpp/include/raft/error.hpp b/cpp/include/raft/error.hpp deleted file mode 100644 index e109739781..0000000000 --- a/cpp/include/raft/error.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the include/core/error.hpp instead. - */ - -#pragma once -#include \ No newline at end of file diff --git a/cpp/include/raft/handle.hpp b/cpp/include/raft/handle.hpp deleted file mode 100644 index 4525af49d2..0000000000 --- a/cpp/include/raft/handle.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the include/core/handle.hpp instead. - */ - -#pragma once - -#include diff --git a/cpp/include/raft/integer_utils.h b/cpp/include/raft/integer_utils.h deleted file mode 100644 index 8962c3d713..0000000000 --- a/cpp/include/raft/integer_utils.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lap.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") - -#include diff --git a/cpp/include/raft/interruptible.hpp b/cpp/include/raft/interruptible.hpp deleted file mode 100644 index 3071f36531..0000000000 --- a/cpp/include/raft/interruptible.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the include/core/interruptible.hpp instead. - */ - -#pragma once -#include diff --git a/cpp/include/raft/label/classlabels.hpp b/cpp/include/raft/label/classlabels.hpp deleted file mode 100644 index 4f47b426c0..0000000000 --- a/cpp/include/raft/label/classlabels.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use classlabels.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "classlabels.cuh" diff --git a/cpp/include/raft/label/merge_labels.hpp b/cpp/include/raft/label/merge_labels.hpp deleted file mode 100644 index 7c0c25d038..0000000000 --- a/cpp/include/raft/label/merge_labels.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use merge_labels.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "merge_labels.cuh" diff --git a/cpp/include/raft/linalg/add.hpp b/cpp/include/raft/linalg/add.hpp deleted file mode 100644 index e7f9610892..0000000000 --- a/cpp/include/raft/linalg/add.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use add.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "add.cuh" diff --git a/cpp/include/raft/linalg/axpy.hpp b/cpp/include/raft/linalg/axpy.hpp deleted file mode 100644 index 8db4c5a6e8..0000000000 --- a/cpp/include/raft/linalg/axpy.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use axpy.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "axpy.cuh" diff --git a/cpp/include/raft/linalg/binary_op.hpp b/cpp/include/raft/linalg/binary_op.hpp deleted file mode 100644 index f0a54cb164..0000000000 --- a/cpp/include/raft/linalg/binary_op.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use binary_op.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "binary_op.cuh" diff --git a/cpp/include/raft/linalg/cholesky_r1_update.hpp b/cpp/include/raft/linalg/cholesky_r1_update.hpp deleted file mode 100644 index a1967c36cb..0000000000 --- a/cpp/include/raft/linalg/cholesky_r1_update.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use cholesky_r1_update.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "cholesky_r1_update.cuh" diff --git a/cpp/include/raft/linalg/coalesced_reduction.hpp b/cpp/include/raft/linalg/coalesced_reduction.hpp deleted file mode 100644 index 8631a7e5ba..0000000000 --- a/cpp/include/raft/linalg/coalesced_reduction.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use coalesced_reduction.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "coalesced_reduction.cuh" diff --git a/cpp/include/raft/linalg/contractions.hpp b/cpp/include/raft/linalg/contractions.hpp deleted file mode 100644 index 7e5e9be403..0000000000 --- a/cpp/include/raft/linalg/contractions.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use contractions.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "contractions.cuh" diff --git a/cpp/include/raft/linalg/divide.hpp b/cpp/include/raft/linalg/divide.hpp deleted file mode 100644 index 57f4376fcc..0000000000 --- a/cpp/include/raft/linalg/divide.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use divide.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "divide.cuh" diff --git a/cpp/include/raft/linalg/eig.hpp b/cpp/include/raft/linalg/eig.hpp deleted file mode 100644 index 175a2aaccc..0000000000 --- a/cpp/include/raft/linalg/eig.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use eig.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "eig.cuh" diff --git a/cpp/include/raft/linalg/eltwise.hpp b/cpp/include/raft/linalg/eltwise.hpp deleted file mode 100644 index 8931c88241..0000000000 --- a/cpp/include/raft/linalg/eltwise.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use eltwise.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "eltwise.cuh" diff --git a/cpp/include/raft/linalg/gemm.hpp b/cpp/include/raft/linalg/gemm.hpp deleted file mode 100644 index 6ad2f1fbe1..0000000000 --- a/cpp/include/raft/linalg/gemm.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use gemm.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "gemm.cuh" diff --git a/cpp/include/raft/linalg/gemv.hpp b/cpp/include/raft/linalg/gemv.hpp deleted file mode 100644 index 8161631fd3..0000000000 --- a/cpp/include/raft/linalg/gemv.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use gemv.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "gemv.cuh" diff --git a/cpp/include/raft/linalg/init.hpp b/cpp/include/raft/linalg/init.hpp deleted file mode 100644 index 9c59c886c9..0000000000 --- a/cpp/include/raft/linalg/init.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use init.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "init.cuh" diff --git a/cpp/include/raft/linalg/lanczos.hpp b/cpp/include/raft/linalg/lanczos.hpp deleted file mode 100644 index 2141e4e908..0000000000 --- a/cpp/include/raft/linalg/lanczos.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lanczos.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the sparse/solvers version instead.") - -#include diff --git a/cpp/include/raft/linalg/lstsq.hpp b/cpp/include/raft/linalg/lstsq.hpp deleted file mode 100644 index 3dfbea0629..0000000000 --- a/cpp/include/raft/linalg/lstsq.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lstsq.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "lstsq.cuh" diff --git a/cpp/include/raft/linalg/map.hpp b/cpp/include/raft/linalg/map.hpp deleted file mode 100644 index 8321dcebe4..0000000000 --- a/cpp/include/raft/linalg/map.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include "map.cuh" diff --git a/cpp/include/raft/linalg/map_then_reduce.hpp b/cpp/include/raft/linalg/map_then_reduce.hpp deleted file mode 100644 index 6502a84edb..0000000000 --- a/cpp/include/raft/linalg/map_then_reduce.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use map_then_reduce.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "map_then_reduce.cuh" diff --git a/cpp/include/raft/linalg/matrix_vector_op.hpp b/cpp/include/raft/linalg/matrix_vector_op.hpp deleted file mode 100644 index 1237961ceb..0000000000 --- a/cpp/include/raft/linalg/matrix_vector_op.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use matrix_vector_op.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "matrix_vector_op.cuh" diff --git a/cpp/include/raft/linalg/mean_squared_error.hpp b/cpp/include/raft/linalg/mean_squared_error.hpp deleted file mode 100644 index cbb974e516..0000000000 --- a/cpp/include/raft/linalg/mean_squared_error.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use mean_squared_error.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "mean_squared_error.cuh" diff --git a/cpp/include/raft/linalg/multiply.hpp b/cpp/include/raft/linalg/multiply.hpp deleted file mode 100644 index 5aa481a894..0000000000 --- a/cpp/include/raft/linalg/multiply.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use multiply.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "multiply.cuh" diff --git a/cpp/include/raft/linalg/norm.hpp b/cpp/include/raft/linalg/norm.hpp deleted file mode 100644 index b750367f05..0000000000 --- a/cpp/include/raft/linalg/norm.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use norm.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "norm.cuh" diff --git a/cpp/include/raft/linalg/power.hpp b/cpp/include/raft/linalg/power.hpp deleted file mode 100644 index 1e4a56d4fb..0000000000 --- a/cpp/include/raft/linalg/power.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use power.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "power.cuh" diff --git a/cpp/include/raft/linalg/qr.hpp b/cpp/include/raft/linalg/qr.hpp deleted file mode 100644 index f0194ddbf9..0000000000 --- a/cpp/include/raft/linalg/qr.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include "qr.cuh" \ No newline at end of file diff --git a/cpp/include/raft/linalg/reduce.hpp b/cpp/include/raft/linalg/reduce.hpp deleted file mode 100644 index b965cfac7b..0000000000 --- a/cpp/include/raft/linalg/reduce.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use reduce.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "reduce.cuh" diff --git a/cpp/include/raft/linalg/reduce_cols_by_key.hpp b/cpp/include/raft/linalg/reduce_cols_by_key.hpp deleted file mode 100644 index 70851c2b69..0000000000 --- a/cpp/include/raft/linalg/reduce_cols_by_key.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use reduce_cols_by_key.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "reduce_cols_by_key.cuh" diff --git a/cpp/include/raft/linalg/reduce_rows_by_key.hpp b/cpp/include/raft/linalg/reduce_rows_by_key.hpp deleted file mode 100644 index 4b5e76ea8f..0000000000 --- a/cpp/include/raft/linalg/reduce_rows_by_key.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use reduce_rows_by_key.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "reduce_rows_by_key.cuh" diff --git a/cpp/include/raft/linalg/rsvd.hpp b/cpp/include/raft/linalg/rsvd.hpp deleted file mode 100644 index 7e2fffba75..0000000000 --- a/cpp/include/raft/linalg/rsvd.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use rsvd.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "rsvd.cuh" diff --git a/cpp/include/raft/linalg/sqrt.hpp b/cpp/include/raft/linalg/sqrt.hpp deleted file mode 100644 index e0f77f0ab9..0000000000 --- a/cpp/include/raft/linalg/sqrt.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use sqrt.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "sqrt.cuh" diff --git a/cpp/include/raft/linalg/strided_reduction.cuh b/cpp/include/raft/linalg/strided_reduction.cuh index d9c26910e7..f0fcdd77ea 100644 --- a/cpp/include/raft/linalg/strided_reduction.cuh +++ b/cpp/include/raft/linalg/strided_reduction.cuh @@ -22,8 +22,8 @@ #include "detail/strided_reduction.cuh" #include +#include #include -#include #include diff --git a/cpp/include/raft/linalg/strided_reduction.hpp b/cpp/include/raft/linalg/strided_reduction.hpp deleted file mode 100644 index 6720a302ea..0000000000 --- a/cpp/include/raft/linalg/strided_reduction.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use strided_reduction.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "strided_reduction.cuh" diff --git a/cpp/include/raft/linalg/subtract.hpp b/cpp/include/raft/linalg/subtract.hpp deleted file mode 100644 index b0c6508ffe..0000000000 --- a/cpp/include/raft/linalg/subtract.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use subtract.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "subtract.cuh" diff --git a/cpp/include/raft/linalg/svd.hpp b/cpp/include/raft/linalg/svd.hpp deleted file mode 100644 index 26bce80388..0000000000 --- a/cpp/include/raft/linalg/svd.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use svd.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "svd.cuh" diff --git a/cpp/include/raft/linalg/ternary_op.hpp b/cpp/include/raft/linalg/ternary_op.hpp deleted file mode 100644 index 58dab89609..0000000000 --- a/cpp/include/raft/linalg/ternary_op.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use ternary_op.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "ternary_op.cuh" diff --git a/cpp/include/raft/linalg/transpose.hpp b/cpp/include/raft/linalg/transpose.hpp deleted file mode 100644 index 4c3f9224e4..0000000000 --- a/cpp/include/raft/linalg/transpose.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use transpose.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "transpose.cuh" diff --git a/cpp/include/raft/linalg/unary_op.hpp b/cpp/include/raft/linalg/unary_op.hpp deleted file mode 100644 index 2ace126ff1..0000000000 --- a/cpp/include/raft/linalg/unary_op.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use unary_op.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "unary_op.cuh" diff --git a/cpp/include/raft/matrix/col_wise_sort.hpp b/cpp/include/raft/matrix/col_wise_sort.hpp deleted file mode 100644 index 60c36db9e2..0000000000 --- a/cpp/include/raft/matrix/col_wise_sort.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use col_wise_sort.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "col_wise_sort.cuh" diff --git a/cpp/include/raft/mdarray.hpp b/cpp/include/raft/mdarray.hpp deleted file mode 100644 index 4249c35542..0000000000 --- a/cpp/include/raft/mdarray.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use include/core/mdarray.hpp instead. - */ - -#pragma once -#include diff --git a/cpp/include/raft/pow2_utils.cuh b/cpp/include/raft/pow2_utils.cuh deleted file mode 100644 index f1ecabf0eb..0000000000 --- a/cpp/include/raft/pow2_utils.cuh +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lap.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") - -#include diff --git a/cpp/include/raft/random/make_blobs.hpp b/cpp/include/raft/random/make_blobs.hpp deleted file mode 100644 index 372839b500..0000000000 --- a/cpp/include/raft/random/make_blobs.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include "make_blobs.cuh" \ No newline at end of file diff --git a/cpp/include/raft/random/make_regression.cuh b/cpp/include/raft/random/make_regression.cuh index e203de4ade..65e66e131f 100644 --- a/cpp/include/raft/random/make_regression.cuh +++ b/cpp/include/raft/random/make_regression.cuh @@ -25,7 +25,7 @@ #include #include -#include +#include #include "detail/make_regression.cuh" diff --git a/cpp/include/raft/random/make_regression.hpp b/cpp/include/raft/random/make_regression.hpp deleted file mode 100644 index f3e2113f80..0000000000 --- a/cpp/include/raft/random/make_regression.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use make_regression.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "make_regression.cuh" diff --git a/cpp/include/raft/random/multi_variable_gaussian.hpp b/cpp/include/raft/random/multi_variable_gaussian.hpp deleted file mode 100644 index e7d78938a2..0000000000 --- a/cpp/include/raft/random/multi_variable_gaussian.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use multi_variable_gaussian.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "multi_variable_gaussian.cuh" diff --git a/cpp/include/raft/random/permute.hpp b/cpp/include/raft/random/permute.hpp deleted file mode 100644 index a2fafa6574..0000000000 --- a/cpp/include/raft/random/permute.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use permute.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "permute.cuh" diff --git a/cpp/include/raft/random/rng.hpp b/cpp/include/raft/random/rng.hpp deleted file mode 100644 index 24b88612d8..0000000000 --- a/cpp/include/raft/random/rng.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use rng.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "rng.cuh" diff --git a/cpp/include/raft/span.hpp b/cpp/include/raft/span.hpp deleted file mode 100644 index 5462f45618..0000000000 --- a/cpp/include/raft/span.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use include/core/span.hpp instead. - */ - -#pragma once -#include \ No newline at end of file diff --git a/cpp/include/raft/sparse/convert/coo.hpp b/cpp/include/raft/sparse/convert/coo.hpp deleted file mode 100644 index 1c8a2625c7..0000000000 --- a/cpp/include/raft/sparse/convert/coo.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "coo.cuh" diff --git a/cpp/include/raft/sparse/convert/csr.hpp b/cpp/include/raft/sparse/convert/csr.hpp deleted file mode 100644 index 250c6855d0..0000000000 --- a/cpp/include/raft/sparse/convert/csr.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use csr.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "csr.cuh" diff --git a/cpp/include/raft/sparse/convert/dense.hpp b/cpp/include/raft/sparse/convert/dense.hpp deleted file mode 100644 index 2d2c527e7e..0000000000 --- a/cpp/include/raft/sparse/convert/dense.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "dense.cuh" diff --git a/cpp/include/raft/sparse/distance/distance.hpp b/cpp/include/raft/sparse/distance/distance.hpp deleted file mode 100644 index 86d4db81d2..0000000000 --- a/cpp/include/raft/sparse/distance/distance.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include \ No newline at end of file diff --git a/cpp/include/raft/sparse/hierarchy/single_linkage.hpp b/cpp/include/raft/sparse/hierarchy/single_linkage.hpp deleted file mode 100644 index 72fe2e51a5..0000000000 --- a/cpp/include/raft/sparse/hierarchy/single_linkage.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/cluster version instead.") - -#include diff --git a/cpp/include/raft/sparse/linalg/add.hpp b/cpp/include/raft/sparse/linalg/add.hpp deleted file mode 100644 index e6930eaee7..0000000000 --- a/cpp/include/raft/sparse/linalg/add.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use add.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "add.cuh" diff --git a/cpp/include/raft/sparse/linalg/degree.hpp b/cpp/include/raft/sparse/linalg/degree.hpp deleted file mode 100644 index 240cfd452f..0000000000 --- a/cpp/include/raft/sparse/linalg/degree.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use degree.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "degree.cuh" diff --git a/cpp/include/raft/sparse/linalg/norm.hpp b/cpp/include/raft/sparse/linalg/norm.hpp deleted file mode 100644 index 64261f1178..0000000000 --- a/cpp/include/raft/sparse/linalg/norm.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use norm.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "norm.cuh" diff --git a/cpp/include/raft/sparse/linalg/spectral.hpp b/cpp/include/raft/sparse/linalg/spectral.hpp deleted file mode 100644 index d7009db03f..0000000000 --- a/cpp/include/raft/sparse/linalg/spectral.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use spectral.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "spectral.cuh" diff --git a/cpp/include/raft/sparse/linalg/symmetrize.hpp b/cpp/include/raft/sparse/linalg/symmetrize.hpp deleted file mode 100644 index 6e1d3b4fa1..0000000000 --- a/cpp/include/raft/sparse/linalg/symmetrize.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include diff --git a/cpp/include/raft/sparse/linalg/transpose.hpp b/cpp/include/raft/sparse/linalg/transpose.hpp deleted file mode 100644 index a6a0539319..0000000000 --- a/cpp/include/raft/sparse/linalg/transpose.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use transpose.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "transpose.cuh" diff --git a/cpp/include/raft/sparse/op/filter.hpp b/cpp/include/raft/sparse/op/filter.hpp deleted file mode 100644 index 6a59148fd7..0000000000 --- a/cpp/include/raft/sparse/op/filter.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use filter.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "filter.cuh" diff --git a/cpp/include/raft/sparse/op/reduce.hpp b/cpp/include/raft/sparse/op/reduce.hpp deleted file mode 100644 index 37923e070c..0000000000 --- a/cpp/include/raft/sparse/op/reduce.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use reduce.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "reduce.cuh" diff --git a/cpp/include/raft/sparse/op/row_op.hpp b/cpp/include/raft/sparse/op/row_op.hpp deleted file mode 100644 index 8443f9f090..0000000000 --- a/cpp/include/raft/sparse/op/row_op.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use row_op.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "row_op.cuh" diff --git a/cpp/include/raft/sparse/op/slice.hpp b/cpp/include/raft/sparse/op/slice.hpp deleted file mode 100644 index 4d7e1858de..0000000000 --- a/cpp/include/raft/sparse/op/slice.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use slice.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "slice.cuh" diff --git a/cpp/include/raft/sparse/op/sort.hpp b/cpp/include/raft/sparse/op/sort.hpp deleted file mode 100644 index 867bb1bf35..0000000000 --- a/cpp/include/raft/sparse/op/sort.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use sort.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "sort.cuh" diff --git a/cpp/include/raft/sparse/selection/connect_components.hpp b/cpp/include/raft/sparse/selection/connect_components.hpp deleted file mode 100644 index 393ed2d4e2..0000000000 --- a/cpp/include/raft/sparse/selection/connect_components.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use connect_components.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the sparse/spatial version instead.") - -#include "connect_components.cuh" diff --git a/cpp/include/raft/sparse/selection/knn.hpp b/cpp/include/raft/sparse/selection/knn.hpp deleted file mode 100644 index cd5e7b1fa3..0000000000 --- a/cpp/include/raft/sparse/selection/knn.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use knn.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the sparse/spatial version instead.") - -#include "knn.cuh" diff --git a/cpp/include/raft/sparse/selection/knn_graph.hpp b/cpp/include/raft/sparse/selection/knn_graph.hpp deleted file mode 100644 index e8236b1732..0000000000 --- a/cpp/include/raft/sparse/selection/knn_graph.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use knn_graph.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the sparse/spatial version instead.") - -#include "knn_graph.cuh" diff --git a/cpp/include/raft/spatial/knn/ann.hpp b/cpp/include/raft/spatial/knn/ann.hpp deleted file mode 100644 index 516435271d..0000000000 --- a/cpp/include/raft/spatial/knn/ann.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "ann.cuh" diff --git a/cpp/include/raft/spatial/knn/ball_cover.hpp b/cpp/include/raft/spatial/knn/ball_cover.hpp deleted file mode 100644 index fd09426594..0000000000 --- a/cpp/include/raft/spatial/knn/ball_cover.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.08. - * Please use the cuh version instead. - */ - -#pragma once - -#include diff --git a/cpp/include/raft/spatial/knn/ball_cover_common.h b/cpp/include/raft/spatial/knn/ball_cover_common.h deleted file mode 100644 index 9b775bbb82..0000000000 --- a/cpp/include/raft/spatial/knn/ball_cover_common.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the ball_cover_types.hpp version instead.") - -#include diff --git a/cpp/include/raft/spatial/knn/epsilon_neighborhood.hpp b/cpp/include/raft/spatial/knn/epsilon_neighborhood.hpp deleted file mode 100644 index 1f1a3d8f8e..0000000000 --- a/cpp/include/raft/spatial/knn/epsilon_neighborhood.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use epsilon_neighborhood.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "epsilon_neighborhood.cuh" diff --git a/cpp/include/raft/spatial/knn/knn.hpp b/cpp/include/raft/spatial/knn/knn.hpp deleted file mode 100644 index 08a6378f54..0000000000 --- a/cpp/include/raft/spatial/knn/knn.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in release 22.06." \ - " Please use the cuh version instead.") - -#include "knn.cuh" diff --git a/cpp/include/raft/spatial/knn/specializations.hpp b/cpp/include/raft/spatial/knn/specializations.hpp deleted file mode 100644 index 04afb73036..0000000000 --- a/cpp/include/raft/spatial/knn/specializations.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use specializations.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "specializations.cuh" diff --git a/cpp/include/raft/spectral/cluster_solvers.hpp b/cpp/include/raft/spectral/cluster_solvers.hpp deleted file mode 100644 index 8709d10026..0000000000 --- a/cpp/include/raft/spectral/cluster_solvers.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include \ No newline at end of file diff --git a/cpp/include/raft/spectral/eigen_solvers.hpp b/cpp/include/raft/spectral/eigen_solvers.hpp deleted file mode 100644 index 57553daedf..0000000000 --- a/cpp/include/raft/spectral/eigen_solvers.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use eigen_solvers.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "eigen_solvers.cuh" diff --git a/cpp/include/raft/spectral/modularity_maximization.hpp b/cpp/include/raft/spectral/modularity_maximization.hpp deleted file mode 100644 index 1bc003e711..0000000000 --- a/cpp/include/raft/spectral/modularity_maximization.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include \ No newline at end of file diff --git a/cpp/include/raft/spectral/partition.hpp b/cpp/include/raft/spectral/partition.hpp deleted file mode 100644 index 27f204d055..0000000000 --- a/cpp/include/raft/spectral/partition.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include diff --git a/cpp/include/raft/stats/accuracy.hpp b/cpp/include/raft/stats/accuracy.hpp deleted file mode 100644 index a1b7321879..0000000000 --- a/cpp/include/raft/stats/accuracy.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use accuracy.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "accuracy.cuh" diff --git a/cpp/include/raft/stats/adjusted_rand_index.hpp b/cpp/include/raft/stats/adjusted_rand_index.hpp deleted file mode 100644 index 3a990ac985..0000000000 --- a/cpp/include/raft/stats/adjusted_rand_index.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use adjusted_rand_index.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "adjusted_rand_index.cuh" diff --git a/cpp/include/raft/stats/common.hpp b/cpp/include/raft/stats/common.hpp deleted file mode 100644 index 724ca224c6..0000000000 --- a/cpp/include/raft/stats/common.hpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/stats/stats_types.hpp version instead.") - -#include diff --git a/cpp/include/raft/stats/completeness_score.hpp b/cpp/include/raft/stats/completeness_score.hpp deleted file mode 100644 index 40e60c852c..0000000000 --- a/cpp/include/raft/stats/completeness_score.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -#pragma once - -#include \ No newline at end of file diff --git a/cpp/include/raft/stats/contingency_matrix.hpp b/cpp/include/raft/stats/contingency_matrix.hpp deleted file mode 100644 index 141f678f94..0000000000 --- a/cpp/include/raft/stats/contingency_matrix.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use contingency_matrix.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "contingency_matrix.cuh" diff --git a/cpp/include/raft/stats/cov.hpp b/cpp/include/raft/stats/cov.hpp deleted file mode 100644 index a6c653206a..0000000000 --- a/cpp/include/raft/stats/cov.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use cov.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "cov.cuh" diff --git a/cpp/include/raft/stats/detail/dispersion.cuh b/cpp/include/raft/stats/detail/dispersion.cuh index bca48045da..384322bf9d 100644 --- a/cpp/include/raft/stats/detail/dispersion.cuh +++ b/cpp/include/raft/stats/detail/dispersion.cuh @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/cpp/include/raft/stats/detail/mutual_info_score.cuh b/cpp/include/raft/stats/detail/mutual_info_score.cuh index 10bc0f5599..806466791f 100644 --- a/cpp/include/raft/stats/detail/mutual_info_score.cuh +++ b/cpp/include/raft/stats/detail/mutual_info_score.cuh @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/cpp/include/raft/stats/detail/rand_index.cuh b/cpp/include/raft/stats/detail/rand_index.cuh index 1e66216929..9af6dd6097 100644 --- a/cpp/include/raft/stats/detail/rand_index.cuh +++ b/cpp/include/raft/stats/detail/rand_index.cuh @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include #include diff --git a/cpp/include/raft/stats/dispersion.hpp b/cpp/include/raft/stats/dispersion.hpp deleted file mode 100644 index 820c9e27ea..0000000000 --- a/cpp/include/raft/stats/dispersion.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use dispersion.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "dispersion.cuh" diff --git a/cpp/include/raft/stats/entropy.hpp b/cpp/include/raft/stats/entropy.hpp deleted file mode 100644 index d8e1c11125..0000000000 --- a/cpp/include/raft/stats/entropy.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use entropy.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "entropy.cuh" diff --git a/cpp/include/raft/stats/histogram.hpp b/cpp/include/raft/stats/histogram.hpp deleted file mode 100644 index c123375597..0000000000 --- a/cpp/include/raft/stats/histogram.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use histogram.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "histogram.cuh" diff --git a/cpp/include/raft/stats/homogeneity_score.hpp b/cpp/include/raft/stats/homogeneity_score.hpp deleted file mode 100644 index 8d2433d1da..0000000000 --- a/cpp/include/raft/stats/homogeneity_score.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use homogeneity_score.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "homogeneity_score.cuh" diff --git a/cpp/include/raft/stats/information_criterion.hpp b/cpp/include/raft/stats/information_criterion.hpp deleted file mode 100644 index 898ffbfa8e..0000000000 --- a/cpp/include/raft/stats/information_criterion.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use information_criterion.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "information_criterion.cuh" diff --git a/cpp/include/raft/stats/kl_divergence.hpp b/cpp/include/raft/stats/kl_divergence.hpp deleted file mode 100644 index 086d5f1d23..0000000000 --- a/cpp/include/raft/stats/kl_divergence.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use kl_divergence.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "kl_divergence.cuh" diff --git a/cpp/include/raft/stats/mean.hpp b/cpp/include/raft/stats/mean.hpp deleted file mode 100644 index bce899d9d4..0000000000 --- a/cpp/include/raft/stats/mean.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use mean.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "mean.cuh" diff --git a/cpp/include/raft/stats/mean_center.hpp b/cpp/include/raft/stats/mean_center.hpp deleted file mode 100644 index 73e49e7307..0000000000 --- a/cpp/include/raft/stats/mean_center.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use mean_center.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "mean_center.cuh" diff --git a/cpp/include/raft/stats/meanvar.hpp b/cpp/include/raft/stats/meanvar.hpp deleted file mode 100644 index db67a68579..0000000000 --- a/cpp/include/raft/stats/meanvar.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use meanvar.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "meanvar.cuh" diff --git a/cpp/include/raft/stats/minmax.hpp b/cpp/include/raft/stats/minmax.hpp deleted file mode 100644 index ad588a38d4..0000000000 --- a/cpp/include/raft/stats/minmax.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use minmax.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "minmax.cuh" diff --git a/cpp/include/raft/stats/mutual_info_score.hpp b/cpp/include/raft/stats/mutual_info_score.hpp deleted file mode 100644 index c3446e3963..0000000000 --- a/cpp/include/raft/stats/mutual_info_score.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use mutual_info_score.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "mutual_info_score.cuh" diff --git a/cpp/include/raft/stats/r2_score.hpp b/cpp/include/raft/stats/r2_score.hpp deleted file mode 100644 index bc55a6596d..0000000000 --- a/cpp/include/raft/stats/r2_score.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use r2_score.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "r2_score.cuh" diff --git a/cpp/include/raft/stats/rand_index.hpp b/cpp/include/raft/stats/rand_index.hpp deleted file mode 100644 index 7d398dddb4..0000000000 --- a/cpp/include/raft/stats/rand_index.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use rand_index.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "rand_index.cuh" diff --git a/cpp/include/raft/stats/regression_metrics.hpp b/cpp/include/raft/stats/regression_metrics.hpp deleted file mode 100644 index 084f4f8fbc..0000000000 --- a/cpp/include/raft/stats/regression_metrics.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use regression_metrics.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "regression_metrics.cuh" diff --git a/cpp/include/raft/stats/silhouette_score.hpp b/cpp/include/raft/stats/silhouette_score.hpp deleted file mode 100644 index 54981edbb6..0000000000 --- a/cpp/include/raft/stats/silhouette_score.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use silhouette_score.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "silhouette_score.cuh" diff --git a/cpp/include/raft/stats/specializations.hpp b/cpp/include/raft/stats/specializations.hpp deleted file mode 100644 index 0ae82f27e7..0000000000 --- a/cpp/include/raft/stats/specializations.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use specializations.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "specializations.cuh" diff --git a/cpp/include/raft/stats/stddev.hpp b/cpp/include/raft/stats/stddev.hpp deleted file mode 100644 index 2222a2706d..0000000000 --- a/cpp/include/raft/stats/stddev.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use stddev.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "stddev.cuh" diff --git a/cpp/include/raft/stats/sum.hpp b/cpp/include/raft/stats/sum.hpp deleted file mode 100644 index 0b11a6219e..0000000000 --- a/cpp/include/raft/stats/sum.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use sum.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "sum.cuh" diff --git a/cpp/include/raft/stats/trustworthiness_score.hpp b/cpp/include/raft/stats/trustworthiness_score.hpp deleted file mode 100644 index 0053860a92..0000000000 --- a/cpp/include/raft/stats/trustworthiness_score.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use trustworthiness_score.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "trustworthiness_score.cuh" diff --git a/cpp/include/raft/stats/v_measure.hpp b/cpp/include/raft/stats/v_measure.hpp deleted file mode 100644 index 0179d2c856..0000000000 --- a/cpp/include/raft/stats/v_measure.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use v_measure.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "v_measure.cuh" diff --git a/cpp/include/raft/stats/weighted_mean.hpp b/cpp/include/raft/stats/weighted_mean.hpp deleted file mode 100644 index 8bc4bf4623..0000000000 --- a/cpp/include/raft/stats/weighted_mean.hpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use weighted_mean.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") - -#include "weighted_mean.cuh" diff --git a/cpp/include/raft/vectorized.cuh b/cpp/include/raft/vectorized.cuh deleted file mode 100644 index a472ee6191..0000000000 --- a/cpp/include/raft/vectorized.cuh +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the cuh version instead. - */ - -/** - * DISCLAIMER: this file is deprecated: use lap.cuh instead - */ - -#pragma once - -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") - -#include diff --git a/cpp/src/distance/cluster/cluster_cost.cuh b/cpp/src/distance/cluster/cluster_cost.cuh index 4f208ab1cd..828e5a13fe 100644 --- a/cpp/src/distance/cluster/cluster_cost.cuh +++ b/cpp/src/distance/cluster/cluster_cost.cuh @@ -15,10 +15,10 @@ */ #include +#include #include #include #include -#include #include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/cluster/cluster_cost_double.cu b/cpp/src/distance/cluster/cluster_cost_double.cu index 8fffa4eee0..6a516ace8e 100644 --- a/cpp/src/distance/cluster/cluster_cost_double.cu +++ b/cpp/src/distance/cluster/cluster_cost_double.cu @@ -15,9 +15,9 @@ */ #include "cluster_cost.cuh" +#include #include #include -#include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/cluster/cluster_cost_float.cu b/cpp/src/distance/cluster/cluster_cost_float.cu index 7f2cd9a485..4edd05f512 100644 --- a/cpp/src/distance/cluster/cluster_cost_float.cu +++ b/cpp/src/distance/cluster/cluster_cost_float.cu @@ -15,9 +15,9 @@ */ #include "cluster_cost.cuh" +#include #include #include -#include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/cluster/kmeans_fit_double.cu b/cpp/src/distance/cluster/kmeans_fit_double.cu index 2989941d85..8fd0594be0 100644 --- a/cpp/src/distance/cluster/kmeans_fit_double.cu +++ b/cpp/src/distance/cluster/kmeans_fit_double.cu @@ -15,8 +15,8 @@ */ #include +#include #include -#include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/cluster/kmeans_fit_float.cu b/cpp/src/distance/cluster/kmeans_fit_float.cu index 0e10ab30a4..9fc3a3d0cc 100644 --- a/cpp/src/distance/cluster/kmeans_fit_float.cu +++ b/cpp/src/distance/cluster/kmeans_fit_float.cu @@ -15,8 +15,8 @@ */ #include +#include #include -#include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/cluster/update_centroids.cuh b/cpp/src/distance/cluster/update_centroids.cuh index 035f597523..5b8e0f90fd 100644 --- a/cpp/src/distance/cluster/update_centroids.cuh +++ b/cpp/src/distance/cluster/update_centroids.cuh @@ -15,9 +15,9 @@ */ #include +#include #include #include -#include #include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/cluster/update_centroids_double.cu b/cpp/src/distance/cluster/update_centroids_double.cu index 85c4953150..f5ecf3c368 100644 --- a/cpp/src/distance/cluster/update_centroids_double.cu +++ b/cpp/src/distance/cluster/update_centroids_double.cu @@ -15,9 +15,9 @@ */ #include "update_centroids.cuh" +#include #include #include -#include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/cluster/update_centroids_float.cu b/cpp/src/distance/cluster/update_centroids_float.cu index aaad2bc3e4..53d27e9de4 100644 --- a/cpp/src/distance/cluster/update_centroids_float.cu +++ b/cpp/src/distance/cluster/update_centroids_float.cu @@ -15,9 +15,9 @@ */ #include "update_centroids.cuh" +#include #include #include -#include namespace raft::runtime::cluster::kmeans { diff --git a/cpp/src/distance/distance/pairwise_distance.cu b/cpp/src/distance/distance/pairwise_distance.cu index cbdd5cd8f2..12d1244f77 100644 --- a/cpp/src/distance/distance/pairwise_distance.cu +++ b/cpp/src/distance/distance/pairwise_distance.cu @@ -14,10 +14,10 @@ * limitations under the License. */ +#include #include #include #include -#include namespace raft::runtime::distance { diff --git a/cpp/test/core/interruptible.cu b/cpp/test/core/interruptible.cu index f54bb6f859..39e76e07ad 100644 --- a/cpp/test/core/interruptible.cu +++ b/cpp/test/core/interruptible.cu @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cpp/test/core/test_span.hpp b/cpp/test/core/test_span.hpp index 27c50e9695..04890dd138 100644 --- a/cpp/test/core/test_span.hpp +++ b/cpp/test/core/test_span.hpp @@ -14,7 +14,7 @@ * limitations under the License. */ #pragma once -#include +#include namespace raft { diff --git a/cpp/test/distance/distance_base.cuh b/cpp/test/distance/distance_base.cuh index cbfd97ebc6..1cd3615788 100644 --- a/cpp/test/distance/distance_base.cuh +++ b/cpp/test/distance/distance_base.cuh @@ -17,9 +17,9 @@ #include "../test_utils.cuh" #include #include +#include #include #include -#include #include #include #if defined RAFT_DISTANCE_COMPILED diff --git a/cpp/test/linalg/reduce_cols_by_key.cu b/cpp/test/linalg/reduce_cols_by_key.cu index 3870bfb830..e52f306732 100644 --- a/cpp/test/linalg/reduce_cols_by_key.cu +++ b/cpp/test/linalg/reduce_cols_by_key.cu @@ -16,7 +16,7 @@ #include "../test_utils.cuh" #include -#include +#include #include #include #include diff --git a/cpp/test/stats/accuracy.cu b/cpp/test/stats/accuracy.cu index eaccdecab4..e7f9cfffc7 100644 --- a/cpp/test/stats/accuracy.cu +++ b/cpp/test/stats/accuracy.cu @@ -17,7 +17,7 @@ #include "../test_utils.cuh" #include #include -#include +#include #include #include #include diff --git a/cpp/test/stats/contingencyMatrix.cu b/cpp/test/stats/contingencyMatrix.cu index d27114388e..75c4c3c1c3 100644 --- a/cpp/test/stats/contingencyMatrix.cu +++ b/cpp/test/stats/contingencyMatrix.cu @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cpp/test/stats/dispersion.cu b/cpp/test/stats/dispersion.cu index e414fcf5f4..4319e9633b 100644 --- a/cpp/test/stats/dispersion.cu +++ b/cpp/test/stats/dispersion.cu @@ -17,7 +17,7 @@ #include "../test_utils.cuh" #include #include -#include +#include #include #include #include diff --git a/cpp/test/stats/entropy.cu b/cpp/test/stats/entropy.cu index 96b2b9f590..26d0a64301 100644 --- a/cpp/test/stats/entropy.cu +++ b/cpp/test/stats/entropy.cu @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cpp/test/stats/histogram.cu b/cpp/test/stats/histogram.cu index 76677ac27c..c5c22d4129 100644 --- a/cpp/test/stats/histogram.cu +++ b/cpp/test/stats/histogram.cu @@ -16,7 +16,7 @@ #include "../test_utils.cuh" #include -#include +#include #include #include #include diff --git a/cpp/test/stats/r2_score.cu b/cpp/test/stats/r2_score.cu index 7fb15505ab..f01714e693 100644 --- a/cpp/test/stats/r2_score.cu +++ b/cpp/test/stats/r2_score.cu @@ -17,7 +17,7 @@ #include "../test_utils.cuh" #include #include -#include +#include #include #include #include diff --git a/cpp/test/stats/regression_metrics.cu b/cpp/test/stats/regression_metrics.cu index b3e0df32f8..1fd992d37f 100644 --- a/cpp/test/stats/regression_metrics.cu +++ b/cpp/test/stats/regression_metrics.cu @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include From fcc0ab9b158903d824f634aabfc1bdf36e93dbe5 Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Mon, 16 Jan 2023 18:37:45 +0100 Subject: [PATCH 2/7] Fix include --- cpp/bench/cluster/kmeans.cu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/bench/cluster/kmeans.cu b/cpp/bench/cluster/kmeans.cu index 374610e45b..76b16cfe56 100644 --- a/cpp/bench/cluster/kmeans.cu +++ b/cpp/bench/cluster/kmeans.cu @@ -16,7 +16,7 @@ #include #include -#include +#include #if defined RAFT_DISTANCE_COMPILED #include From 5068c724ac8e1f50a76964ca5c97ff724d3f4733 Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Mon, 6 Feb 2023 19:09:54 +0100 Subject: [PATCH 3/7] Remove raft/handle.hpp --- cpp/include/raft/handle.hpp | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 cpp/include/raft/handle.hpp diff --git a/cpp/include/raft/handle.hpp b/cpp/include/raft/handle.hpp deleted file mode 100644 index dbf44c8cc6..0000000000 --- a/cpp/include/raft/handle.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This file is deprecated and will be removed in release 22.06. - * Please use the include/core/handle.hpp instead. - */ - -#pragma once - -#include From 88cecd4e7c9c4fbba99a32127fd4842b017a1ab2 Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Mon, 6 Feb 2023 19:21:32 +0100 Subject: [PATCH 4/7] Revert Pin of branch-23.02 This reverts commit bd0d86b04dd761e4010f5b33261d1de140e61822. --- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- ci/gpu/build.sh | 4 ++-- conda/recipes/raft-dask/meta.yaml | 4 ++-- python/raft-dask/setup.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 03b66debb8..6ce6c2898b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -90,7 +90,7 @@ jobs: build_type: pull-request package-name: raft_dask # Always want to test against latest dask/distributed. - test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" - test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" + test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" + test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test" test-smoketest: "python ./ci/wheel_smoke_test_raft_dask.py" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 739f50861e..56441f681d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -51,6 +51,6 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} package-name: raft_dask - test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" - test-before-arm64: "pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" + test-before-amd64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" + test-before-arm64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test" diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index f5edba58f8..84026203fa 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -41,10 +41,10 @@ unset GIT_DESCRIBE_TAG export UCX_PY_VERSION='0.31.*' # Whether to install dask nightly or stable packages. -export INSTALL_DASK_MAIN=0 +export INSTALL_DASK_MAIN=1 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2023.1.1" +export DASK_STABLE_VERSION="2022.12.0" ################################################################################ # SETUP - Check environment diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index daab2fa2fd..038139aa48 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -46,9 +46,9 @@ requirements: run: - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - cuda-python >=11.7.1,<12.0 - - dask ==2023.1.1 + - dask >=2022.12.0 - dask-cuda ={{ minor_version }} - - distributed ==2023.1.1 + - distributed >=2022.12.0 - joblib >=0.11 - nccl >=2.9.9 - pylibraft {{ version }} diff --git a/python/raft-dask/setup.py b/python/raft-dask/setup.py index 5feddb626e..3299ea9bc5 100644 --- a/python/raft-dask/setup.py +++ b/python/raft-dask/setup.py @@ -27,9 +27,9 @@ "numba>=0.49", "joblib>=0.11", "dask-cuda==23.2.*", - "dask==2023.1.1", + "dask>=2022.12.0", f"ucx-py{cuda_suffix}==0.30.*", - "distributed==2023.1.1", + "distributed>=2022.12.0", f"pylibraft{cuda_suffix}==23.2.*", ] From 3d0348e9ba88da72f7945e96b2a1e9cde87d6cc8 Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Mon, 6 Feb 2023 19:32:34 +0100 Subject: [PATCH 5/7] Use device_resources header in strided_reduction --- cpp/include/raft/linalg/strided_reduction.cuh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/include/raft/linalg/strided_reduction.cuh b/cpp/include/raft/linalg/strided_reduction.cuh index fbb7c05fd9..f58dfe28b3 100644 --- a/cpp/include/raft/linalg/strided_reduction.cuh +++ b/cpp/include/raft/linalg/strided_reduction.cuh @@ -22,7 +22,7 @@ #include "detail/strided_reduction.cuh" #include -#include +#include #include #include From a9d44c36216ae4fdd9a236517c62557c25922bd0 Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Mon, 6 Feb 2023 23:17:54 +0100 Subject: [PATCH 6/7] Update bitonic --- cpp/include/raft/matrix/detail/gather.cuh | 2 +- cpp/test/util/bitonic_sort.cu | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cpp/include/raft/matrix/detail/gather.cuh b/cpp/include/raft/matrix/detail/gather.cuh index f6dc60bf85..7bd30e5bc6 100644 --- a/cpp/include/raft/matrix/detail/gather.cuh +++ b/cpp/include/raft/matrix/detail/gather.cuh @@ -17,7 +17,7 @@ #pragma once #include -#include +#include namespace raft { namespace matrix { diff --git a/cpp/test/util/bitonic_sort.cu b/cpp/test/util/bitonic_sort.cu index f45e8ce1e0..2eb7e6da8b 100644 --- a/cpp/test/util/bitonic_sort.cu +++ b/cpp/test/util/bitonic_sort.cu @@ -16,10 +16,9 @@ #include "../test_utils.cuh" +#include #include - -#include -#include +#include #include From 8d3ed5b3083925021336a9680fc86b59e8c9e639 Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Fri, 10 Feb 2023 23:46:30 +0100 Subject: [PATCH 7/7] Fix style --- cpp/bench/distance/masked_nn.cu | 2 +- cpp/include/raft/distance/masked_nn.cuh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/bench/distance/masked_nn.cu b/cpp/bench/distance/masked_nn.cu index 2ae8a00256..30ad3f7168 100644 --- a/cpp/bench/distance/masked_nn.cu +++ b/cpp/bench/distance/masked_nn.cu @@ -24,8 +24,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/cpp/include/raft/distance/masked_nn.cuh b/cpp/include/raft/distance/masked_nn.cuh index c9e595c1bb..772e9de134 100644 --- a/cpp/include/raft/distance/masked_nn.cuh +++ b/cpp/include/raft/distance/masked_nn.cuh @@ -20,9 +20,9 @@ #pragma once #include +#include #include #include -#include #include #include