Skip to content

Commit 5b579e8

Browse files
committed
Merge branch 'branch-25.10' of github.com:rapidsai/rapidsmpf into shuffler-callbacks
2 parents 35d6207 + e44a99c commit 5b579e8

Some content is hidden

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

51 files changed

+699
-236
lines changed

.github/workflows/build.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535
conda-cpp-build:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda13.0
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.10
3838
with:
3939
build_type: ${{ inputs.build_type || 'branch' }}
4040
branch: ${{ inputs.branch }}
@@ -44,7 +44,7 @@ jobs:
4444
conda-python-build:
4545
needs: [conda-cpp-build]
4646
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0
47+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
4848
with:
4949
build_type: ${{ inputs.build_type || 'branch' }}
5050
branch: ${{ inputs.branch }}
@@ -54,7 +54,7 @@ jobs:
5454
upload-conda:
5555
needs: [conda-cpp-build, conda-python-build]
5656
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda13.0
57+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.10
5858
with:
5959
build_type: ${{ inputs.build_type || 'branch' }}
6060
branch: ${{ inputs.branch }}
@@ -64,7 +64,7 @@ jobs:
6464
if: github.ref_type == 'branch'
6565
needs: conda-python-build
6666
secrets: inherit
67-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda13.0
67+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
6868
with:
6969
arch: "amd64"
7070
branch: ${{ inputs.branch }}
@@ -76,7 +76,7 @@ jobs:
7676
sha: ${{ inputs.sha }}
7777
wheel-build-librapidsmpf:
7878
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0
79+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
8080
with:
8181
build_type: ${{ inputs.build_type || 'branch' }}
8282
branch: ${{ inputs.branch }}
@@ -90,7 +90,7 @@ jobs:
9090
wheel-publish-librapidsmpf:
9191
needs: wheel-build-librapidsmpf
9292
secrets: inherit
93-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda13.0
93+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.10
9494
with:
9595
build_type: ${{ inputs.build_type || 'branch' }}
9696
branch: ${{ inputs.branch }}
@@ -101,7 +101,7 @@ jobs:
101101
wheel-build-rapidsmpf:
102102
needs: wheel-build-librapidsmpf
103103
secrets: inherit
104-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0
104+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
105105
with:
106106
build_type: ${{ inputs.build_type || 'branch' }}
107107
branch: ${{ inputs.branch }}
@@ -113,7 +113,7 @@ jobs:
113113
wheel-publish-rapidsmpf:
114114
needs: wheel-build-rapidsmpf
115115
secrets: inherit
116-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda13.0
116+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.10
117117
with:
118118
build_type: ${{ inputs.build_type || 'branch' }}
119119
branch: ${{ inputs.branch }}
@@ -124,7 +124,7 @@ jobs:
124124
wheel-build-rapidsmpf-singlecomm:
125125
needs: wheel-build-rapidsmpf
126126
secrets: inherit
127-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0
127+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
128128
with:
129129
build_type: ${{ inputs.build_type || 'branch' }}
130130
branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
- wheel-test
2727
- devcontainer
2828
secrets: inherit
29-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda13.0
29+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.10
3030
if: always()
3131
with:
3232
needs: ${{ toJSON(needs) }}
3333
changed-files:
3434
secrets: inherit
35-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@cuda13.0
35+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.10
3636
with:
3737
files_yaml: |
3838
test_cpp:
@@ -58,11 +58,11 @@ jobs:
5858
- '!docs/**'
5959
checks:
6060
secrets: inherit
61-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda13.0
61+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.10
6262
wheel-build-librapidsmpf:
6363
needs: checks
6464
secrets: inherit
65-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0
65+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
6666
with:
6767
build_type: pull-request
6868
script: ci/build_wheel_librapidsmpf.sh
@@ -73,7 +73,7 @@ jobs:
7373
wheel-build-rapidsmpf:
7474
needs: [checks, wheel-build-librapidsmpf]
7575
secrets: inherit
76-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0
76+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
7777
with:
7878
build_type: pull-request
7979
script: ci/build_wheel_rapidsmpf.sh
@@ -82,7 +82,7 @@ jobs:
8282
wheel-build-rapidsmpf-singlecomm:
8383
needs: [checks, wheel-build-librapidsmpf]
8484
secrets: inherit
85-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda13.0
85+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
8686
with:
8787
build_type: pull-request
8888
script: ci/build_wheel_singlecomm.sh
@@ -92,22 +92,22 @@ jobs:
9292
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
9393
needs: [changed-files, wheel-build-rapidsmpf]
9494
secrets: inherit
95-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda13.0
95+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.10
9696
with:
9797
build_type: pull-request
9898
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
9999
script: ci/test_wheel.sh
100100
conda-cpp-build:
101101
needs: checks
102102
secrets: inherit
103-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda13.0
103+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.10
104104
with:
105105
build_type: pull-request
106106
script: ci/build_cpp.sh
107107
conda-cpp-linters:
108108
secrets: inherit
109109
needs: checks
110-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda13.0
110+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
111111
with:
112112
build_type: pull-request
113113
script: "ci/cpp_linters.sh"
@@ -116,23 +116,23 @@ jobs:
116116
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
117117
needs: [changed-files, conda-cpp-build]
118118
secrets: inherit
119-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda13.0
119+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.10
120120
with:
121121
build_type: pull-request
122122
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
123123
script: ci/test_cpp.sh
124124
conda-python-build:
125125
needs: conda-cpp-build
126126
secrets: inherit
127-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda13.0
127+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
128128
with:
129129
build_type: pull-request
130130
script: ci/build_python.sh
131131
conda-python-tests:
132132
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
133133
needs: [changed-files, conda-python-build]
134134
secrets: inherit
135-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda13.0
135+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.10
136136
with:
137137
build_type: pull-request
138138
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
@@ -141,7 +141,7 @@ jobs:
141141
docs-build:
142142
needs: conda-python-build
143143
secrets: inherit
144-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda13.0
144+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
145145
with:
146146
build_type: pull-request
147147
node_type: "cpu8"
@@ -150,7 +150,7 @@ jobs:
150150
script: "ci/build_docs.sh"
151151
devcontainer:
152152
secrets: inherit
153-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@cuda13.0
153+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.10
154154
with:
155155
arch: '["amd64", "arm64"]'
156156
cuda: '["13.0"]'

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
conda-cpp-tests:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda13.0
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.10
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
@@ -35,7 +35,7 @@ jobs:
3535
sha: ${{ inputs.sha }}
3636
conda-python-tests:
3737
secrets: inherit
38-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda13.0
38+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.10
3939
with:
4040
build_type: ${{ inputs.build_type }}
4141
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
sha: ${{ inputs.sha }}
4747
wheel-test:
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda13.0
49+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.10
5050
with:
5151
build_type: ${{ inputs.build_type }}
5252
branch: ${{ inputs.branch }}

cpp/benchmarks/streaming/data_generator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace rapidsmpf::streaming::node {
2929
* distributed in the range [`min_val`, `max_val`]. Each generated table is wrapped
3030
* in a `TableChunk` and sent to the provided output channel in streaming fashion.
3131
*
32-
* @param ctx The context to use.
32+
* @param ctx The node context to use.
3333
* @param stream The CUDA stream on which to create the random tables. TODO: use a pool
3434
* of CUDA streams.
3535
* @param ch_out Output channel to which generated `TableChunk` objects are sent.

cpp/include/rapidsmpf/streaming/core/leaf_node.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace rapidsmpf::streaming::node {
1818
* Sends each message of the input vector into the channel in order,
1919
* marking the end of the stream once done.
2020
*
21-
* @param ctx The context to use.
21+
* @param ctx The node context to use.
2222
* @param ch_out Output channel to which messages will be sent.
2323
* @param messages Input vector containing the messages to send.
2424
* @return Streaming node representing the asynchronous operation.
@@ -37,7 +37,7 @@ Node push_to_channel(
3737
* Receives messages from the channel until it is closed and appends them
3838
* to the provided output vector.
3939
*
40-
* @param ctx The context to use.
40+
* @param ctx The node context to use.
4141
* @param ch_in Input channel providing messages.
4242
* @param out_messages Output vector to store the received messages.
4343
* @return Streaming node representing the asynchronous operation.

cpp/include/rapidsmpf/streaming/cudf/partition.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ namespace node {
8383
* `num_partitions` based on a hash of the selected columns, packs the resulting
8484
* partitions, and sends them to an output channel.
8585
*
86-
* @param ctx The context to use.
86+
* @param ctx The node context to use.
8787
* @param ch_in Input channel providing `TableChunk`s to partition.
8888
* @param ch_out Output channel to which `PartitionMapChunk`s are sent.
8989
* @param columns_to_hash Indices of input columns to hash.
@@ -119,7 +119,7 @@ Node partition_and_pack(
119119
* them, and sends the resulting tables to the output channel. Empty partitions are
120120
* ignored.
121121
*
122-
* @param ctx The context to use.
122+
* @param ctx The node context to use.
123123
* @param ch_in Input channel providing packed partitions as PartitionMapChunk or
124124
* PartitionVectorChunk.
125125
* @param ch_out Output channel to which unpacked and concatenated tables table are sent.

cpp/include/rapidsmpf/streaming/cudf/shuffler.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ namespace rapidsmpf::streaming::node {
2323
* It consumes partitioned input data from the input channel and produces output chunks
2424
* grouped by `partition_owner`.
2525
*
26-
* @param ctx The streaming context providing communication, memory, stream, and execution
27-
* resources.
26+
* @param ctx The context to use.
2827
* @param stream The CUDA stream on which to perform the shuffling. If chunks from the
2928
* input channel aren't created on `stream`, the streams are all synchronized.
3029
* @param ch_in Input channel providing PartitionMapChunk to be shuffled.

cpp/src/shuffler/shuffler.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ std::unique_ptr<Buffer> allocate_buffer(
105105
* @param amount The maximum amount of data (in bytes) to be spilled.
106106
*
107107
* @return The actual amount of data successfully spilled from the postbox.
108+
*
109+
* @warning This may temporarily empty the postbox, causing emptiness checks to return
110+
* true even though the postbox is not actually empty. As a result, in the current
111+
* implementation `postbox_spilling()` must not be used to spill `outgoing_postbox_`.
108112
*/
109113
template <typename KeyType>
110114
std::size_t postbox_spilling(

python/rapidsmpf/rapidsmpf/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# SPDX-License-Identifier: Apache-2.0
44
# =================================================================================
55

6-
set(cython_modules config.pyx progress_thread.pyx rmm_resource_adaptor.pyx shuffler.pyx
7-
statistics.pyx
6+
set(cython_modules config.pyx cuda_stream.pyx progress_thread.pyx rmm_resource_adaptor.pyx
7+
shuffler.pyx statistics.pyx
88
)
99

1010
rapids_cython_create_modules(

python/rapidsmpf/rapidsmpf/allgather/allgather.pyx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,11 @@ cdef class AllGather:
5959
Communicator comm,
6060
ProgressThread progress_thread,
6161
uint8_t op_id,
62-
stream,
62+
Stream stream,
6363
BufferResource br,
6464
Statistics statistics = None,
6565
):
66-
if stream is None:
67-
raise ValueError("stream cannot be None")
68-
self._stream = Stream(stream)
66+
self._stream = stream
6967
self._comm = comm
7068
self._br = br
7169
cdef cpp_BufferResource* br_ = br.ptr()

0 commit comments

Comments
 (0)