Skip to content

Commit a9bc0af

Browse files
committed
Follow up on merge commit
1 parent 8d56307 commit a9bc0af

10 files changed

Lines changed: 25 additions & 246 deletions

File tree

cpp/include/raft/util/dry_run_resources.hpp renamed to cpp/include/raft/core/dry_run_resources.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55
#pragma once
66

7+
#include <raft/core/memory_stats_resources.hpp>
78
#include <raft/core/resource/device_memory_resource.hpp>
89
#include <raft/core/resource/dry_run_flag.hpp>
910
#include <raft/core/resource/managed_memory_resource.hpp>
@@ -12,7 +13,6 @@
1213
#include <raft/mr/dry_run_resource.hpp>
1314
#include <raft/mr/host_device_resource.hpp>
1415
#include <raft/mr/host_memory_resource.hpp>
15-
#include <raft/util/memory_stats_resources.hpp>
1616

1717
#include <rmm/cuda_stream_view.hpp>
1818
#include <rmm/mr/per_device_resource.hpp>

cpp/include/raft/util/memory_stats_resources.hpp

Lines changed: 0 additions & 237 deletions
This file was deleted.

cpp/tests/linalg/rsvd.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#include "../test_utils.cuh"
77

88
#include <raft/core/device_mdarray.hpp>
9+
#include <raft/core/dry_run_resources.hpp>
910
#include <raft/core/resource/cuda_stream.hpp>
1011
#include <raft/core/resources.hpp>
1112
#include <raft/linalg/rsvd.cuh>
1213
#include <raft/random/rng.cuh>
1314
#include <raft/util/cuda_utils.cuh>
1415
#include <raft/util/cudart_utils.hpp>
15-
#include <raft/util/dry_run_resources.hpp>
1616

1717
#include <gtest/gtest.h>
1818

cpp/tests/linalg/svd.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#include "../test_utils.cuh"
77

88
#include <raft/core/device_mdarray.hpp>
9+
#include <raft/core/dry_run_resources.hpp>
910
#include <raft/core/resource/cuda_stream.hpp>
1011
#include <raft/linalg/init.cuh>
1112
#include <raft/linalg/svd.cuh>
1213
#include <raft/util/cuda_utils.cuh>
1314
#include <raft/util/cudart_utils.hpp>
14-
#include <raft/util/dry_run_resources.hpp>
1515

1616
#include <gtest/gtest.h>
1717

cpp/tests/matrix/sample_rows.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "../test_utils.cuh"
77

88
#include <raft/core/device_mdarray.hpp>
9+
#include <raft/core/dry_run_resources.hpp>
910
#include <raft/core/host_mdarray.hpp>
1011
#include <raft/core/mdspan.hpp>
1112
#include <raft/core/resource/cuda_stream.hpp>
@@ -14,7 +15,6 @@
1415
#include <raft/matrix/sample_rows.cuh>
1516
#include <raft/random/rng.cuh>
1617
#include <raft/util/cudart_utils.hpp>
17-
#include <raft/util/dry_run_resources.hpp>
1818
#include <raft/util/itertools.hpp>
1919

2020
#include <gtest/gtest.h>

cpp/tests/test_utils.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
#include "test_utils.h"
99

10+
#include <raft/core/dry_run_resources.hpp>
11+
#include <raft/core/memory_stats_resources.hpp>
1012
#include <raft/core/resource/cuda_stream.hpp>
1113
#include <raft/core/resources.hpp>
1214
#include <raft/random/rng.cuh>
1315
#include <raft/util/cuda_utils.cuh>
1416
#include <raft/util/cudart_utils.hpp>
15-
#include <raft/util/dry_run_resources.hpp>
16-
#include <raft/util/memory_stats_resources.hpp>
1717

1818
#include <rmm/exec_policy.hpp>
1919
#include <rmm/mr/per_device_resource.hpp>

cpp/tests/util/dry_run_guards.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <raft/core/copy.hpp>
77
#include <raft/core/device_mdarray.hpp>
88
#include <raft/core/device_mdspan.hpp>
9+
#include <raft/core/dry_run_resources.hpp>
910
#include <raft/core/host_mdspan.hpp>
1011
#include <raft/core/operators.hpp>
1112
#include <raft/core/resource/cuda_stream.hpp>
@@ -18,7 +19,6 @@
1819
#include <raft/random/rng.cuh>
1920
#include <raft/stats/mean.cuh>
2021
#include <raft/util/cudart_utils.hpp>
21-
#include <raft/util/dry_run_resources.hpp>
2222

2323
#include <rmm/device_uvector.hpp>
2424

cpp/tests/util/dry_run_resources.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
#include <raft/core/dry_run_resources.hpp>
67
#include <raft/core/resource/device_memory_resource.hpp>
78
#include <raft/core/resource/dry_run_flag.hpp>
89
#include <raft/core/resource/managed_memory_resource.hpp>
@@ -12,7 +13,6 @@
1213
#include <raft/mr/host_device_resource.hpp>
1314
#include <raft/mr/host_memory_resource.hpp>
1415
#include <raft/util/cudart_utils.hpp>
15-
#include <raft/util/dry_run_resources.hpp>
1616

1717
#include <rmm/mr/per_device_resource.hpp>
1818
#include <rmm/resource_ref.hpp>

docs/source/cpp_api/core_resources.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,22 @@ namespace *raft*
222222
:project: RAFT
223223
:members:
224224

225+
Dry-Run Resources
226+
~~~~~~~~~~~~~~~~~
227+
228+
``#include <raft/core/dry_run_resources.hpp>``
229+
230+
namespace *raft*
231+
232+
.. doxygenclass:: raft::dry_run_resources
233+
:project: RAFT
234+
:members:
235+
236+
namespace *raft::util*
237+
238+
.. doxygenfunction:: raft::util::dry_run_execute
239+
:project: RAFT
240+
225241
Device Properties
226242
~~~~~~~~~~~~~~~~~
227243

docs/source/dry_run_protocol.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The dry run protocol lets callers estimate an algorithm's memory footprint witho
55
## Using Dry Run Mode
66

77
```cpp
8-
#include <raft/util/dry_run_resources.hpp>
8+
#include <raft/core/dry_run_resources.hpp>
99

1010
raft::resources res;
1111
// auto my_function(const raft::resources& res, my_args...);

0 commit comments

Comments
 (0)