Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions cpp/benchmarks/replay/replay.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -14,9 +14,8 @@
#include <rmm/mr/owning_wrapper.hpp>
#include <rmm/mr/pool_memory_resource.hpp>

#include <cuda/iterator>
#include <thrust/execution_policy.h>
#include <thrust/iterator/constant_iterator.h>
#include <thrust/iterator/discard_iterator.h>
#include <thrust/reduce.h>

#include <benchmark/benchmark.h>
Expand Down Expand Up @@ -277,8 +276,8 @@ std::vector<std::vector<rmm::detail::event>> parse_per_thread_events(std::string
thrust::host,
all_events.begin(),
all_events.end(),
thrust::make_constant_iterator(1),
thrust::make_discard_iterator(),
cuda::make_constant_iterator(1),
cuda::make_discard_iterator(),
std::back_inserter(events_per_thread),
[](event const& lhs, event const& rhs) { return lhs.thread_id == rhs.thread_id; });

Expand Down
7 changes: 4 additions & 3 deletions cpp/include/rmm/device_uvector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <rmm/mr/per_device_resource.hpp>
#include <rmm/resource_ref.hpp>

#include <cuda/std/iterator>
#include <cuda/std/span>
#include <thrust/iterator/reverse_iterator.h>

#include <cstddef>
#include <type_traits>
Expand Down Expand Up @@ -80,9 +80,10 @@ class device_uvector {
using iterator = pointer; ///< The type of the iterator returned by begin()
using const_iterator = const_pointer; ///< The type of the const iterator returned by cbegin()
using reverse_iterator =
thrust::reverse_iterator<iterator>; ///< The type of the iterator returned by rbegin()
cuda::std::reverse_iterator<iterator>; ///< The type of the iterator returned by rbegin()
using const_reverse_iterator =
thrust::reverse_iterator<const_iterator>; ///< The type of the iterator returned by crbegin()
cuda::std::reverse_iterator<const_iterator>; ///< The type of the iterator returned by
///< crbegin()

RMM_EXEC_CHECK_DISABLE
~device_uvector() = default;
Expand Down
5 changes: 2 additions & 3 deletions cpp/include/rmm/mr/fixed_size_memory_resource.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
#include <rmm/mr/detail/stream_ordered_memory_resource.hpp>
#include <rmm/resource_ref.hpp>

#include <cuda/iterator>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
#include <cuda_runtime_api.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h>

#include <algorithm>
#include <cstddef>
Expand Down Expand Up @@ -176,7 +175,7 @@ class fixed_size_memory_resource
return block_type{static_cast<char*>(ptr) + index * block_size_};
};
auto first =
thrust::make_transform_iterator(thrust::make_counting_iterator(std::size_t{0}), block_gen);
cuda::make_transform_iterator(cuda::make_counting_iterator(std::size_t{0}), block_gen);
return free_list(first, first + num_blocks);
}

Expand Down
2 changes: 0 additions & 2 deletions cpp/include/rmm/mr/pool_memory_resource.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

#include <cuda/std/type_traits>
#include <cuda_runtime_api.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h>

#include <algorithm>
#include <cstddef>
Expand Down
10 changes: 5 additions & 5 deletions cpp/tests/logger_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -8,7 +8,7 @@
#include <rmm/mr/cuda_memory_resource.hpp>
#include <rmm/mr/logging_resource_adaptor.hpp>

#include <thrust/iterator/zip_iterator.h>
#include <cuda/iterator>

#include <benchmarks/utilities/log_parser.hpp>
#include <gtest/gtest.h>
Expand Down Expand Up @@ -96,10 +96,10 @@ void expect_log_events(std::string const& filename,
{
auto actual_events = rmm::detail::parse_csv(filename);

auto begin = thrust::make_zip_iterator(
cuda::std::make_tuple(expected_events.begin(), actual_events.begin()));
auto begin =
cuda::make_zip_iterator(cuda::std::make_tuple(expected_events.begin(), actual_events.begin()));
auto end =
thrust::make_zip_iterator(cuda::std::make_tuple(expected_events.end(), actual_events.end()));
cuda::make_zip_iterator(cuda::std::make_tuple(expected_events.end(), actual_events.end()));
Comment thread
miscco marked this conversation as resolved.

std::for_each(begin, end, [](auto const& zipped) {
auto [expected, actual] = zipped;
Expand Down
Loading