Skip to content

Commit 2642b31

Browse files
viclafargueviclafargue
authored
Merge branch 'release/26.06' into fix-sort-columns-per-row
2 parents a422e94 + 2f724f5 commit 2642b31

11 files changed

Lines changed: 150 additions & 38 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
packages: read
4444
pull-requests: read
4545
secrets: inherit # zizmor: ignore[secrets-inherit]
46-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-13.2.0
46+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.06
4747
with:
4848
build_type: ${{ inputs.build_type || 'branch' }}
4949
branch: ${{ inputs.branch }}
@@ -60,7 +60,7 @@ jobs:
6060
packages: read
6161
pull-requests: read
6262
secrets: inherit # zizmor: ignore[secrets-inherit]
63-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-13.2.0
63+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.06
6464
with:
6565
build_type: ${{ inputs.build_type || 'branch' }}
6666
branch: ${{ inputs.branch }}
@@ -78,7 +78,7 @@ jobs:
7878
packages: read
7979
pull-requests: read
8080
secrets: inherit # zizmor: ignore[secrets-inherit]
81-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda-13.2.0
81+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/26.06
8282
with:
8383
build_type: ${{ inputs.build_type || 'branch' }}
8484
branch: ${{ inputs.branch }}
@@ -94,7 +94,7 @@ jobs:
9494
packages: read
9595
pull-requests: read
9696
secrets: inherit # zizmor: ignore[secrets-inherit]
97-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-13.2.0
97+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.06
9898
with:
9999
arch: "amd64"
100100
branch: ${{ inputs.branch }}
@@ -112,7 +112,7 @@ jobs:
112112
packages: read
113113
pull-requests: read
114114
secrets: inherit # zizmor: ignore[secrets-inherit]
115-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
115+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.06
116116
with:
117117
build_type: ${{ inputs.build_type || 'branch' }}
118118
branch: ${{ inputs.branch }}
@@ -133,7 +133,7 @@ jobs:
133133
packages: read
134134
pull-requests: read
135135
secrets: inherit # zizmor: ignore[secrets-inherit]
136-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-13.2.0
136+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.06
137137
with:
138138
build_type: ${{ inputs.build_type || 'branch' }}
139139
branch: ${{ inputs.branch }}
@@ -150,7 +150,7 @@ jobs:
150150
packages: read
151151
pull-requests: read
152152
secrets: inherit # zizmor: ignore[secrets-inherit]
153-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
153+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.06
154154
with:
155155
build_type: ${{ inputs.build_type || 'branch' }}
156156
branch: ${{ inputs.branch }}
@@ -171,7 +171,7 @@ jobs:
171171
packages: read
172172
pull-requests: read
173173
secrets: inherit # zizmor: ignore[secrets-inherit]
174-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-13.2.0
174+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.06
175175
with:
176176
build_type: ${{ inputs.build_type || 'branch' }}
177177
branch: ${{ inputs.branch }}
@@ -189,7 +189,7 @@ jobs:
189189
packages: read
190190
pull-requests: read
191191
secrets: inherit # zizmor: ignore[secrets-inherit]
192-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
192+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.06
193193
with:
194194
build_type: ${{ inputs.build_type || 'branch' }}
195195
branch: ${{ inputs.branch }}
@@ -210,7 +210,7 @@ jobs:
210210
packages: read
211211
pull-requests: read
212212
secrets: inherit # zizmor: ignore[secrets-inherit]
213-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-13.2.0
213+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.06
214214
with:
215215
build_type: ${{ inputs.build_type || 'branch' }}
216216
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
packages: read
3434
pull-requests: read
3535
secrets: inherit # zizmor: ignore[secrets-inherit]
36-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda-13.2.0
36+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/26.06
3737
if: always()
3838
with:
3939
needs: ${{ toJSON(needs) }}
@@ -77,7 +77,7 @@ jobs:
7777
packages: read
7878
pull-requests: read
7979
secrets: inherit # zizmor: ignore[secrets-inherit]
80-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@cuda-13.2.0
80+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/26.06
8181
with:
8282
files_yaml: |
8383
build_docs:
@@ -190,7 +190,7 @@ jobs:
190190
packages: read
191191
pull-requests: read
192192
secrets: inherit # zizmor: ignore[secrets-inherit]
193-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda-13.2.0
193+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/26.06
194194
with:
195195
enable_check_generated_files: false
196196
ignored_pr_jobs: telemetry-summarize
@@ -203,7 +203,7 @@ jobs:
203203
packages: read
204204
pull-requests: read
205205
secrets: inherit # zizmor: ignore[secrets-inherit]
206-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-13.2.0
206+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.06
207207
with:
208208
build_type: pull-request
209209
script: ci/build_cpp.sh
@@ -217,7 +217,7 @@ jobs:
217217
packages: read
218218
pull-requests: read
219219
secrets: inherit # zizmor: ignore[secrets-inherit]
220-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-13.2.0
220+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.06
221221
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
222222
with:
223223
build_type: pull-request
@@ -231,7 +231,7 @@ jobs:
231231
packages: read
232232
pull-requests: read
233233
secrets: inherit # zizmor: ignore[secrets-inherit]
234-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@cuda-13.2.0
234+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.06
235235
with:
236236
build_type: pull-request
237237
conda-python-build:
@@ -243,7 +243,7 @@ jobs:
243243
packages: read
244244
pull-requests: read
245245
secrets: inherit # zizmor: ignore[secrets-inherit]
246-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-13.2.0
246+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.06
247247
with:
248248
build_type: pull-request
249249
script: ci/build_python.sh
@@ -258,7 +258,7 @@ jobs:
258258
packages: read
259259
pull-requests: read
260260
secrets: inherit # zizmor: ignore[secrets-inherit]
261-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-13.2.0
261+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.06
262262
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
263263
with:
264264
build_type: pull-request
@@ -272,7 +272,7 @@ jobs:
272272
packages: read
273273
pull-requests: read
274274
secrets: inherit # zizmor: ignore[secrets-inherit]
275-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-13.2.0
275+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.06
276276
if: fromJSON(needs.changed-files.outputs.changed_file_groups).build_docs
277277
with:
278278
build_type: pull-request
@@ -289,7 +289,7 @@ jobs:
289289
packages: read
290290
pull-requests: read
291291
secrets: inherit # zizmor: ignore[secrets-inherit]
292-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
292+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.06
293293
with:
294294
build_type: pull-request
295295
branch: ${{ inputs.branch }}
@@ -310,7 +310,7 @@ jobs:
310310
packages: read
311311
pull-requests: read
312312
secrets: inherit # zizmor: ignore[secrets-inherit]
313-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
313+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.06
314314
with:
315315
build_type: pull-request
316316
node_type: cpu8
@@ -328,7 +328,7 @@ jobs:
328328
packages: read
329329
pull-requests: read
330330
secrets: inherit # zizmor: ignore[secrets-inherit]
331-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
331+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.06
332332
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
333333
with:
334334
build_type: pull-request
@@ -342,7 +342,7 @@ jobs:
342342
packages: read
343343
pull-requests: read
344344
secrets: inherit # zizmor: ignore[secrets-inherit]
345-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
345+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.06
346346
with:
347347
build_type: pull-request
348348
node_type: cpu8
@@ -360,7 +360,7 @@ jobs:
360360
packages: read
361361
pull-requests: read
362362
secrets: inherit # zizmor: ignore[secrets-inherit]
363-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
363+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.06
364364
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
365365
with:
366366
build_type: pull-request
@@ -374,7 +374,7 @@ jobs:
374374
packages: read
375375
pull-requests: read
376376
secrets: inherit # zizmor: ignore[secrets-inherit]
377-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@cuda-13.2.0
377+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/26.06
378378
with:
379379
arch: '["amd64", "arm64"]'
380380
cuda: '["13.2"]'
@@ -392,7 +392,7 @@ jobs:
392392
runs-on: linux-amd64-cpu4
393393
needs: pr-builder
394394
permissions:
395-
actions: read
395+
actions: write
396396
if: ${{ vars.TELEMETRY_ENABLED == 'true' && !cancelled() }}
397397
continue-on-error: true
398398
steps:

‎.github/workflows/test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
packages: read
3434
pull-requests: read
3535
secrets: inherit # zizmor: ignore[secrets-inherit]
36-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@cuda-13.2.0
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.06
3737
with:
3838
build_type: ${{ inputs.build_type }}
3939
branch: ${{ inputs.branch }}
@@ -47,7 +47,7 @@ jobs:
4747
packages: read
4848
pull-requests: read
4949
secrets: inherit # zizmor: ignore[secrets-inherit]
50-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-13.2.0
50+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.06
5151
with:
5252
build_type: ${{ inputs.build_type }}
5353
branch: ${{ inputs.branch }}
@@ -62,7 +62,7 @@ jobs:
6262
packages: read
6363
pull-requests: read
6464
secrets: inherit # zizmor: ignore[secrets-inherit]
65-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-13.2.0
65+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.06
6666
with:
6767
build_type: ${{ inputs.build_type }}
6868
branch: ${{ inputs.branch }}
@@ -77,7 +77,7 @@ jobs:
7777
packages: read
7878
pull-requests: read
7979
secrets: inherit # zizmor: ignore[secrets-inherit]
80-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
80+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.06
8181
with:
8282
build_type: ${{ inputs.build_type }}
8383
branch: ${{ inputs.branch }}
@@ -92,7 +92,7 @@ jobs:
9292
packages: read
9393
pull-requests: read
9494
secrets: inherit # zizmor: ignore[secrets-inherit]
95-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
95+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.06
9696
with:
9797
build_type: ${{ inputs.build_type }}
9898
branch: ${{ inputs.branch }}

‎.github/workflows/trigger-breaking-change-alert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
packages: read
2222
pull-requests: read
2323
secrets: inherit # zizmor: ignore[secrets-inherit]
24-
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@cuda-13.2.0
24+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/26.06
2525
with:
2626
sender_login: ${{ github.event.sender.login }}
2727
sender_avatar: ${{ github.event.sender.avatar_url }}

‎RAPIDS_BRANCH‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
main
1+
release/26.06

‎UCXX_BRANCH‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
main
1+
release/0.50

‎cpp/include/raft/core/numpy_serializer.hpp‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/*
2+
* SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
#pragma once
7+
8+
#include <raft/core/detail/mdspan_numpy_serializer.hpp>
9+
10+
namespace raft::numpy_serializer {
11+
12+
/**
13+
* @defgroup numpy_serializer NumPy serialization helpers
14+
* @{
15+
*/
16+
17+
/**
18+
* @brief Integer type used for NumPy array shape extents.
19+
*/
20+
using ndarray_len_t = detail::numpy_serializer::ndarray_len_t;
21+
22+
/**
23+
* @brief NumPy dtype descriptor.
24+
*/
25+
using dtype_t = detail::numpy_serializer::dtype_t;
26+
27+
/**
28+
* @brief Parsed NumPy header metadata.
29+
*/
30+
using header_t = detail::numpy_serializer::header_t;
31+
32+
/**
33+
* @brief Return the NumPy dtype descriptor corresponding to a C++ element type.
34+
*
35+
* @tparam T C++ element type.
36+
* @return NumPy dtype descriptor for T.
37+
*/
38+
template <typename T>
39+
inline dtype_t get_numpy_dtype()
40+
{
41+
return detail::numpy_serializer::get_numpy_dtype<T>();
42+
}
43+
44+
/**
45+
* @brief Parse a NumPy dtype descriptor string.
46+
*
47+
* @param typestr NumPy dtype descriptor string.
48+
* @return Parsed NumPy dtype descriptor.
49+
*/
50+
inline dtype_t parse_descr(std::string typestr)
51+
{
52+
return detail::numpy_serializer::parse_descr(typestr);
53+
}
54+
55+
/**
56+
* @brief Write a NumPy `.npy` header to an output stream.
57+
*
58+
* @param os Output stream.
59+
* @param header Header metadata to write.
60+
*/
61+
inline void write_header(std::ostream& os, const header_t& header)
62+
{
63+
detail::numpy_serializer::write_header(os, header);
64+
}
65+
66+
/**
67+
* @brief Read and parse a NumPy `.npy` header from an input stream.
68+
*
69+
* The stream is left positioned immediately after the header.
70+
*
71+
* @param is Input stream.
72+
* @return Parsed NumPy header metadata.
73+
*/
74+
inline header_t read_header(std::istream& is) { return detail::numpy_serializer::read_header(is); }
75+
76+
/** @} */
77+
78+
} // namespace raft::numpy_serializer

0 commit comments

Comments
 (0)