From bc732c09c86ec4e25fe16e2419c6fd7123f0be22 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Thu, 20 Apr 2023 21:50:19 +0200 Subject: [PATCH 1/8] Remove usage of rapids-get-rapids-version-from-git (#1436) Instead of using `rapids-get-rapids-version-from-git` we can just hardcode the version and use `update-version.sh` to update it Authors: - Jordan Jacobelli (https://github.com/jjacobelli) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) URL: https://github.com/rapidsai/raft/pull/1436 --- ci/build_docs.sh | 2 +- ci/release/update-version.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 5db6fa11be..e52beb22ea 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -19,7 +19,7 @@ rapids-print-env rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) -VERSION_NUMBER=$(rapids-get-rapids-version-from-git) +VERSION_NUMBER="23.06" rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index d8c22b4931..f6c6b08644 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -80,6 +80,7 @@ sed_runner "s/ucx-py.*\",/ucx-py==${NEXT_UCX_PY_SHORT_TAG_PEP440}.*\",/g" python for FILE in .github/workflows/*.yaml; do sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" done +sed_runner "s/VERSION_NUMBER=\".*/VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh sed_runner "/^PROJECT_NUMBER/ s|\".*\"|\"${NEXT_SHORT_TAG}\"|g" cpp/doxygen/Doxyfile From 0ac32e181f32302537c5056e215cd5d99635a742 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 20 Apr 2023 17:36:42 -0400 Subject: [PATCH 2/8] The glog project root CMakeLists.txt is where we should build from (#1442) Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Corey J. Nolet (https://github.com/cjnolet) URL: https://github.com/rapidsai/raft/pull/1442 --- cpp/cmake/thirdparty/get_glog.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_glog.cmake b/cpp/cmake/thirdparty/get_glog.cmake index 9334224de5..35a9170f99 100644 --- a/cpp/cmake/thirdparty/get_glog.cmake +++ b/cpp/cmake/thirdparty/get_glog.cmake @@ -26,7 +26,6 @@ function(find_and_configure_glog) CPM_ARGS GIT_REPOSITORY https://github.com/${PKG_FORK}/glog.git GIT_TAG ${PKG_PINNED_TAG} - SOURCE_SUBDIR cpp EXCLUDE_FROM_ALL ${PKG_EXCLUDE_FROM_ALL} ) @@ -46,4 +45,4 @@ find_and_configure_glog(VERSION 0.6.0 FORK google PINNED_TAG v0.6.0 EXCLUDE_FROM_ALL ON - ) \ No newline at end of file + ) From c0c4d52c5a72c494e070f42324fc80b3a7cda205 Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Sun, 23 Apr 2023 16:12:39 -0700 Subject: [PATCH 3/8] fix ivf_pq n_probes (#1456) The ivf-pq search code was including a guard like ```auto n_probes = std::min(params.n_probes, index.n_lists());``` to check to make sure that we weren't selecting more values than are available. However, this wasn't being used and instead just `params.n_probes` was being passed to functions like `select_k`. This lead to asking select_k to select say 100 items, when there were only 90 to choose from - and caused some issues downstream when trying to update the select_k algorithm Fix. Authors: - Ben Frederickson (https://github.com/benfred) Approvers: - Micka (https://github.com/lowener) - Tamas Bela Feher (https://github.com/tfeher) URL: https://github.com/rapidsai/raft/pull/1456 --- cpp/include/raft/neighbors/detail/ivf_pq_search.cuh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/include/raft/neighbors/detail/ivf_pq_search.cuh b/cpp/include/raft/neighbors/detail/ivf_pq_search.cuh index 4b6e6f5e31..9a94458748 100644 --- a/cpp/include/raft/neighbors/detail/ivf_pq_search.cuh +++ b/cpp/include/raft/neighbors/detail/ivf_pq_search.cuh @@ -1613,7 +1613,7 @@ inline void search(raft::device_resources const& handle, rmm::device_uvector float_queries(max_queries * dim_ext, stream, mr); rmm::device_uvector rot_queries(max_queries * index.rot_dim(), stream, mr); - rmm::device_uvector clusters_to_probe(max_queries * params.n_probes, stream, mr); + rmm::device_uvector clusters_to_probe(max_queries * n_probes, stream, mr); auto search_instance = ivfpq_search::fun(params, index.metric()); @@ -1624,7 +1624,7 @@ inline void search(raft::device_resources const& handle, clusters_to_probe.data(), float_queries.data(), queries_batch, - params.n_probes, + n_probes, index.n_lists(), dim, dim_ext, @@ -1661,10 +1661,10 @@ inline void search(raft::device_resources const& handle, search_instance(handle, index, max_samples, - params.n_probes, + n_probes, k, batch_size, - clusters_to_probe.data() + uint64_t(params.n_probes) * offset_b, + clusters_to_probe.data() + uint64_t(n_probes) * offset_b, rot_queries.data() + uint64_t(index.rot_dim()) * offset_b, neighbors + uint64_t(k) * (offset_q + offset_b), distances + uint64_t(k) * (offset_q + offset_b), From 83c326ec42fbe64ad5149a1a12a3c754a88c5c71 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 24 Apr 2023 18:55:00 -0700 Subject: [PATCH 4/8] Update clang-format to 16.0.1. (#1412) This PR updates the clang-format version used by pre-commit. Authors: - Bradley Dice (https://github.com/bdice) - Jordan Jacobelli (https://github.com/jjacobelli) Approvers: - Ray Douglass (https://github.com/raydouglass) - Corey J. Nolet (https://github.com/cjnolet) - Ben Frederickson (https://github.com/benfred) URL: https://github.com/rapidsai/raft/pull/1412 --- .pre-commit-config.yaml | 2 +- .../all_cuda-118_arch-x86_64.yaml | 4 +- .../bench_ann_cuda-118_arch-x86_64.yaml | 4 +- cpp/bench/ann/src/common/dataset.h | 4 +- cpp/bench/prims/matrix/select_k.cu | 41 +++-- cpp/bench/prims/neighbors/knn.cuh | 9 +- .../raft/cluster/detail/kmeans_balanced.cuh | 2 +- .../raft/cluster/single_linkage_types.hpp | 8 +- cpp/include/raft/common/cub_wrappers.cuh | 8 +- .../raft/common/device_loads_stores.cuh | 8 +- cpp/include/raft/common/scatter.cuh | 8 +- cpp/include/raft/common/seive.hpp | 8 +- cpp/include/raft/core/csr_matrix.hpp | 2 +- cpp/include/raft/core/cublas_macros.hpp | 4 +- cpp/include/raft/core/cusolver_macros.hpp | 4 +- cpp/include/raft/core/cusparse_macros.hpp | 4 +- cpp/include/raft/core/detail/logger.hpp | 8 +- .../core/detail/mdspan_numpy_serializer.hpp | 8 +- cpp/include/raft/core/detail/nvtx.hpp | 4 +- cpp/include/raft/core/detail/span.hpp | 23 +-- cpp/include/raft/core/device_coo_matrix.hpp | 6 +- cpp/include/raft/core/device_csr_matrix.hpp | 6 +- cpp/include/raft/core/device_mdspan.hpp | 12 +- cpp/include/raft/core/device_resources.hpp | 4 +- cpp/include/raft/core/handle.hpp | 2 +- cpp/include/raft/core/host_coo_matrix.hpp | 6 +- cpp/include/raft/core/host_csr_matrix.hpp | 6 +- cpp/include/raft/core/host_mdspan.hpp | 6 +- cpp/include/raft/core/interruptible.hpp | 6 +- cpp/include/raft/core/kvp.hpp | 4 +- cpp/include/raft/core/mdarray.hpp | 19 +-- cpp/include/raft/core/mdspan.hpp | 18 +-- cpp/include/raft/core/nvtx.hpp | 8 +- .../raft/core/resource/resource_types.hpp | 2 +- cpp/include/raft/core/resources.hpp | 2 +- cpp/include/raft/core/span.hpp | 4 +- .../raft/core/temporary_device_buffer.hpp | 4 +- .../distance/detail/distance_ops/cutlass.cuh | 6 +- .../distance/detail/masked_distance_base.cuh | 2 +- .../detail/pairwise_distance_base.cuh | 2 +- .../detail/predicated_tile_iterator_normvec.h | 6 +- cpp/include/raft/lap/lap.cuh | 8 +- cpp/include/raft/lap/lap.hpp | 8 +- cpp/include/raft/linalg/add.cuh | 4 +- cpp/include/raft/linalg/binary_op.cuh | 4 +- .../raft/linalg/coalesced_reduction.cuh | 4 +- cpp/include/raft/linalg/contractions.cuh | 13 +- .../raft/linalg/detail/cublas_wrappers.hpp | 10 +- .../raft/linalg/detail/map_then_reduce.cuh | 3 +- cpp/include/raft/linalg/divide.cuh | 4 +- cpp/include/raft/linalg/eig.cuh | 4 +- cpp/include/raft/linalg/gemv.cuh | 4 +- cpp/include/raft/linalg/lanczos.cuh | 8 +- cpp/include/raft/linalg/lstsq.cuh | 4 +- cpp/include/raft/linalg/matrix_vector_op.cuh | 4 +- .../raft/linalg/mean_squared_error.cuh | 4 +- cpp/include/raft/linalg/multiply.cuh | 4 +- cpp/include/raft/linalg/power.cuh | 4 +- cpp/include/raft/linalg/reduce.cuh | 4 +- .../raft/linalg/reduce_cols_by_key.cuh | 4 +- .../raft/linalg/reduce_rows_by_key.cuh | 4 +- cpp/include/raft/linalg/rsvd.cuh | 4 +- cpp/include/raft/linalg/sqrt.cuh | 4 +- cpp/include/raft/linalg/strided_reduction.cuh | 4 +- cpp/include/raft/linalg/subtract.cuh | 4 +- cpp/include/raft/linalg/svd.cuh | 4 +- cpp/include/raft/linalg/ternary_op.cuh | 4 +- cpp/include/raft/linalg/transpose.cuh | 4 +- cpp/include/raft/linalg/unary_op.cuh | 4 +- cpp/include/raft/matrix/col_wise_sort.cuh | 2 +- .../raft/matrix/detail/select_warpsort.cuh | 5 +- cpp/include/raft/matrix/math.cuh | 6 +- cpp/include/raft/matrix/matrix.cuh | 6 +- cpp/include/raft/matrix/matrix.hpp | 8 +- cpp/include/raft/neighbors/ann_types.hpp | 10 +- cpp/include/raft/neighbors/cagra_types.hpp | 8 +- .../detail/cagra/compute_distance.hpp | 2 +- .../raft/neighbors/detail/cagra/fragment.hpp | 3 +- .../neighbors/detail/cagra/graph_core.cuh | 16 +- .../detail/cagra/search_multi_cta.cuh | 14 +- .../detail/cagra/search_multi_kernel.cuh | 36 ++--- .../neighbors/detail/cagra/search_plan.cuh | 2 +- .../detail/cagra/search_single_cta.cuh | 21 ++- .../detail/cagra/topk_for_cagra/topk_core.cuh | 14 +- .../detail/faiss_select/MergeNetworkBlock.cuh | 3 +- .../detail/faiss_select/MergeNetworkWarp.cuh | 3 +- .../neighbors/detail/faiss_select/Select.cuh | 3 +- .../raft/neighbors/detail/ivf_pq_build.cuh | 2 +- .../raft/neighbors/detail/ivf_pq_search.cuh | 2 +- cpp/include/raft/neighbors/ivf_flat_types.hpp | 8 +- cpp/include/raft/neighbors/ivf_list_types.hpp | 8 +- cpp/include/raft/neighbors/ivf_pq_types.hpp | 8 +- cpp/include/raft/random/permute.cuh | 3 +- .../random/sample_without_replacement.cuh | 3 +- .../raft/sparse/detail/cusparse_wrappers.h | 6 +- cpp/include/raft/sparse/hierarchy/common.h | 8 +- .../raft/sparse/hierarchy/single_linkage.cuh | 8 +- .../raft/sparse/linalg/detail/norm.cuh | 22 +-- .../raft/sparse/linalg/detail/spectral.cuh | 2 +- cpp/include/raft/sparse/linalg/norm.cuh | 10 +- cpp/include/raft/sparse/mst/mst.cuh | 8 +- cpp/include/raft/sparse/mst/mst.hpp | 8 +- cpp/include/raft/sparse/mst/mst_solver.cuh | 8 +- .../raft/sparse/neighbors/detail/knn.cuh | 2 +- cpp/include/raft/sparse/neighbors/knn.cuh | 6 +- .../sparse/selection/connect_components.cuh | 8 +- cpp/include/raft/sparse/selection/knn.cuh | 8 +- .../raft/sparse/selection/knn_graph.cuh | 8 +- cpp/include/raft/sparse/solver/mst_solver.cuh | 8 +- cpp/include/raft/spatial/knn/ann_common.h | 10 +- cpp/include/raft/spatial/knn/ann_types.hpp | 8 +- cpp/include/raft/spatial/knn/ball_cover.cuh | 6 +- .../raft/spatial/knn/ball_cover_types.hpp | 8 +- .../raft/spatial/knn/detail/ann_utils.cuh | 6 +- .../raft/spatial/knn/epsilon_neighborhood.cuh | 8 +- cpp/include/raft/spatial/knn/ivf_flat.cuh | 8 +- .../raft/spatial/knn/ivf_flat_types.hpp | 8 +- cpp/include/raft/spatial/knn/ivf_pq.cuh | 8 +- cpp/include/raft/spatial/knn/ivf_pq_types.hpp | 8 +- cpp/include/raft/spectral/detail/lapack.hpp | 14 +- .../raft/stats/adjusted_rand_index.cuh | 4 +- cpp/include/raft/stats/completeness_score.cuh | 4 +- cpp/include/raft/stats/cov.cuh | 4 +- cpp/include/raft/stats/detail/minmax.cuh | 5 +- cpp/include/raft/stats/entropy.cuh | 4 +- cpp/include/raft/stats/histogram.cuh | 4 +- cpp/include/raft/stats/homogeneity_score.cuh | 4 +- cpp/include/raft/stats/kl_divergence.cuh | 4 +- cpp/include/raft/stats/mean.cuh | 4 +- cpp/include/raft/stats/mean_center.cuh | 4 +- cpp/include/raft/stats/meanvar.cuh | 2 +- cpp/include/raft/stats/minmax.cuh | 4 +- cpp/include/raft/stats/mutual_info_score.cuh | 4 +- cpp/include/raft/stats/rand_index.cuh | 4 +- cpp/include/raft/stats/stddev.cuh | 4 +- cpp/include/raft/stats/sum.cuh | 4 +- cpp/include/raft/stats/v_measure.cuh | 4 +- cpp/include/raft/stats/weighted_mean.cuh | 4 +- cpp/include/raft/util/bitonic_sort.cuh | 6 +- cpp/include/raft/util/cache.cuh | 6 +- cpp/include/raft/util/cache_util.cuh | 6 +- cpp/include/raft/util/integer_utils.hpp | 6 +- cpp/include/raft/util/vectorized.cuh | 5 +- cpp/include/raft_runtime/neighbors/refine.hpp | 2 +- cpp/scripts/run-clang-format.py | 143 ------------------ cpp/test/core/mdarray.cu | 2 +- cpp/test/core/mdspan_utils.cu | 3 +- cpp/test/distance/dist_canberra.cu | 8 +- cpp/test/distance/dist_correlation.cu | 8 +- cpp/test/distance/dist_cos.cu | 5 +- cpp/test/distance/dist_hamming.cu | 8 +- cpp/test/distance/dist_hellinger.cu | 8 +- cpp/test/distance/dist_inner_product.cu | 6 +- cpp/test/distance/dist_jensen_shannon.cu | 8 +- cpp/test/distance/dist_kl_divergence.cu | 8 +- cpp/test/distance/dist_l1.cu | 8 +- cpp/test/distance/dist_l2_exp.cu | 3 +- cpp/test/distance/dist_l2_sqrt_exp.cu | 6 +- cpp/test/distance/dist_l2_unexp.cu | 3 +- cpp/test/distance/dist_l_inf.cu | 6 +- cpp/test/distance/dist_russell_rao.cu | 8 +- cpp/test/distance/distance_base.cuh | 4 +- cpp/test/linalg/rsvd.cu | 42 ++--- cpp/test/neighbors/ann_cagra.cuh | 2 +- cpp/test/neighbors/knn.cu | 4 +- cpp/test/sparse/spgemmi.cu | 28 ++-- cpp/test/util/bitonic_sort.cu | 22 +-- dependencies.yaml | 4 +- docs/source/developer_guide.md | 107 ++++++++----- thirdparty/pcg/pcg_basic.c | 93 +++++------- 170 files changed, 636 insertions(+), 853 deletions(-) delete mode 100755 cpp/scripts/run-clang-format.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d6e4ecb676..2a70632497 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: additional_dependencies: [toml] args: ["--config=pyproject.toml"] - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v11.1.0 + rev: v16.0.1 hooks: - id: clang-format types_or: [c, c++, cuda] diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 0e06076f1a..d192aefa7c 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -9,8 +9,8 @@ channels: dependencies: - breathe - c-compiler -- clang-tools=11.1.0 -- clang=11.1.0 +- clang-tools=16.0.1 +- clang=16.0.1 - cmake>=3.23.1,!=3.25.0 - cuda-profiler-api=11.8.86 - cuda-python >=11.7.1,<12.0 diff --git a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml index 5965aaef8f..2013c16fa4 100644 --- a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml @@ -8,8 +8,8 @@ channels: - nvidia dependencies: - c-compiler -- clang-tools=11.1.0 -- clang=11.1.0 +- clang-tools=16.0.1 +- clang=16.0.1 - cmake>=3.23.1,!=3.25.0 - cuda-profiler-api=11.8.86 - cudatoolkit=11.8 diff --git a/cpp/bench/ann/src/common/dataset.h b/cpp/bench/ann/src/common/dataset.h index 1244935c99..46dd66d649 100644 --- a/cpp/bench/ann/src/common/dataset.h +++ b/cpp/bench/ann/src/common/dataset.h @@ -47,7 +47,7 @@ class BinFile { uint32_t subset_first_row = 0, uint32_t subset_size = 0); ~BinFile() { fclose(fp_); } - BinFile(const BinFile&) = delete; + BinFile(const BinFile&) = delete; BinFile& operator=(const BinFile&) = delete; void get_shape(size_t* nrows, int* ndims) @@ -219,7 +219,7 @@ class Dataset { Dataset(const std::string& name, const std::string& distance) : name_(name), distance_(distance) { } - Dataset(const Dataset&) = delete; + Dataset(const Dataset&) = delete; Dataset& operator=(const Dataset&) = delete; virtual ~Dataset(); diff --git a/cpp/bench/prims/matrix/select_k.cu b/cpp/bench/prims/matrix/select_k.cu index 870119db52..1ff584ca58 100644 --- a/cpp/bench/prims/matrix/select_k.cu +++ b/cpp/bench/prims/matrix/select_k.cu @@ -157,34 +157,33 @@ const std::vector kInputs{ {10, 1000000, 256, true, false, true}, }; -#define SELECTION_REGISTER(KeyT, IdxT, A) \ - namespace BENCHMARK_PRIVATE_NAME(selection) \ - { \ - using SelectK = selection; \ - RAFT_BENCH_REGISTER(SelectK, #KeyT "/" #IdxT "/" #A, kInputs); \ +#define SELECTION_REGISTER(KeyT, IdxT, A) \ + namespace BENCHMARK_PRIVATE_NAME(selection) { \ + using SelectK = selection; \ + RAFT_BENCH_REGISTER(SelectK, #KeyT "/" #IdxT "/" #A, kInputs); \ } -SELECTION_REGISTER(float, uint32_t, kPublicApi); // NOLINT -SELECTION_REGISTER(float, uint32_t, kRadix8bits); // NOLINT -SELECTION_REGISTER(float, uint32_t, kRadix11bits); // NOLINT -SELECTION_REGISTER(float, uint32_t, kRadix11bitsExtraPass); // NOLINT -SELECTION_REGISTER(float, uint32_t, kWarpAuto); // NOLINT -SELECTION_REGISTER(float, uint32_t, kWarpImmediate); // NOLINT -SELECTION_REGISTER(float, uint32_t, kWarpFiltered); // NOLINT -SELECTION_REGISTER(float, uint32_t, kWarpDistributed); // NOLINT -SELECTION_REGISTER(float, uint32_t, kWarpDistributedShm); // NOLINT +SELECTION_REGISTER(float, uint32_t, kPublicApi); // NOLINT +SELECTION_REGISTER(float, uint32_t, kRadix8bits); // NOLINT +SELECTION_REGISTER(float, uint32_t, kRadix11bits); // NOLINT +SELECTION_REGISTER(float, uint32_t, kRadix11bitsExtraPass); // NOLINT +SELECTION_REGISTER(float, uint32_t, kWarpAuto); // NOLINT +SELECTION_REGISTER(float, uint32_t, kWarpImmediate); // NOLINT +SELECTION_REGISTER(float, uint32_t, kWarpFiltered); // NOLINT +SELECTION_REGISTER(float, uint32_t, kWarpDistributed); // NOLINT +SELECTION_REGISTER(float, uint32_t, kWarpDistributedShm); // NOLINT SELECTION_REGISTER(double, uint32_t, kRadix8bits); // NOLINT SELECTION_REGISTER(double, uint32_t, kRadix11bits); // NOLINT SELECTION_REGISTER(double, uint32_t, kRadix11bitsExtraPass); // NOLINT SELECTION_REGISTER(double, uint32_t, kWarpAuto); // NOLINT -SELECTION_REGISTER(double, int64_t, kRadix8bits); // NOLINT -SELECTION_REGISTER(double, int64_t, kRadix11bits); // NOLINT -SELECTION_REGISTER(double, int64_t, kRadix11bitsExtraPass); // NOLINT -SELECTION_REGISTER(double, int64_t, kWarpImmediate); // NOLINT -SELECTION_REGISTER(double, int64_t, kWarpFiltered); // NOLINT -SELECTION_REGISTER(double, int64_t, kWarpDistributed); // NOLINT -SELECTION_REGISTER(double, int64_t, kWarpDistributedShm); // NOLINT +SELECTION_REGISTER(double, int64_t, kRadix8bits); // NOLINT +SELECTION_REGISTER(double, int64_t, kRadix11bits); // NOLINT +SELECTION_REGISTER(double, int64_t, kRadix11bitsExtraPass); // NOLINT +SELECTION_REGISTER(double, int64_t, kWarpImmediate); // NOLINT +SELECTION_REGISTER(double, int64_t, kWarpFiltered); // NOLINT +SELECTION_REGISTER(double, int64_t, kWarpDistributed); // NOLINT +SELECTION_REGISTER(double, int64_t, kWarpDistributedShm); // NOLINT } // namespace raft::matrix diff --git a/cpp/bench/prims/neighbors/knn.cuh b/cpp/bench/prims/neighbors/knn.cuh index 8f0b1cb5d9..5431b9492e 100644 --- a/cpp/bench/prims/neighbors/knn.cuh +++ b/cpp/bench/prims/neighbors/knn.cuh @@ -384,11 +384,10 @@ inline const std::vector kNoCopyOnly{TransferStrategy::NO_COPY inline const std::vector kScopeFull{Scope::BUILD_SEARCH}; inline const std::vector kAllScopes{Scope::BUILD_SEARCH, Scope::SEARCH, Scope::BUILD}; -#define KNN_REGISTER(ValT, IdxT, ImplT, inputs, strats, scope) \ - namespace BENCHMARK_PRIVATE_NAME(knn) \ - { \ - using KNN = knn>; \ - RAFT_BENCH_REGISTER(KNN, #ValT "/" #IdxT "/" #ImplT, inputs, strats, scope); \ +#define KNN_REGISTER(ValT, IdxT, ImplT, inputs, strats, scope) \ + namespace BENCHMARK_PRIVATE_NAME(knn) { \ + using KNN = knn>; \ + RAFT_BENCH_REGISTER(KNN, #ValT "/" #IdxT "/" #ImplT, inputs, strats, scope); \ } } // namespace raft::bench::spatial diff --git a/cpp/include/raft/cluster/detail/kmeans_balanced.cuh b/cpp/include/raft/cluster/detail/kmeans_balanced.cuh index 3d23c809c3..4f7cae1ad9 100644 --- a/cpp/include/raft/cluster/detail/kmeans_balanced.cuh +++ b/cpp/include/raft/cluster/detail/kmeans_balanced.cuh @@ -436,7 +436,7 @@ __global__ void __launch_bounds__((WarpSize * BlockDimY)) adjust_centers_kernel(MathT* centers, // [n_clusters, dim] IdxT n_clusters, IdxT dim, - const T* dataset, // [n_rows, dim] + const T* dataset, // [n_rows, dim] IdxT n_rows, const LabelT* labels, // [n_rows] const CounterT* cluster_sizes, // [n_clusters] diff --git a/cpp/include/raft/cluster/single_linkage_types.hpp b/cpp/include/raft/cluster/single_linkage_types.hpp index 9a4fcfef60..cd815622bf 100644 --- a/cpp/include/raft/cluster/single_linkage_types.hpp +++ b/cpp/include/raft/cluster/single_linkage_types.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-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. @@ -77,9 +77,7 @@ class linkage_output { } }; -class linkage_output_int : public linkage_output { -}; -class linkage_output_int64 : public linkage_output { -}; +class linkage_output_int : public linkage_output {}; +class linkage_output_int64 : public linkage_output {}; }; // namespace raft::cluster diff --git a/cpp/include/raft/common/cub_wrappers.cuh b/cpp/include/raft/common/cub_wrappers.cuh index e80d7cccd9..dd8fc2d103 100644 --- a/cpp/include/raft/common/cub_wrappers.cuh +++ b/cpp/include/raft/common/cub_wrappers.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -24,9 +24,9 @@ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please note that there is no equivalent in RAFT's public API" +#pragma message(__FILE__ \ + " is deprecated and will be removed in a future release." \ + " Please note that there is no equivalent in RAFT's public API" " so this file will eventually be removed altogether.") #include diff --git a/cpp/include/raft/common/device_loads_stores.cuh b/cpp/include/raft/common/device_loads_stores.cuh index f3cfbd81cc..6c62cd70cc 100644 --- a/cpp/include/raft/common/device_loads_stores.cuh +++ b/cpp/include/raft/common/device_loads_stores.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-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. @@ -24,8 +24,8 @@ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") +#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/common/scatter.cuh b/cpp/include/raft/common/scatter.cuh index 0e83f9a5cd..72de79a596 100644 --- a/cpp/include/raft/common/scatter.cuh +++ b/cpp/include/raft/common/scatter.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-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. @@ -24,8 +24,8 @@ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/matrix version instead.") +#pragma message(__FILE__ \ + " is deprecated and will be removed in a future release." \ + " Please use the raft/matrix version instead.") #include diff --git a/cpp/include/raft/common/seive.hpp b/cpp/include/raft/common/seive.hpp index 633c8dd3e1..433b032b0f 100644 --- a/cpp/include/raft/common/seive.hpp +++ b/cpp/include/raft/common/seive.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-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. @@ -24,8 +24,8 @@ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/util version instead.") +#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/core/csr_matrix.hpp b/cpp/include/raft/core/csr_matrix.hpp index c37cfa41c8..95d09d3eea 100644 --- a/cpp/include/raft/core/csr_matrix.hpp +++ b/cpp/include/raft/core/csr_matrix.hpp @@ -141,7 +141,7 @@ class compressed_structure constexpr auto operator=(compressed_structure const&) noexcept( std::is_nothrow_copy_assignable::value) -> compressed_structure& = default; - constexpr auto operator =(compressed_structure&&) noexcept( + constexpr auto operator=(compressed_structure&&) noexcept( std::is_nothrow_move_assignable::value) -> compressed_structure& = default; diff --git a/cpp/include/raft/core/cublas_macros.hpp b/cpp/include/raft/core/cublas_macros.hpp index 855c1228f7..5c56240ccf 100644 --- a/cpp/include/raft/core/cublas_macros.hpp +++ b/cpp/include/raft/core/cublas_macros.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -23,7 +23,7 @@ #include ///@todo: enable this once we have logger enabled -//#include +// #include #include diff --git a/cpp/include/raft/core/cusolver_macros.hpp b/cpp/include/raft/core/cusolver_macros.hpp index 8f7caf65f3..4477d32118 100644 --- a/cpp/include/raft/core/cusolver_macros.hpp +++ b/cpp/include/raft/core/cusolver_macros.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -22,7 +22,7 @@ #include #include ///@todo: enable this once logging is enabled -//#include +// #include #include #include diff --git a/cpp/include/raft/core/cusparse_macros.hpp b/cpp/include/raft/core/cusparse_macros.hpp index 8a9aab55f7..21a25ae28c 100644 --- a/cpp/include/raft/core/cusparse_macros.hpp +++ b/cpp/include/raft/core/cusparse_macros.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, NVIDIA CORPORATION. + * 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. @@ -19,7 +19,7 @@ #include #include ///@todo: enable this once logging is enabled -//#include +// #include #define _CUSPARSE_ERR_TO_STR(err) \ case err: return #err; diff --git a/cpp/include/raft/core/detail/logger.hpp b/cpp/include/raft/core/detail/logger.hpp index 619fb89452..532aee4d90 100644 --- a/cpp/include/raft/core/detail/logger.hpp +++ b/cpp/include/raft/core/detail/logger.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -15,8 +15,8 @@ */ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in future releases." \ - " Please use the version instead.") +#pragma message(__FILE__ \ + " is deprecated and will be removed in future releases." \ + " Please use the version instead.") #include diff --git a/cpp/include/raft/core/detail/mdspan_numpy_serializer.hpp b/cpp/include/raft/core/detail/mdspan_numpy_serializer.hpp index df89811636..d0aea4168e 100644 --- a/cpp/include/raft/core/detail/mdspan_numpy_serializer.hpp +++ b/cpp/include/raft/core/detail/mdspan_numpy_serializer.hpp @@ -74,7 +74,7 @@ namespace numpy_serializer { #if RAFT_SYSTEM_LITTLE_ENDIAN == 1 #define RAFT_NUMPY_HOST_ENDIAN_CHAR RAFT_NUMPY_LITTLE_ENDIAN_CHAR -#else // RAFT_SYSTEM_LITTLE_ENDIAN == 1 +#else // RAFT_SYSTEM_LITTLE_ENDIAN == 1 #define RAFT_NUMPY_HOST_ENDIAN_CHAR RAFT_NUMPY_BIG_ENDIAN_CHAR #endif // RAFT_SYSTEM_LITTLE_ENDIAN == 1 @@ -110,11 +110,9 @@ struct header_t { }; template -struct is_complex : std::false_type { -}; +struct is_complex : std::false_type {}; template -struct is_complex> : std::true_type { -}; +struct is_complex> : std::true_type {}; template , bool> = true> inline dtype_t get_numpy_dtype() diff --git a/cpp/include/raft/core/detail/nvtx.hpp b/cpp/include/raft/core/detail/nvtx.hpp index adbf3a3666..ca4c5e4a08 100644 --- a/cpp/include/raft/core/detail/nvtx.hpp +++ b/cpp/include/raft/core/detail/nvtx.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-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. @@ -191,7 +191,7 @@ inline void pop_range() nvtxDomainRangePop(domain_store::value()); } -#else // NVTX_ENABLED +#else // NVTX_ENABLED template inline void push_range(const char* format, Args... args) diff --git a/cpp/include/raft/core/detail/span.hpp b/cpp/include/raft/core/detail/span.hpp index 20500d618b..e6ccb8535c 100644 --- a/cpp/include/raft/core/detail/span.hpp +++ b/cpp/include/raft/core/detail/span.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -37,8 +37,7 @@ template struct extent_value_t : public std::integral_constant< std::size_t, - Count != dynamic_extent ? Count : (Extent != dynamic_extent ? Extent - Offset : Extent)> { -}; + Count != dynamic_extent ? Count : (Extent != dynamic_extent ? Extent - Offset : Extent)> {}; /*! * If N is dynamic_extent, the extent of the returned span E is also @@ -47,31 +46,25 @@ struct extent_value_t template struct extent_as_bytes_value_t : public std::integral_constant { -}; + Extent == dynamic_extent ? Extent : sizeof(T) * Extent> {}; template struct is_allowed_extent_conversion_t : public std::integral_constant { -}; + From == To || From == dynamic_extent || To == dynamic_extent> {}; template struct is_allowed_element_type_conversion_t - : public std::integral_constant::value> { -}; + : public std::integral_constant::value> {}; template -struct is_span_oracle_t : std::false_type { -}; +struct is_span_oracle_t : std::false_type {}; template -struct is_span_oracle_t> : std::true_type { -}; +struct is_span_oracle_t> : std::true_type {}; template -struct is_span_t : public is_span_oracle_t::type> { -}; +struct is_span_t : public is_span_oracle_t::type> {}; template _RAFT_HOST_DEVICE constexpr auto lexicographical_compare(InputIt1 first1, diff --git a/cpp/include/raft/core/device_coo_matrix.hpp b/cpp/include/raft/core/device_coo_matrix.hpp index 35be67431d..ce016dd5e0 100644 --- a/cpp/include/raft/core/device_coo_matrix.hpp +++ b/cpp/include/raft/core/device_coo_matrix.hpp @@ -79,8 +79,7 @@ template using device_coordinate_structure_view = coordinate_structure_view; template -struct is_device_coo_matrix : std::false_type { -}; +struct is_device_coo_matrix : std::false_type {}; template struct is_device_coo_matrix< device_coo_matrix> - : std::true_type { -}; + : std::true_type {}; template constexpr bool is_device_coo_matrix_v = is_device_coo_matrix::value; diff --git a/cpp/include/raft/core/device_csr_matrix.hpp b/cpp/include/raft/core/device_csr_matrix.hpp index e4ec15f9bd..869034e925 100644 --- a/cpp/include/raft/core/device_csr_matrix.hpp +++ b/cpp/include/raft/core/device_csr_matrix.hpp @@ -46,8 +46,7 @@ using device_sparsity_owning_csr_matrix = csr_matrix; template -struct is_device_csr_matrix : std::false_type { -}; +struct is_device_csr_matrix : std::false_type {}; template struct is_device_csr_matrix< device_csr_matrix> - : std::true_type { -}; + : std::true_type {}; template constexpr bool is_device_csr_matrix_v = is_device_csr_matrix::value; diff --git a/cpp/include/raft/core/device_mdspan.hpp b/cpp/include/raft/core/device_mdspan.hpp index f72ae36d64..7510c388fe 100644 --- a/cpp/include/raft/core/device_mdspan.hpp +++ b/cpp/include/raft/core/device_mdspan.hpp @@ -45,11 +45,9 @@ template >; template -struct is_device_mdspan : std::false_type { -}; +struct is_device_mdspan : std::false_type {}; template -struct is_device_mdspan : std::bool_constant { -}; +struct is_device_mdspan : std::bool_constant {}; /** * @\brief Boolean to determine if template type T is either raft::device_mdspan or a derived type @@ -64,11 +62,9 @@ template using is_output_device_mdspan_t = is_device_mdspan>; template -struct is_managed_mdspan : std::false_type { -}; +struct is_managed_mdspan : std::false_type {}; template -struct is_managed_mdspan : std::bool_constant { -}; +struct is_managed_mdspan : std::bool_constant {}; /** * @\brief Boolean to determine if template type T is either raft::managed_mdspan or a derived type diff --git a/cpp/include/raft/core/device_resources.hpp b/cpp/include/raft/core/device_resources.hpp index df6b39a368..1cab36561a 100644 --- a/cpp/include/raft/core/device_resources.hpp +++ b/cpp/include/raft/core/device_resources.hpp @@ -69,7 +69,7 @@ class device_resources : public resources { } device_resources(const device_resources& handle) : resources{handle} {} - device_resources(device_resources&&) = delete; + device_resources(device_resources&&) = delete; device_resources& operator=(device_resources&&) = delete; /** @@ -246,7 +246,7 @@ class stream_syncer { handle_.sync_stream_pool(); } - stream_syncer(const stream_syncer& other) = delete; + stream_syncer(const stream_syncer& other) = delete; stream_syncer& operator=(const stream_syncer& other) = delete; private: diff --git a/cpp/include/raft/core/handle.hpp b/cpp/include/raft/core/handle.hpp index 02efebec9e..2a6b5657e2 100644 --- a/cpp/include/raft/core/handle.hpp +++ b/cpp/include/raft/core/handle.hpp @@ -39,7 +39,7 @@ class handle_t : public raft::device_resources { handle_t(const handle_t& handle) : device_resources{handle} {} - handle_t(handle_t&&) = delete; + handle_t(handle_t&&) = delete; handle_t& operator=(handle_t&&) = delete; /** diff --git a/cpp/include/raft/core/host_coo_matrix.hpp b/cpp/include/raft/core/host_coo_matrix.hpp index 8fabf5aa95..32e7a9e3c4 100644 --- a/cpp/include/raft/core/host_coo_matrix.hpp +++ b/cpp/include/raft/core/host_coo_matrix.hpp @@ -78,8 +78,7 @@ template using host_coordinate_structure_view = coordinate_structure_view; template -struct is_host_coo_matrix : std::false_type { -}; +struct is_host_coo_matrix : std::false_type {}; template struct is_host_coo_matrix< host_coo_matrix> - : std::true_type { -}; + : std::true_type {}; template constexpr bool is_host_coo_matrix_v = is_host_coo_matrix::value; diff --git a/cpp/include/raft/core/host_csr_matrix.hpp b/cpp/include/raft/core/host_csr_matrix.hpp index c64bcdcea6..86199335f2 100644 --- a/cpp/include/raft/core/host_csr_matrix.hpp +++ b/cpp/include/raft/core/host_csr_matrix.hpp @@ -45,8 +45,7 @@ using host_sparsity_owning_csr_matrix = csr_matrix; template -struct is_host_csr_matrix : std::false_type { -}; +struct is_host_csr_matrix : std::false_type {}; template struct is_host_csr_matrix< host_csr_matrix> - : std::true_type { -}; + : std::true_type {}; template constexpr bool is_host_csr_matrix_v = is_host_csr_matrix::value; diff --git a/cpp/include/raft/core/host_mdspan.hpp b/cpp/include/raft/core/host_mdspan.hpp index a6cdec7a84..9a675680ac 100644 --- a/cpp/include/raft/core/host_mdspan.hpp +++ b/cpp/include/raft/core/host_mdspan.hpp @@ -37,11 +37,9 @@ template >; template -struct is_host_mdspan : std::false_type { -}; +struct is_host_mdspan : std::false_type {}; template -struct is_host_mdspan : std::bool_constant { -}; +struct is_host_mdspan : std::bool_constant {}; /** * @\brief Boolean to determine if template type T is either raft::host_mdspan or a derived type diff --git a/cpp/include/raft/core/interruptible.hpp b/cpp/include/raft/core/interruptible.hpp index 0cc4af2bbf..62e481a801 100644 --- a/cpp/include/raft/core/interruptible.hpp +++ b/cpp/include/raft/core/interruptible.hpp @@ -172,10 +172,10 @@ class interruptible { inline void cancel() noexcept { continue_.clear(std::memory_order_relaxed); } // don't allow the token to leave the shared_ptr - interruptible(interruptible const&) = delete; - interruptible(interruptible&&) = delete; + interruptible(interruptible const&) = delete; + interruptible(interruptible&&) = delete; auto operator=(interruptible const&) -> interruptible& = delete; - auto operator=(interruptible&&) -> interruptible& = delete; + auto operator=(interruptible&&) -> interruptible& = delete; private: /** Global registry of thread-local cancellation stores. */ diff --git a/cpp/include/raft/core/kvp.hpp b/cpp/include/raft/core/kvp.hpp index 192d160d45..2e0d1117a1 100644 --- a/cpp/include/raft/core/kvp.hpp +++ b/cpp/include/raft/core/kvp.hpp @@ -32,8 +32,8 @@ struct KeyValuePair { typedef _Key Key; ///< Key data type typedef _Value Value; ///< Value data type - Key key; ///< Item key - Value value; ///< Item value + Key key; ///< Item key + Value value; ///< Item value /// Constructor RAFT_INLINE_FUNCTION KeyValuePair() {} diff --git a/cpp/include/raft/core/mdarray.hpp b/cpp/include/raft/core/mdarray.hpp index 88f90485dd..e1209835c9 100644 --- a/cpp/include/raft/core/mdarray.hpp +++ b/cpp/include/raft/core/mdarray.hpp @@ -55,12 +55,10 @@ class array_interface { namespace detail { template -struct is_array_interface : std::false_type { -}; +struct is_array_interface : std::false_type {}; template struct is_array_interface().view())>> - : std::bool_constant().view())>> { -}; + : std::bool_constant().view())>> {}; template using is_array_interface_t = is_array_interface>; @@ -75,16 +73,13 @@ inline constexpr bool is_array_interface_v = is_array_interface -struct is_array_interface : std::true_type { -}; +struct is_array_interface : std::true_type {}; template -struct is_array_interface : detail::is_array_interface_t { -}; +struct is_array_interface : detail::is_array_interface_t {}; template struct is_array_interface : std::conditional_t, is_array_interface, - std::false_type> { -}; + std::false_type> {}; /** * @\brief Boolean to determine if variadic template types Tn are raft::array_interface * or derived type or any type that has a member function `view()` that returns either @@ -177,9 +172,9 @@ class mdarray constexpr mdarray(mdarray&&) noexcept(std::is_nothrow_move_constructible::value) = default; - constexpr auto operator =(mdarray const&) noexcept( + constexpr auto operator=(mdarray const&) noexcept( std::is_nothrow_copy_assignable::value) -> mdarray& = default; - constexpr auto operator =(mdarray&&) noexcept( + constexpr auto operator=(mdarray&&) noexcept( std::is_nothrow_move_assignable::value) -> mdarray& = default; ~mdarray() noexcept(std::is_nothrow_destructible::value) = default; diff --git a/cpp/include/raft/core/mdspan.hpp b/cpp/include/raft/core/mdspan.hpp index 1c69cdd973..cd9ca26ed9 100644 --- a/cpp/include/raft/core/mdspan.hpp +++ b/cpp/include/raft/core/mdspan.hpp @@ -85,28 +85,22 @@ template *); template -struct is_mdspan : std::false_type { -}; +struct is_mdspan : std::false_type {}; template struct is_mdspan()))>> - : std::true_type { -}; + : std::true_type {}; template -struct is_input_mdspan : std::false_type { -}; +struct is_input_mdspan : std::false_type {}; template struct is_input_mdspan()))>> - : std::bool_constant> { -}; + : std::bool_constant> {}; template -struct is_output_mdspan : std::false_type { -}; +struct is_output_mdspan : std::false_type {}; template struct is_output_mdspan()))>> - : std::bool_constant> { -}; + : std::bool_constant> {}; template using is_mdspan_t = is_mdspan>; diff --git a/cpp/include/raft/core/nvtx.hpp b/cpp/include/raft/core/nvtx.hpp index 09a41f10a6..57338c32c7 100644 --- a/cpp/include/raft/core/nvtx.hpp +++ b/cpp/include/raft/core/nvtx.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-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. @@ -144,9 +144,9 @@ class range { ~range() { pop_range(); } /* This object is not meant to be touched. */ - range(const range&) = delete; - range(range&&) = delete; - auto operator=(const range&) -> range& = delete; + range(const range&) = delete; + range(range&&) = delete; + auto operator=(const range&) -> range& = delete; auto operator=(range&&) -> range& = delete; static auto operator new(std::size_t) -> void* = delete; static auto operator new[](std::size_t) -> void* = delete; diff --git a/cpp/include/raft/core/resource/resource_types.hpp b/cpp/include/raft/core/resource/resource_types.hpp index 8e331293bf..2dc4eb1f9d 100644 --- a/cpp/include/raft/core/resource/resource_types.hpp +++ b/cpp/include/raft/core/resource/resource_types.hpp @@ -42,7 +42,7 @@ enum resource_type { THRUST_POLICY, // thrust execution policy WORKSPACE_RESOURCE, // rmm device memory resource - LAST_KEY // reserved for the last key + LAST_KEY // reserved for the last key }; /** diff --git a/cpp/include/raft/core/resources.hpp b/cpp/include/raft/core/resources.hpp index 64e281e934..4de7d43e76 100644 --- a/cpp/include/raft/core/resources.hpp +++ b/cpp/include/raft/core/resources.hpp @@ -67,7 +67,7 @@ class resources { * Note that this does not create any new resources. */ resources(const resources& res) : factories_(res.factories_), resources_(res.resources_) {} - resources(resources&&) = delete; + resources(resources&&) = delete; resources& operator=(resources&&) = delete; /** diff --git a/cpp/include/raft/core/span.hpp b/cpp/include/raft/core/span.hpp index 188d58c896..a896ba1977 100644 --- a/cpp/include/raft/core/span.hpp +++ b/cpp/include/raft/core/span.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -104,7 +104,7 @@ class span { constexpr span(span&& other) noexcept = default; constexpr auto operator=(span const& other) noexcept -> span& = default; - constexpr auto operator=(span&& other) noexcept -> span& = default; + constexpr auto operator=(span&& other) noexcept -> span& = default; constexpr auto begin() const noexcept -> iterator { return data(); } diff --git a/cpp/include/raft/core/temporary_device_buffer.hpp b/cpp/include/raft/core/temporary_device_buffer.hpp index 194471c5de..4baa7e9597 100644 --- a/cpp/include/raft/core/temporary_device_buffer.hpp +++ b/cpp/include/raft/core/temporary_device_buffer.hpp @@ -55,10 +55,10 @@ class temporary_device_buffer { static constexpr bool is_const_pointer_ = std::is_const_v; public: - temporary_device_buffer(temporary_device_buffer const&) = delete; + temporary_device_buffer(temporary_device_buffer const&) = delete; temporary_device_buffer& operator=(temporary_device_buffer const&) = delete; - constexpr temporary_device_buffer(temporary_device_buffer&&) = default; + constexpr temporary_device_buffer(temporary_device_buffer&&) = default; constexpr temporary_device_buffer& operator=(temporary_device_buffer&&) = default; /** diff --git a/cpp/include/raft/distance/detail/distance_ops/cutlass.cuh b/cpp/include/raft/distance/detail/distance_ops/cutlass.cuh index 7a4fe0ce83..68e843c6f5 100644 --- a/cpp/include/raft/distance/detail/distance_ops/cutlass.cuh +++ b/cpp/include/raft/distance/detail/distance_ops/cutlass.cuh @@ -30,13 +30,11 @@ namespace raft::distance::detail::ops { // This pattern is described in: // https://en.cppreference.com/w/cpp/types/void_t template -struct has_cutlass_op : std::false_type { -}; +struct has_cutlass_op : std::false_type {}; // Specialization recognizes types that do support CUTLASS template struct has_cutlass_op().get_cutlass_op())>> - : std::true_type { -}; + : std::true_type {}; } // namespace raft::distance::detail::ops diff --git a/cpp/include/raft/distance/detail/masked_distance_base.cuh b/cpp/include/raft/distance/detail/masked_distance_base.cuh index 55da634145..5a33c9ce4a 100644 --- a/cpp/include/raft/distance/detail/masked_distance_base.cuh +++ b/cpp/include/raft/distance/detail/masked_distance_base.cuh @@ -217,7 +217,7 @@ struct MaskedDistances : public BaseClass { } // tile_idx_n } // idx_g rowEpilog_op(tile_idx_m); - } // tile_idx_m + } // tile_idx_m } private: diff --git a/cpp/include/raft/distance/detail/pairwise_distance_base.cuh b/cpp/include/raft/distance/detail/pairwise_distance_base.cuh index c6b09be31e..58b5daa8ca 100644 --- a/cpp/include/raft/distance/detail/pairwise_distance_base.cuh +++ b/cpp/include/raft/distance/detail/pairwise_distance_base.cuh @@ -18,7 +18,7 @@ #include // ceildiv #include // RAFT_CUDA_TRY -#include // size_t +#include // size_t namespace raft { namespace distance { diff --git a/cpp/include/raft/distance/detail/predicated_tile_iterator_normvec.h b/cpp/include/raft/distance/detail/predicated_tile_iterator_normvec.h index 67c01448dc..ebe6d0c80a 100644 --- a/cpp/include/raft/distance/detail/predicated_tile_iterator_normvec.h +++ b/cpp/include/raft/distance/detail/predicated_tile_iterator_normvec.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2022, NVIDIA CORPORATION. + * Copyright (c) 2018-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. @@ -57,8 +57,8 @@ namespace threadblock { /// /// Satisfies: ReadableTileIterator | PredicatedTileIterator | ForwardTileIterator /// -template diff --git a/cpp/include/raft/lap/lap.cuh b/cpp/include/raft/lap/lap.cuh index ca7d5e96a9..f7828294cd 100644 --- a/cpp/include/raft/lap/lap.cuh +++ b/cpp/include/raft/lap/lap.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-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. @@ -24,9 +24,9 @@ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the raft/solver version instead.") +#pragma message(__FILE__ \ + " is deprecated and will be removed in a future release." \ + " Please use the raft/solver version instead.") #include diff --git a/cpp/include/raft/lap/lap.hpp b/cpp/include/raft/lap/lap.hpp index 30f2b53e52..5472422053 100644 --- a/cpp/include/raft/lap/lap.hpp +++ b/cpp/include/raft/lap/lap.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, NVIDIA CORPORATION. + * Copyright (c) 2020-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. @@ -24,8 +24,8 @@ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the cuh version instead.") +#pragma message(__FILE__ \ + " is deprecated and will be removed in a future release." \ + " Please use the cuh version instead.") #include diff --git a/cpp/include/raft/linalg/add.cuh b/cpp/include/raft/linalg/add.cuh index 608c63e1a9..c19f491319 100644 --- a/cpp/include/raft/linalg/add.cuh +++ b/cpp/include/raft/linalg/add.cuh @@ -216,7 +216,7 @@ void add_scalar(raft::device_resources const& handle, /** @} */ // end of group add -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/binary_op.cuh b/cpp/include/raft/linalg/binary_op.cuh index ed083a1590..88c49d1f42 100644 --- a/cpp/include/raft/linalg/binary_op.cuh +++ b/cpp/include/raft/linalg/binary_op.cuh @@ -82,7 +82,7 @@ void binary_op(raft::device_resources const& handle, InType in1, InType in2, Out /** @} */ // end of group binary_op -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif diff --git a/cpp/include/raft/linalg/coalesced_reduction.cuh b/cpp/include/raft/linalg/coalesced_reduction.cuh index 674be207d8..48c121c359 100644 --- a/cpp/include/raft/linalg/coalesced_reduction.cuh +++ b/cpp/include/raft/linalg/coalesced_reduction.cuh @@ -159,7 +159,7 @@ void coalesced_reduction(raft::device_resources const& handle, /** @} */ // end of group coalesced_reduction -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/contractions.cuh b/cpp/include/raft/linalg/contractions.cuh index 4321e13d95..3b1e8c41c4 100644 --- a/cpp/include/raft/linalg/contractions.cuh +++ b/cpp/include/raft/linalg/contractions.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -100,7 +100,7 @@ struct KernelPolicy { SmemSize = 2 * SmemPage * sizeof(DataT), }; // enum -}; // struct KernelPolicy +}; // struct KernelPolicy template struct ColKernelPolicy { @@ -151,8 +151,7 @@ struct ColKernelPolicy { * @{ */ template -struct Policy4x4 { -}; +struct Policy4x4 {}; template struct Policy4x4 { @@ -174,8 +173,7 @@ struct Policy4x4 { * */ template -struct Policy4x4Skinny { -}; +struct Policy4x4Skinny {}; template struct Policy4x4Skinny { @@ -194,8 +192,7 @@ struct Policy4x4Skinny { * @{ */ template -struct Policy2x8 { -}; +struct Policy2x8 {}; template struct Policy2x8 { diff --git a/cpp/include/raft/linalg/detail/cublas_wrappers.hpp b/cpp/include/raft/linalg/detail/cublas_wrappers.hpp index 87a195757c..5a7356a4c2 100644 --- a/cpp/include/raft/linalg/detail/cublas_wrappers.hpp +++ b/cpp/include/raft/linalg/detail/cublas_wrappers.hpp @@ -41,9 +41,9 @@ class cublas_device_pointer_mode { } } auto operator=(const cublas_device_pointer_mode&) -> cublas_device_pointer_mode& = delete; - auto operator=(cublas_device_pointer_mode&&) -> cublas_device_pointer_mode& = delete; - static auto operator new(std::size_t) -> void* = delete; - static auto operator new[](std::size_t) -> void* = delete; + auto operator=(cublas_device_pointer_mode&&) -> cublas_device_pointer_mode& = delete; + static auto operator new(std::size_t) -> void* = delete; + static auto operator new[](std::size_t) -> void* = delete; ~cublas_device_pointer_mode() { @@ -550,7 +550,7 @@ cublasStatus_t cublasgetrfBatched(cublasHandle_t handle, template <> inline cublasStatus_t cublasgetrfBatched(cublasHandle_t handle, // NOLINT int n, - float* const A[], // NOLINT + float* const A[], // NOLINT int lda, int* P, int* info, @@ -564,7 +564,7 @@ inline cublasStatus_t cublasgetrfBatched(cublasHandle_t handle, // NOLINT template <> inline cublasStatus_t cublasgetrfBatched(cublasHandle_t handle, // NOLINT int n, - double* const A[], // NOLINT + double* const A[], // NOLINT int lda, int* P, int* info, diff --git a/cpp/include/raft/linalg/detail/map_then_reduce.cuh b/cpp/include/raft/linalg/detail/map_then_reduce.cuh index 70bb2df4f5..c22ef09809 100644 --- a/cpp/include/raft/linalg/detail/map_then_reduce.cuh +++ b/cpp/include/raft/linalg/detail/map_then_reduce.cuh @@ -25,8 +25,7 @@ namespace raft { namespace linalg { namespace detail { -struct sum_tag { -}; +struct sum_tag {}; template __device__ void reduce(OutType* out, const InType acc, sum_tag) diff --git a/cpp/include/raft/linalg/divide.cuh b/cpp/include/raft/linalg/divide.cuh index 0b18e6175c..428b9ba618 100644 --- a/cpp/include/raft/linalg/divide.cuh +++ b/cpp/include/raft/linalg/divide.cuh @@ -95,7 +95,7 @@ void divide_scalar(raft::device_resources const& handle, /** @} */ // end of group add -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/eig.cuh b/cpp/include/raft/linalg/eig.cuh index 03e94a10b1..7829f8e49f 100644 --- a/cpp/include/raft/linalg/eig.cuh +++ b/cpp/include/raft/linalg/eig.cuh @@ -219,7 +219,7 @@ void eig_jacobi(raft::device_resources const& handle, /** @} */ // end of eig -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/gemv.cuh b/cpp/include/raft/linalg/gemv.cuh index 96846003f6..019ec9f7ac 100644 --- a/cpp/include/raft/linalg/gemv.cuh +++ b/cpp/include/raft/linalg/gemv.cuh @@ -304,6 +304,6 @@ void gemv(raft::device_resources const& handle, } /** @} */ // end of gemv -}; // namespace linalg -}; // namespace raft +}; // namespace linalg +}; // namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/lanczos.cuh b/cpp/include/raft/linalg/lanczos.cuh index c9f3e0010e..04e9980583 100644 --- a/cpp/include/raft/linalg/lanczos.cuh +++ b/cpp/include/raft/linalg/lanczos.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, NVIDIA CORPORATION. + * Copyright (c) 2022-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. @@ -24,9 +24,9 @@ #pragma once -#pragma message(__FILE__ \ - " is deprecated and will be removed in a future release." \ - " Please use the sparse solvers version instead.") +#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.cuh b/cpp/include/raft/linalg/lstsq.cuh index b36a9eba96..c753215737 100644 --- a/cpp/include/raft/linalg/lstsq.cuh +++ b/cpp/include/raft/linalg/lstsq.cuh @@ -244,7 +244,7 @@ void lstsq_qr(raft::device_resources const& handle, /** @} */ // end of lstsq -}; // namespace linalg -}; // namespace raft +}; // namespace linalg +}; // namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/matrix_vector_op.cuh b/cpp/include/raft/linalg/matrix_vector_op.cuh index 59b2ca5ee5..6c65626ac5 100644 --- a/cpp/include/raft/linalg/matrix_vector_op.cuh +++ b/cpp/include/raft/linalg/matrix_vector_op.cuh @@ -238,7 +238,7 @@ void matrix_vector_op(raft::device_resources const& handle, /** @} */ // end of group matrix_vector_op -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/mean_squared_error.cuh b/cpp/include/raft/linalg/mean_squared_error.cuh index 62f4896d01..317c085673 100644 --- a/cpp/include/raft/linalg/mean_squared_error.cuh +++ b/cpp/include/raft/linalg/mean_squared_error.cuh @@ -74,7 +74,7 @@ void mean_squared_error(raft::device_resources const& handle, /** @} */ // end of group mean_squared_error -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif diff --git a/cpp/include/raft/linalg/multiply.cuh b/cpp/include/raft/linalg/multiply.cuh index 574b88c63d..bdca641616 100644 --- a/cpp/include/raft/linalg/multiply.cuh +++ b/cpp/include/raft/linalg/multiply.cuh @@ -97,7 +97,7 @@ void multiply_scalar( /** @} */ // end of group multiply -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/power.cuh b/cpp/include/raft/linalg/power.cuh index 1fdfcb3780..057d6f6827 100644 --- a/cpp/include/raft/linalg/power.cuh +++ b/cpp/include/raft/linalg/power.cuh @@ -153,7 +153,7 @@ void power_scalar( /** @} */ // end of group add -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/reduce.cuh b/cpp/include/raft/linalg/reduce.cuh index ae5457c44f..06f62f207e 100644 --- a/cpp/include/raft/linalg/reduce.cuh +++ b/cpp/include/raft/linalg/reduce.cuh @@ -161,7 +161,7 @@ void reduce(raft::device_resources const& handle, /** @} */ // end of group reduction -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/reduce_cols_by_key.cuh b/cpp/include/raft/linalg/reduce_cols_by_key.cuh index 2b744d8134..71c8cf14a1 100644 --- a/cpp/include/raft/linalg/reduce_cols_by_key.cuh +++ b/cpp/include/raft/linalg/reduce_cols_by_key.cuh @@ -112,7 +112,7 @@ void reduce_cols_by_key( /** @} */ // end of group reduce_cols_by_key -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/reduce_rows_by_key.cuh b/cpp/include/raft/linalg/reduce_rows_by_key.cuh index 484b60238b..0e83c9aa2b 100644 --- a/cpp/include/raft/linalg/reduce_rows_by_key.cuh +++ b/cpp/include/raft/linalg/reduce_rows_by_key.cuh @@ -191,7 +191,7 @@ void reduce_rows_by_key( /** @} */ // end of group reduce_rows_by_key -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/rsvd.cuh b/cpp/include/raft/linalg/rsvd.cuh index eb94547f13..8a32467873 100644 --- a/cpp/include/raft/linalg/rsvd.cuh +++ b/cpp/include/raft/linalg/rsvd.cuh @@ -765,7 +765,7 @@ void rsvd_perc_symmetric_jacobi(Args... args) /** @} */ // end of group rsvd -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/sqrt.cuh b/cpp/include/raft/linalg/sqrt.cuh index 55e661897d..eecc719617 100644 --- a/cpp/include/raft/linalg/sqrt.cuh +++ b/cpp/include/raft/linalg/sqrt.cuh @@ -83,7 +83,7 @@ void sqrt(raft::device_resources const& handle, InType in, OutType out) /** @} */ // end of group add -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/strided_reduction.cuh b/cpp/include/raft/linalg/strided_reduction.cuh index f58dfe28b3..25be368865 100644 --- a/cpp/include/raft/linalg/strided_reduction.cuh +++ b/cpp/include/raft/linalg/strided_reduction.cuh @@ -170,7 +170,7 @@ void strided_reduction(raft::device_resources const& handle, /** @} */ // end of group strided_reduction -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/subtract.cuh b/cpp/include/raft/linalg/subtract.cuh index da995b7a2a..cbd6b9df59 100644 --- a/cpp/include/raft/linalg/subtract.cuh +++ b/cpp/include/raft/linalg/subtract.cuh @@ -222,7 +222,7 @@ void subtract_scalar( /** @} */ // end of group subtract -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/svd.cuh b/cpp/include/raft/linalg/svd.cuh index 4b78f2ef61..801d271fe9 100644 --- a/cpp/include/raft/linalg/svd.cuh +++ b/cpp/include/raft/linalg/svd.cuh @@ -415,7 +415,7 @@ void svd_reconstruction(raft::device_resources const& handle, /** @} */ // end of group svd -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif \ No newline at end of file diff --git a/cpp/include/raft/linalg/ternary_op.cuh b/cpp/include/raft/linalg/ternary_op.cuh index 1e347d69be..ce95e98499 100644 --- a/cpp/include/raft/linalg/ternary_op.cuh +++ b/cpp/include/raft/linalg/ternary_op.cuh @@ -83,7 +83,7 @@ void ternary_op( /** @} */ // end of group ternary_op -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif diff --git a/cpp/include/raft/linalg/transpose.cuh b/cpp/include/raft/linalg/transpose.cuh index a0f418b4f7..2f31cfd722 100644 --- a/cpp/include/raft/linalg/transpose.cuh +++ b/cpp/include/raft/linalg/transpose.cuh @@ -102,7 +102,7 @@ auto transpose(raft::device_resources const& handle, /** @} */ // end of group transpose -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif diff --git a/cpp/include/raft/linalg/unary_op.cuh b/cpp/include/raft/linalg/unary_op.cuh index 23f932d2f2..58ff2f6bd6 100644 --- a/cpp/include/raft/linalg/unary_op.cuh +++ b/cpp/include/raft/linalg/unary_op.cuh @@ -124,7 +124,7 @@ void write_only_unary_op(const raft::device_resources& handle, OutType out, Lamb /** @} */ // end of group unary_op -}; // end namespace linalg -}; // end namespace raft +}; // end namespace linalg +}; // end namespace raft #endif diff --git a/cpp/include/raft/matrix/col_wise_sort.cuh b/cpp/include/raft/matrix/col_wise_sort.cuh index a4daf097e5..6546a48279 100644 --- a/cpp/include/raft/matrix/col_wise_sort.cuh +++ b/cpp/include/raft/matrix/col_wise_sort.cuh @@ -133,6 +133,6 @@ void sort_cols_per_row(Args... args) /** @} */ // end of group col_wise_sort -}; // end namespace raft::matrix +}; // end namespace raft::matrix #endif \ No newline at end of file diff --git a/cpp/include/raft/matrix/detail/select_warpsort.cuh b/cpp/include/raft/matrix/detail/select_warpsort.cuh index d362b73792..93d405da48 100644 --- a/cpp/include/raft/matrix/detail/select_warpsort.cuh +++ b/cpp/include/raft/matrix/detail/select_warpsort.cuh @@ -870,8 +870,7 @@ struct launch_setup { }; template