Skip to content

Commit d82f799

Browse files
committed
Use stream as name
1 parent 165eea0 commit d82f799

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

cuda_core/cuda/core/experimental/_graph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def _check_capture_stream_provided(self, *args, **kwargs):
8686
raise RuntimeError("Tried to use a stream capture operation on a graph builder without a stream")
8787

8888
@property
89-
def legacy_stream_capture(self) -> Stream:
89+
def stream(self) -> Stream:
9090
return self._mnff.stream
9191

9292
@property
@@ -178,7 +178,7 @@ def join(self, *graph_builders):
178178
raise ValueError("The primary graph builder should not be joined. Others builders should instead be joined onto it.")
179179

180180
for graph in graph_builders:
181-
self._mnff.stream.wait(graph.legacy_stream_capture)
181+
self._mnff.stream.wait(graph.stream)
182182
# TODO: Do we close them now or let weakref handle it during garbage collection?
183183
# This is a perf question, is there a good default?
184184
graph.close()

cuda_core/tests/test_graph.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ def test_graph_straight(init_cuda):
3636

3737
# Test start
3838
graph_builder = Device().build_graph()
39-
config = LaunchConfig(grid=1, block=1, stream=graph_builder.legacy_stream_capture)
39+
config = LaunchConfig(grid=1, block=1, stream=graph_builder.stream)
4040

4141
assert graph_builder.is_capture_active() is False
4242
graph_builder.begin_capture()
43-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.legacy_stream_capture})
44-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.legacy_stream_capture})
45-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.legacy_stream_capture})
43+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.stream})
44+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.stream})
45+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.stream})
4646
graph_builder.end_capture()
4747

4848

@@ -61,16 +61,16 @@ def test_graph_fork_join(init_cuda):
6161
graph_builder = Device().build_graph()
6262
assert graph_builder.is_capture_active() is False
6363
graph_builder.begin_capture()
64-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.legacy_stream_capture})
64+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.stream})
6565

6666
left, right = graph_builder.fork(2)
67-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": left.legacy_stream_capture})
68-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": left.legacy_stream_capture})
69-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": right.legacy_stream_capture})
70-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": right.legacy_stream_capture})
67+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": left.stream})
68+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": left.stream})
69+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": right.stream})
70+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": right.stream})
7171
graph_builder.join(left, right)
7272

73-
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.legacy_stream_capture})
73+
launch(empty_kernel, {"grid": 1, "block": 1, "stream": graph_builder.stream})
7474
graph_builder.end_capture()
7575

7676
graph_builder.debug_dot_print(b"vlad.dot")

0 commit comments

Comments
 (0)