Skip to content

Commit f2a7674

Browse files
authored
Replace <cuda/stream_ref> includes with <cuda/stream> (#2513)
CCCL deprecated the `<cuda/stream_ref>` header; `cuda::stream_ref` is now provided by `<cuda/stream>`. This PR switches every `#include <cuda/stream_ref>` to `#include <cuda/stream>` so RMM builds against newer CCCL. The `cuda::stream_ref` type is unchanged. This was observed in rapids-cmake CI: https://github.com/rapidsai/rapids-cmake/actions/runs/31745925779/job/94600794610?pr=1073 Authors: - Bradley Dice (https://github.com/bdice) - Cursor Agent (https://github.com/cursoragent) Approvers: - Rong Ou (https://github.com/rongou) URL: #2513
1 parent bf1f745 commit f2a7674

34 files changed

Lines changed: 39 additions & 39 deletions

cpp/benchmarks/utilities/simulated_memory_resource.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
2+
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
#pragma once
@@ -9,7 +9,7 @@
99
#include <rmm/detail/format.hpp>
1010

1111
#include <cuda/memory_resource>
12-
#include <cuda/stream_ref>
12+
#include <cuda/stream>
1313
#include <cuda_runtime_api.h>
1414

1515
#include <cstddef>

cpp/include/rmm/cuda_stream.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <rmm/cuda_stream_view.hpp>
99
#include <rmm/detail/export.hpp>
1010

11-
#include <cuda/stream_ref>
11+
#include <cuda/stream>
1212
#include <cuda_runtime_api.h>
1313

1414
#include <functional>

cpp/include/rmm/cuda_stream_view.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <rmm/detail/export.hpp>
99

10-
#include <cuda/stream_ref>
10+
#include <cuda/stream>
1111
#include <cuda_runtime_api.h>
1212

1313
#include <cstddef>

cpp/include/rmm/mr/cuda_async_view_memory_resource.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <rmm/detail/export.hpp>
99

1010
#include <cuda/memory_resource>
11-
#include <cuda/stream_ref>
11+
#include <cuda/stream>
1212
#include <cuda_runtime_api.h>
1313

1414
#include <cstddef>

cpp/include/rmm/mr/cuda_memory_resource.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <rmm/detail/export.hpp>
99

1010
#include <cuda/memory_resource>
11-
#include <cuda/stream_ref>
11+
#include <cuda/stream>
1212

1313
#include <cstddef>
1414

cpp/include/rmm/mr/detail/cuda_async_managed_memory_resource_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <rmm/mr/cuda_async_view_memory_resource.hpp>
1010

1111
#include <cuda/memory_resource>
12-
#include <cuda/stream_ref>
12+
#include <cuda/stream>
1313
#include <cuda_runtime_api.h>
1414

1515
#include <cstddef>

cpp/include/rmm/mr/detail/cuda_async_memory_resource_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <rmm/mr/cuda_async_view_memory_resource.hpp>
1010

1111
#include <cuda/memory_resource>
12-
#include <cuda/stream_ref>
12+
#include <cuda/stream>
1313
#include <cuda_runtime_api.h>
1414

1515
#include <cstddef>

cpp/include/rmm/mr/detail/failure_callback_resource_adaptor_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <rmm/resource_ref.hpp>
1313

1414
#include <cuda/memory_resource>
15-
#include <cuda/stream_ref>
15+
#include <cuda/stream>
1616
#include <cuda_runtime_api.h>
1717

1818
#include <cstddef>

cpp/include/rmm/mr/detail/sam_headroom_memory_resource_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <rmm/mr/system_memory_resource.hpp>
1010

1111
#include <cuda/memory_resource>
12-
#include <cuda/stream_ref>
12+
#include <cuda/stream>
1313
#include <cuda_runtime_api.h>
1414

1515
#include <cstddef>

cpp/include/rmm/mr/detail/stream_ordered_memory_resource.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <rmm/logger.hpp>
1313
#include <rmm/process_is_exiting.hpp>
1414

15-
#include <cuda/stream_ref>
15+
#include <cuda/stream>
1616
#include <cuda_runtime_api.h>
1717

1818
#include <algorithm>

0 commit comments

Comments
 (0)