Skip to content

Commit 454e3ad

Browse files
committed
Make get_property constexpr across tests, benchmarks, and thrust_allocator_adaptor
1 parent 6d1e1ee commit 454e3ad

File tree

8 files changed

+29
-14
lines changed

8 files changed

+29
-14
lines changed

cpp/benchmarks/utilities/simulated_memory_resource.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ class simulated_memory_resource final {
112112
bool operator==(simulated_memory_resource const&) const noexcept { return true; }
113113
bool operator!=(simulated_memory_resource const&) const noexcept { return false; }
114114

115-
RMM_CONSTEXPR_FRIEND void get_property(simulated_memory_resource const&,
116-
cuda::mr::device_accessible) noexcept
115+
constexpr friend void get_property(simulated_memory_resource const&,
116+
cuda::mr::device_accessible) noexcept
117117
{
118118
}
119119

cpp/include/rmm/mr/thrust_allocator_adaptor.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,10 @@ class thrust_allocator : public thrust::device_malloc_allocator<T> {
133133
*
134134
* This property declares that a `thrust_allocator` provides device accessible memory
135135
*/
136-
friend void get_property(thrust_allocator const&, cuda::mr::device_accessible) noexcept {}
136+
RMM_CONSTEXPR_FRIEND void get_property(thrust_allocator const&,
137+
cuda::mr::device_accessible) noexcept
138+
{
139+
}
137140

138141
private:
139142
cuda_stream_view _stream{};

cpp/tests/device_check_resource_adaptor.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ class device_check_resource_adaptor final {
7979
return !(*this == other);
8080
}
8181

82-
friend void get_property(device_check_resource_adaptor const&,
83-
cuda::mr::device_accessible) noexcept
82+
constexpr friend void get_property(device_check_resource_adaptor const&,
83+
cuda::mr::device_accessible) noexcept
8484
{
8585
}
8686

cpp/tests/mock_resource.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class mock_resource {
3535

3636
bool operator==(mock_resource const&) const noexcept { return true; }
3737
bool operator!=(mock_resource const&) const { return false; }
38-
friend void get_property(mock_resource const&, cuda::mr::device_accessible) noexcept {}
38+
constexpr friend void get_property(mock_resource const&, cuda::mr::device_accessible) noexcept {}
3939
using size_pair = std::pair<std::size_t, std::size_t>;
4040
};
4141

@@ -80,7 +80,10 @@ class mock_resource_wrapper {
8080
}
8181
bool operator!=(mock_resource_wrapper const& other) const noexcept { return !(*this == other); }
8282

83-
friend void get_property(mock_resource_wrapper const&, cuda::mr::device_accessible) noexcept {}
83+
constexpr friend void get_property(mock_resource_wrapper const&,
84+
cuda::mr::device_accessible) noexcept
85+
{
86+
}
8487

8588
private:
8689
mock_resource* mock_;

cpp/tests/mr/arena_mr_tests.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ class mock_memory_resource {
3939

4040
bool operator==(mock_memory_resource const&) const noexcept { return true; }
4141
bool operator!=(mock_memory_resource const&) const { return false; }
42-
friend void get_property(mock_memory_resource const&, cuda::mr::device_accessible) noexcept {}
42+
constexpr friend void get_property(mock_memory_resource const&,
43+
cuda::mr::device_accessible) noexcept
44+
{
45+
}
4346
};
4447

4548
// static property checks
@@ -84,8 +87,8 @@ class mock_memory_resource_wrapper {
8487
return !(*this == other);
8588
}
8689

87-
friend void get_property(mock_memory_resource_wrapper const&,
88-
cuda::mr::device_accessible) noexcept
90+
constexpr friend void get_property(mock_memory_resource_wrapper const&,
91+
cuda::mr::device_accessible) noexcept
8992
{
9093
}
9194

cpp/tests/mr/delayed_memory_resource.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ class delayed_memory_resource {
4848
upstream_.deallocate(stream, ptr, bytes, alignment);
4949
std::this_thread::sleep_for(delay_);
5050
}
51-
friend void get_property(delayed_memory_resource const&, cuda::mr::device_accessible) noexcept {}
51+
constexpr friend void get_property(delayed_memory_resource const&,
52+
cuda::mr::device_accessible) noexcept
53+
{
54+
}
5255
bool operator==(delayed_memory_resource const& other) const noexcept
5356
{
5457
return this == std::addressof(other);

cpp/tests/mr/failure_callback_mr_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ class always_throw_memory_resource final {
6262

6363
bool operator==(always_throw_memory_resource const&) const noexcept { return true; }
6464
bool operator!=(always_throw_memory_resource const&) const noexcept { return false; }
65-
friend void get_property(always_throw_memory_resource const&,
66-
cuda::mr::device_accessible) noexcept
65+
constexpr friend void get_property(always_throw_memory_resource const&,
66+
cuda::mr::device_accessible) noexcept
6767
{
6868
}
6969
};

cpp/tests/mr/resource_ref_conversion_tests.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ class new_delete_memory_resource {
5454
bool operator!=(new_delete_memory_resource const& other) const { return !operator==(other); }
5555

5656
// NOLINTBEGIN
57-
friend void get_property(new_delete_memory_resource const&, cuda::mr::host_accessible) noexcept {}
57+
constexpr friend void get_property(new_delete_memory_resource const&,
58+
cuda::mr::host_accessible) noexcept
59+
{
60+
}
5861
// NOLINTEND
5962
};
6063

0 commit comments

Comments
 (0)