Skip to content

Commit ba4592d

Browse files
authored
Merge branch 'branch-25.02' into remove_mean_sample
2 parents 7640f28 + ef4a7e1 commit ba4592d

File tree

206 files changed

+297
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+297
-243
lines changed

.devcontainer/cuda11.8-pip/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ucx1.17.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [

.devcontainer/cuda12.5-pip/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"args": {
66
"CUDA": "12.5",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.5-ucx1.17.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.5-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [

.pre-commit-config.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
1+
# Copyright (c) 2022-2025, NVIDIA CORPORATION.
22

33
repos:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v5.0.0
6+
hooks:
7+
- id: trailing-whitespace
8+
- id: end-of-file-fixer
49
- repo: https://github.com/PyCQA/isort
510
rev: 5.12.0
611
hooks:
@@ -98,7 +103,7 @@ repos:
98103
^CHANGELOG[.]md$|
99104
^cpp/cmake/patches/cutlass/build-export[.]patch$
100105
- repo: https://github.com/pre-commit/pre-commit-hooks
101-
rev: v4.5.0
106+
rev: v5.0.0
102107
hooks:
103108
- id: check-json
104109
- repo: https://github.com/rapidsai/pre-commit-hooks
@@ -118,7 +123,7 @@ repos:
118123
docs/source/sphinxext/github_link[.]py|
119124
- id: verify-alpha-spec
120125
- repo: https://github.com/rapidsai/dependency-file-generator
121-
rev: v1.16.0
126+
rev: v1.17.0
122127
hooks:
123128
- id: rapids-dependency-file-generator
124129
args: ["--clean"]

build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,4 +473,3 @@ if hasArg docs; then
473473
cd ${SPHINX_BUILD_DIR}
474474
sphinx-build -b html source _html
475475
fi
476-

cpp/cmake/patches/cutlass/build-export.patch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ index 7419bdf5e..545384d82 100755
2020
- $<BUILD_INTERFACE:${cute_SOURCE_DIR}/include>
2121
- $<BUILD_INTERFACE:${cute_SOURCE_DIR}/examples>
2222
)
23-
23+
2424
# Mark CTK headers as system to supress warnings from them
25-
--
25+
--
2626
2.34.1
27-

cpp/include/raft/cluster/detail/kmeans_auto_find_k.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,4 @@ void find_k(raft::resources const& handle,
227227
n_iter);
228228
}
229229
}
230-
} // namespace raft::cluster::detail
230+
} // namespace raft::cluster::detail

cpp/include/raft/cluster/detail/mst.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,4 @@ void build_sorted_mst(
204204
raft::copy_async(mst_weight, mst_coo.weights.data(), mst_coo.n_edges, stream);
205205
}
206206

207-
}; // namespace raft::cluster::detail
207+
}; // namespace raft::cluster::detail

cpp/include/raft/cluster/detail/single_linkage.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ void single_linkage(raft::resources const& handle,
122122
out->n_leaves = m;
123123
out->n_connected_components = 1;
124124
}
125-
}; // namespace raft::cluster::detail
125+
}; // namespace raft::cluster::detail

cpp/include/raft/common/nvtx.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121

2222
#pragma once
2323

24-
#include <raft/core/nvtx.hpp>
24+
#include <raft/core/nvtx.hpp>

cpp/include/raft/core/coo_matrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,4 @@ class coo_matrix
297297

298298
/** @} */
299299

300-
} // namespace raft
300+
} // namespace raft

cpp/include/raft/core/csr_matrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,4 +309,4 @@ class csr_matrix
309309

310310
/** @} */
311311

312-
} // namespace raft
312+
} // namespace raft

cpp/include/raft/core/detail/mdspan_util.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ MDSPAN_INLINE_FUNCTION auto popc(uint64_t v) -> int32_t
6767
#endif // compiler
6868
}
6969

70-
} // end namespace raft::detail
70+
} // end namespace raft::detail

cpp/include/raft/core/device_coo_matrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,4 +395,4 @@ auto make_device_coordinate_structure_view(raft::device_span<RowType> rows,
395395

396396
/** @} */
397397

398-
}; // namespace raft
398+
}; // namespace raft

cpp/include/raft/core/device_csr_matrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,4 +422,4 @@ auto make_device_compressed_structure_view(raft::device_span<IndptrType> indptr,
422422

423423
/** @} */
424424

425-
}; // namespace raft
425+
}; // namespace raft

cpp/include/raft/core/device_span.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ using device_span = span<T, true, extent>;
3434
/**
3535
* @}
3636
*/
37-
} // end namespace raft
37+
} // end namespace raft

cpp/include/raft/core/host_coo_matrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,4 +393,4 @@ auto make_host_coordinate_structure_view(raft::host_span<RowType> rows,
393393

394394
/** @} */
395395

396-
}; // namespace raft
396+
}; // namespace raft

cpp/include/raft/core/host_csr_matrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,4 @@ auto make_host_compressed_structure_view(raft::host_span<IndptrType> indptr,
423423

424424
/** @} */
425425

426-
}; // namespace raft
426+
}; // namespace raft

cpp/include/raft/core/host_mdarray.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,4 @@ auto make_host_vector(IndexType n)
253253
return make_host_mdarray<ElementType, IndexType, LayoutPolicy>(make_extents<IndexType>(n));
254254
}
255255

256-
} // end namespace raft
256+
} // end namespace raft

cpp/include/raft/core/host_span.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ using host_span = span<T, false, extent>;
3535
* @}
3636
*/
3737

38-
} // end namespace raft
38+
} // end namespace raft

cpp/include/raft/core/resource/device_id.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ inline int get_device_id(resources const& res)
7373
/**
7474
* @}
7575
*/
76-
} // namespace raft::resource
76+
} // namespace raft::resource

cpp/include/raft/core/resource/device_properties.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ inline cudaDeviceProp& get_device_properties(resources const& res)
7575
/**
7676
* @}
7777
*/
78-
} // namespace raft::resource
78+
} // namespace raft::resource

cpp/include/raft/core/resource/sub_comms.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ inline void set_subcomm(resources const& res,
7979
* @}
8080
*/
8181

82-
} // namespace raft::resource
82+
} // namespace raft::resource

cpp/include/raft/core/sparse_types.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,4 @@ class sparse_matrix {
222222

223223
/* @} */
224224

225-
} // namespace raft
225+
} // namespace raft

cpp/include/raft/distance/detail/fused_distance_nn/gemm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,4 +406,4 @@ struct FusedDistanceNNGemm<double,
406406

407407
} // namespace kernel
408408
} // namespace gemm
409-
} // namespace cutlass
409+
} // namespace cutlass

cpp/include/raft/distance/detail/pairwise_distance_gemm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,4 @@ struct PairwiseDistanceGemm<double,
235235

236236
} // namespace kernel
237237
} // namespace gemm
238-
} // namespace cutlass
238+
} // namespace cutlass

cpp/include/raft/distance/fused_distance_nn.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
*/
1616
#pragma once
1717

18-
#include "fused_distance_nn-inl.cuh"
18+
#include "fused_distance_nn-inl.cuh"

cpp/include/raft/label/classlabels.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ void make_monotonic(Type* out, Type* in, size_t N, cudaStream_t stream, bool zer
118118
}; // namespace label
119119
}; // end namespace raft
120120

121-
#endif
121+
#endif

cpp/include/raft/label/detail/merge_labels.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,4 @@ void merge_labels(value_idx* labels_a,
155155

156156
} // namespace detail
157157
}; // namespace label
158-
}; // namespace raft
158+
}; // namespace raft

cpp/include/raft/label/merge_labels.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ void merge_labels(value_idx* labels_a,
6868
}; // namespace label
6969
}; // namespace raft
7070

71-
#endif
71+
#endif

cpp/include/raft/linalg/cholesky_r1_update.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ void choleskyRank1Update(raft::resources const& handle,
139139
}; // namespace linalg
140140
}; // namespace raft
141141

142-
#endif
142+
#endif

cpp/include/raft/linalg/coalesced_reduction.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,4 @@ void coalesced_reduction(raft::resources const& handle,
163163
}; // end namespace linalg
164164
}; // end namespace raft
165165

166-
#endif
166+
#endif

cpp/include/raft/linalg/detail/add.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ void addDevScalar(
6060

6161
} // namespace detail
6262
} // namespace linalg
63-
} // namespace raft
63+
} // namespace raft

cpp/include/raft/linalg/divide.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ void divide_scalar(raft::resources const& handle,
9999
}; // end namespace linalg
100100
}; // end namespace raft
101101

102-
#endif
102+
#endif

cpp/include/raft/linalg/eig.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,4 @@ void eig_jacobi(raft::resources const& handle,
223223
}; // end namespace linalg
224224
}; // end namespace raft
225225

226-
#endif
226+
#endif

cpp/include/raft/linalg/eltwise.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ void eltwiseDivideCheckZero(
9797
}; // end namespace linalg
9898
}; // end namespace raft
9999

100-
#endif
100+
#endif

cpp/include/raft/linalg/gemv.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,4 +307,4 @@ void gemv(raft::resources const& handle,
307307

308308
}; // namespace linalg
309309
}; // namespace raft
310-
#endif
310+
#endif

cpp/include/raft/linalg/linalg_types.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ enum class FillMode { UPPER, LOWER };
3939
*/
4040
enum class Operation { NON_TRANSPOSE, TRANSPOSE };
4141

42-
} // end namespace raft::linalg
42+
} // end namespace raft::linalg

cpp/include/raft/linalg/lstsq.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,4 +248,4 @@ void lstsq_qr(raft::resources const& handle,
248248
}; // namespace linalg
249249
}; // namespace raft
250250

251-
#endif
251+
#endif

cpp/include/raft/linalg/map_reduce.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@ void map_reduce(raft::resources const& handle,
115115

116116
} // end namespace raft::linalg
117117

118-
#endif
118+
#endif

cpp/include/raft/linalg/map_then_reduce.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ template <typename InType,
9191
}; // end namespace linalg
9292
}; // end namespace raft
9393

94-
#endif
94+
#endif

cpp/include/raft/linalg/matrix_vector.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,4 @@ void binary_sub(raft::resources const& handle,
200200

201201
/** @} */ // end of matrix_vector
202202

203-
} // namespace raft::linalg
203+
} // namespace raft::linalg

cpp/include/raft/linalg/multiply.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ void multiply_scalar(
101101
}; // end namespace linalg
102102
}; // end namespace raft
103103

104-
#endif
104+
#endif

cpp/include/raft/linalg/power.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,4 @@ void power_scalar(
157157
}; // end namespace linalg
158158
}; // end namespace raft
159159

160-
#endif
160+
#endif

cpp/include/raft/linalg/qr.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,4 @@ void qr_get_qr(raft::resources const& handle,
123123
}; // namespace linalg
124124
}; // namespace raft
125125

126-
#endif
126+
#endif

cpp/include/raft/linalg/reduce.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ void reduce(raft::resources const& handle,
170170
}; // end namespace linalg
171171
}; // end namespace raft
172172

173-
#endif
173+
#endif

cpp/include/raft/linalg/reduce_cols_by_key.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ void reduce_cols_by_key(
116116
}; // end namespace linalg
117117
}; // end namespace raft
118118

119-
#endif
119+
#endif

cpp/include/raft/linalg/reduce_rows_by_key.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,4 @@ void reduce_rows_by_key(
195195
}; // end namespace linalg
196196
}; // end namespace raft
197197

198-
#endif
198+
#endif

cpp/include/raft/linalg/rsvd.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,4 +880,4 @@ void randomized_svd(const raft::resources& handle,
880880
}; // end namespace linalg
881881
}; // end namespace raft
882882

883-
#endif
883+
#endif

cpp/include/raft/linalg/sqrt.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ void sqrt(raft::resources const& handle, InType in, OutType out)
8787
}; // end namespace linalg
8888
}; // end namespace raft
8989

90-
#endif
90+
#endif

cpp/include/raft/linalg/strided_reduction.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,4 @@ void strided_reduction(raft::resources const& handle,
174174
}; // end namespace linalg
175175
}; // end namespace raft
176176

177-
#endif
177+
#endif

cpp/include/raft/linalg/subtract.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,4 @@ void subtract_scalar(
226226
}; // end namespace linalg
227227
}; // end namespace raft
228228

229-
#endif
229+
#endif

cpp/include/raft/linalg/svd.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,4 +420,4 @@ void svd_reconstruction(raft::resources const& handle,
420420
}; // end namespace linalg
421421
}; // end namespace raft
422422

423-
#endif
423+
#endif

0 commit comments

Comments
 (0)