Skip to content

Commit 7caf9a2

Browse files
bdicebdice
authored
Update RMM includes from <rmm/mr/device/*> to <rmm/mr/*> (#664)
This updates RMM memory resource includes to use the header path `<rmm/mr/*>` instead of `<rmm/mr/device/*>`. xref: rapidsai/rmm#2141 Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Lawrence Mitchell (https://github.com/wence-) URL: #664
1 parent 887d3a9 commit 7caf9a2

13 files changed

+22
-22
lines changed

‎cpp/benchmarks/bench_memory_resources.cpp‎

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

1111
#include <rmm/cuda_stream_view.hpp>
1212
#include <rmm/device_buffer.hpp>
13-
#include <rmm/mr/device/cuda_memory_resource.hpp>
13+
#include <rmm/mr/cuda_memory_resource.hpp>
1414
#include <rmm/mr/pinned_host_memory_resource.hpp>
1515

1616
#include <rapidsmpf/buffer/pinned_memory_resource.hpp>

‎cpp/benchmarks/bench_partition.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include <cudf/types.hpp>
1515
#include <rmm/cuda_stream_view.hpp>
1616
#include <rmm/device_buffer.hpp>
17-
#include <rmm/mr/device/cuda_memory_resource.hpp>
18-
#include <rmm/mr/device/pool_memory_resource.hpp>
17+
#include <rmm/mr/cuda_memory_resource.hpp>
18+
#include <rmm/mr/pool_memory_resource.hpp>
1919

2020
#include <rapidsmpf/integrations/cudf/partition.hpp>
2121

‎cpp/benchmarks/utils/rmm_stack.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#include <string>
88

99
#include <cudf/utilities/memory_resource.hpp>
10-
#include <rmm/mr/device/cuda_async_memory_resource.hpp>
11-
#include <rmm/mr/device/cuda_memory_resource.hpp>
12-
#include <rmm/mr/device/managed_memory_resource.hpp>
13-
#include <rmm/mr/device/owning_wrapper.hpp>
14-
#include <rmm/mr/device/pool_memory_resource.hpp>
10+
#include <rmm/mr/cuda_async_memory_resource.hpp>
11+
#include <rmm/mr/cuda_memory_resource.hpp>
12+
#include <rmm/mr/managed_memory_resource.hpp>
13+
#include <rmm/mr/owning_wrapper.hpp>
14+
#include <rmm/mr/pool_memory_resource.hpp>
1515

1616
#include <rapidsmpf/error.hpp>
1717
#include <rapidsmpf/rmm_resource_adaptor.hpp>

‎cpp/include/rapidsmpf/rmm_resource_adaptor.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <unordered_set>
1717

1818
#include <rmm/error.hpp>
19-
#include <rmm/mr/device/device_memory_resource.hpp>
19+
#include <rmm/mr/device_memory_resource.hpp>
2020
#include <rmm/resource_ref.hpp>
2121

2222
namespace rapidsmpf {

‎cpp/tests/streaming/base_streaming_fixture.hpp‎

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

1010
#include <cudf/utilities/default_stream.hpp>
11-
#include <rmm/mr/device/cuda_memory_resource.hpp>
11+
#include <rmm/mr/cuda_memory_resource.hpp>
1212

1313
#include <rapidsmpf/buffer/buffer.hpp>
1414
#include <rapidsmpf/communicator/single.hpp>

‎cpp/tests/streaming/test_read_parquet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <cudf_test/column_wrapper.hpp>
3131
#include <cudf_test/table_utilities.hpp>
3232
#include <rmm/cuda_stream_view.hpp>
33-
#include <rmm/mr/device/per_device_resource.hpp>
33+
#include <rmm/mr/per_device_resource.hpp>
3434

3535
#include <rapidsmpf/allgather/allgather.hpp>
3636
#include <rapidsmpf/buffer/packed_data.hpp>

‎cpp/tests/streaming/test_table_chunk.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <cudf_test/column_wrapper.hpp>
1616
#include <cudf_test/table_utilities.hpp>
1717
#include <rmm/cuda_stream_view.hpp>
18-
#include <rmm/mr/device/per_device_resource.hpp>
18+
#include <rmm/mr/per_device_resource.hpp>
1919

2020
#include <rapidsmpf/owning_wrapper.hpp>
2121
#include <rapidsmpf/streaming/core/channel.hpp>

‎cpp/tests/test_buffer_resource.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <cudf_test/column_wrapper.hpp>
1414
#include <cudf_test/debug_utilities.hpp>
1515
#include <cudf_test/table_utilities.hpp>
16-
#include <rmm/mr/device/limiting_resource_adaptor.hpp>
17-
#include <rmm/mr/device/owning_wrapper.hpp>
16+
#include <rmm/mr/limiting_resource_adaptor.hpp>
17+
#include <rmm/mr/owning_wrapper.hpp>
1818

1919
#include <rapidsmpf/buffer/buffer.hpp>
2020
#include <rapidsmpf/buffer/resource.hpp>

‎cpp/tests/test_communicator.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <gmock/gmock.h>
77
#include <gtest/gtest.h>
88

9-
#include <rmm/mr/device/cuda_memory_resource.hpp>
10-
#include <rmm/mr/device/device_memory_resource.hpp>
9+
#include <rmm/mr/cuda_memory_resource.hpp>
10+
#include <rmm/mr/device_memory_resource.hpp>
1111
#include <rmm/resource_ref.hpp>
1212

1313
#include <rapidsmpf/buffer/buffer.hpp>

‎cpp/tests/test_metadata_payload_exchange.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <gmock/gmock.h>
77
#include <gtest/gtest.h>
88

9-
#include <rmm/mr/device/cuda_memory_resource.hpp>
10-
#include <rmm/mr/device/device_memory_resource.hpp>
9+
#include <rmm/mr/cuda_memory_resource.hpp>
10+
#include <rmm/mr/device_memory_resource.hpp>
1111
#include <rmm/resource_ref.hpp>
1212

1313
#include <rapidsmpf/buffer/buffer.hpp>

0 commit comments

Comments
 (0)