Skip to content

Commit

Permalink
Update clang-format to 16.0.1. (#1246)
Browse files Browse the repository at this point in the history
This PR updates the clang-format version used by pre-commit.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Rong Ou (https://github.com/rongou)

URL: #1246
bdice authored Apr 14, 2023
1 parent 0371ee7 commit 0aaf278
Showing 44 changed files with 155 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ repos:
hooks:
- id: cython-lint
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v11.1.0
rev: v16.0.1
hooks:
- id: clang-format
types_or: [c, c++, cuda]
2 changes: 1 addition & 1 deletion benchmarks/random_allocations/random_allocations.cpp
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ void random_allocation_free(rmm::mr::device_memory_resource& mr,
{
std::default_random_engine generator;

max_usage *= size_mb; // convert to bytes
max_usage *= size_mb; // convert to bytes

constexpr int allocation_probability{73}; // percent
constexpr int max_op_chance{99};
6 changes: 3 additions & 3 deletions benchmarks/replay/replay.cpp
Original file line number Diff line number Diff line change
@@ -150,9 +150,9 @@ struct replay_benchmark {
{
}

~replay_benchmark() = default;
replay_benchmark(replay_benchmark const&) = delete;
replay_benchmark& operator=(replay_benchmark const&) = delete;
~replay_benchmark() = default;
replay_benchmark(replay_benchmark const&) = delete;
replay_benchmark& operator=(replay_benchmark const&) = delete;
replay_benchmark& operator=(replay_benchmark&& other) noexcept = delete;

/// Add an allocation to the map (NOT thread safe)
4 changes: 2 additions & 2 deletions benchmarks/synchronization/synchronization.hpp
Original file line number Diff line number Diff line change
@@ -90,10 +90,10 @@ class cuda_event_timer {
~cuda_event_timer();

// disable copy and move
cuda_event_timer(cuda_event_timer const&) = delete;
cuda_event_timer(cuda_event_timer const&) = delete;
cuda_event_timer& operator=(cuda_event_timer const&) = delete;
cuda_event_timer(cuda_event_timer&&) = delete;
cuda_event_timer& operator=(cuda_event_timer&&) = delete;
cuda_event_timer& operator=(cuda_event_timer&&) = delete;

private:
cudaEvent_t start{};
8 changes: 4 additions & 4 deletions benchmarks/utilities/log_parser.hpp
Original file line number Diff line number Diff line change
@@ -40,10 +40,10 @@ enum class action { ALLOCATE, FREE, ALLOCATE_FAILURE };
*
*/
struct event {
event() = default;
event(event const&) = default;
event& operator=(event const&) = default;
event(event&&) noexcept = default;
event() = default;
event(event const&) = default;
event& operator=(event const&) = default;
event(event&&) noexcept = default;
event& operator=(event&&) noexcept = default;
~event() = default;
event(action act, std::size_t size, void const* ptr)
4 changes: 2 additions & 2 deletions benchmarks/utilities/simulated_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -46,10 +46,10 @@ class simulated_memory_resource final : public device_memory_resource {
~simulated_memory_resource() override = default;

// Disable copy (and move) semantics.
simulated_memory_resource(simulated_memory_resource const&) = delete;
simulated_memory_resource(simulated_memory_resource const&) = delete;
simulated_memory_resource& operator=(simulated_memory_resource const&) = delete;
simulated_memory_resource(simulated_memory_resource&&) = delete;
simulated_memory_resource& operator=(simulated_memory_resource&&) = delete;
simulated_memory_resource& operator=(simulated_memory_resource&&) = delete;

/**
* @brief Query whether the resource supports use of non-null CUDA streams for
2 changes: 1 addition & 1 deletion include/rmm/cuda_stream.hpp
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ class cuda_stream {
cuda_stream& operator=(cuda_stream&&) = default;
~cuda_stream() = default;
cuda_stream(cuda_stream const&) = delete; // Copying disallowed: one stream one owner
cuda_stream& operator=(cuda_stream&) = delete;
cuda_stream& operator=(cuda_stream&) = delete;

/**
* @brief Construct a new cuda stream object
6 changes: 3 additions & 3 deletions include/rmm/cuda_stream_pool.hpp
Original file line number Diff line number Diff line change
@@ -50,9 +50,9 @@ class cuda_stream_pool {
}
~cuda_stream_pool() = default;

cuda_stream_pool(cuda_stream_pool&&) = delete;
cuda_stream_pool(cuda_stream_pool const&) = delete;
cuda_stream_pool& operator=(cuda_stream_pool&&) = delete;
cuda_stream_pool(cuda_stream_pool&&) = delete;
cuda_stream_pool(cuda_stream_pool const&) = delete;
cuda_stream_pool& operator=(cuda_stream_pool&&) = delete;
cuda_stream_pool& operator=(cuda_stream_pool const&) = delete;

/**
10 changes: 5 additions & 5 deletions include/rmm/cuda_stream_view.hpp
Original file line number Diff line number Diff line change
@@ -33,12 +33,12 @@ namespace rmm {
*/
class cuda_stream_view {
public:
constexpr cuda_stream_view() = default;
constexpr cuda_stream_view(cuda_stream_view const&) = default;
constexpr cuda_stream_view(cuda_stream_view&&) = default;
constexpr cuda_stream_view() = default;
constexpr cuda_stream_view(cuda_stream_view const&) = default;
constexpr cuda_stream_view(cuda_stream_view&&) = default;
constexpr cuda_stream_view& operator=(cuda_stream_view const&) = default;
constexpr cuda_stream_view& operator=(cuda_stream_view&&) = default;
~cuda_stream_view() = default;
constexpr cuda_stream_view& operator=(cuda_stream_view&&) = default;
~cuda_stream_view() = default;

// Disable construction from literal 0
constexpr cuda_stream_view(int) = delete; //< Prevent cast from 0
10 changes: 5 additions & 5 deletions include/rmm/device_buffer.hpp
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ class device_buffer {
public:
// The copy constructor and copy assignment operator without a stream are deleted because they
// provide no way to specify an explicit stream
device_buffer(device_buffer const& other) = delete;
device_buffer(device_buffer const& other) = delete;
device_buffer& operator=(device_buffer const& other) = delete;

/**
@@ -394,10 +394,10 @@ class device_buffer {
[[nodiscard]] mr::device_memory_resource* memory_resource() const noexcept { return _mr; }

private:
void* _data{nullptr}; ///< Pointer to device memory allocation
std::size_t _size{}; ///< Requested size of the device memory allocation
std::size_t _capacity{}; ///< The actual size of the device memory allocation
cuda_stream_view _stream{}; ///< Stream to use for device memory deallocation
void* _data{nullptr}; ///< Pointer to device memory allocation
std::size_t _size{}; ///< Requested size of the device memory allocation
std::size_t _capacity{}; ///< The actual size of the device memory allocation
cuda_stream_view _stream{}; ///< Stream to use for device memory deallocation
mr::device_memory_resource* _mr{
mr::get_current_device_resource()}; ///< The memory resource used to
///< allocate/deallocate device memory
3 changes: 1 addition & 2 deletions include/rmm/logger.hpp
Original file line number Diff line number Diff line change
@@ -113,5 +113,4 @@ inline spdlog::logger& logger()
} // namespace rmm

template <>
struct fmt::formatter<rmm::detail::bytes> : fmt::ostream_formatter {
};
struct fmt::formatter<rmm::detail::bytes> : fmt::ostream_formatter {};
10 changes: 5 additions & 5 deletions include/rmm/mr/device/aligned_resource_adaptor.hpp
Original file line number Diff line number Diff line change
@@ -69,12 +69,12 @@ class aligned_resource_adaptor final : public device_memory_resource {
"Allocation alignment is not a power of 2.");
}

aligned_resource_adaptor() = delete;
~aligned_resource_adaptor() override = default;
aligned_resource_adaptor(aligned_resource_adaptor const&) = delete;
aligned_resource_adaptor(aligned_resource_adaptor&&) = delete;
aligned_resource_adaptor() = delete;
~aligned_resource_adaptor() override = default;
aligned_resource_adaptor(aligned_resource_adaptor const&) = delete;
aligned_resource_adaptor(aligned_resource_adaptor&&) = delete;
aligned_resource_adaptor& operator=(aligned_resource_adaptor const&) = delete;
aligned_resource_adaptor& operator=(aligned_resource_adaptor&&) = delete;
aligned_resource_adaptor& operator=(aligned_resource_adaptor&&) = delete;

/**
* @brief Get the upstream memory resource.
6 changes: 3 additions & 3 deletions include/rmm/mr/device/arena_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -98,9 +98,9 @@ class arena_memory_resource final : public device_memory_resource {
~arena_memory_resource() override = default;

// Disable copy (and move) semantics.
arena_memory_resource(arena_memory_resource const&) = delete;
arena_memory_resource& operator=(arena_memory_resource const&) = delete;
arena_memory_resource(arena_memory_resource&&) noexcept = delete;
arena_memory_resource(arena_memory_resource const&) = delete;
arena_memory_resource& operator=(arena_memory_resource const&) = delete;
arena_memory_resource(arena_memory_resource&&) noexcept = delete;
arena_memory_resource& operator=(arena_memory_resource&&) noexcept = delete;

/**
8 changes: 4 additions & 4 deletions include/rmm/mr/device/binning_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -87,11 +87,11 @@ class binning_memory_resource final : public device_memory_resource {
*/
~binning_memory_resource() override = default;

binning_memory_resource() = delete;
binning_memory_resource(binning_memory_resource const&) = delete;
binning_memory_resource(binning_memory_resource&&) = delete;
binning_memory_resource() = delete;
binning_memory_resource(binning_memory_resource const&) = delete;
binning_memory_resource(binning_memory_resource&&) = delete;
binning_memory_resource& operator=(binning_memory_resource const&) = delete;
binning_memory_resource& operator=(binning_memory_resource&&) = delete;
binning_memory_resource& operator=(binning_memory_resource&&) = delete;

/**
* @brief Query whether the resource supports use of non-null streams for
10 changes: 5 additions & 5 deletions include/rmm/mr/device/callback_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -90,11 +90,11 @@ class callback_memory_resource final : public device_memory_resource {
{
}

callback_memory_resource() = delete;
~callback_memory_resource() override = default;
callback_memory_resource(callback_memory_resource const&) = delete;
callback_memory_resource& operator=(callback_memory_resource const&) = delete;
callback_memory_resource(callback_memory_resource&&) noexcept = default;
callback_memory_resource() = delete;
~callback_memory_resource() override = default;
callback_memory_resource(callback_memory_resource const&) = delete;
callback_memory_resource& operator=(callback_memory_resource const&) = delete;
callback_memory_resource(callback_memory_resource&&) noexcept = default;
callback_memory_resource& operator=(callback_memory_resource&&) noexcept = default;

private:
6 changes: 3 additions & 3 deletions include/rmm/mr/device/cuda_async_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -147,10 +147,10 @@ class cuda_async_memory_resource final : public device_memory_resource {
RMM_ASSERT_CUDA_SUCCESS(rmm::detail::async_alloc::cudaMemPoolDestroy(pool_handle()));
#endif
}
cuda_async_memory_resource(cuda_async_memory_resource const&) = delete;
cuda_async_memory_resource(cuda_async_memory_resource&&) = delete;
cuda_async_memory_resource(cuda_async_memory_resource const&) = delete;
cuda_async_memory_resource(cuda_async_memory_resource&&) = delete;
cuda_async_memory_resource& operator=(cuda_async_memory_resource const&) = delete;
cuda_async_memory_resource& operator=(cuda_async_memory_resource&&) = delete;
cuda_async_memory_resource& operator=(cuda_async_memory_resource&&) = delete;

/**
* @brief Query whether the resource supports use of non-null CUDA streams for
8 changes: 4 additions & 4 deletions include/rmm/mr/device/cuda_async_view_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -77,11 +77,11 @@ class cuda_async_view_memory_resource final : public device_memory_resource {
[[nodiscard]] cudaMemPool_t pool_handle() const noexcept { return cuda_pool_handle_; }
#endif

cuda_async_view_memory_resource() = default;
cuda_async_view_memory_resource(cuda_async_view_memory_resource const&) = default;
cuda_async_view_memory_resource(cuda_async_view_memory_resource&&) = default;
cuda_async_view_memory_resource() = default;
cuda_async_view_memory_resource(cuda_async_view_memory_resource const&) = default;
cuda_async_view_memory_resource(cuda_async_view_memory_resource&&) = default;
cuda_async_view_memory_resource& operator=(cuda_async_view_memory_resource const&) = default;
cuda_async_view_memory_resource& operator=(cuda_async_view_memory_resource&&) = default;
cuda_async_view_memory_resource& operator=(cuda_async_view_memory_resource&&) = default;

/**
* @brief Query whether the resource supports use of non-null CUDA streams for
10 changes: 5 additions & 5 deletions include/rmm/mr/device/cuda_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -29,12 +29,12 @@ namespace rmm::mr {
*/
class cuda_memory_resource final : public device_memory_resource {
public:
cuda_memory_resource() = default;
~cuda_memory_resource() override = default;
cuda_memory_resource(cuda_memory_resource const&) = default;
cuda_memory_resource(cuda_memory_resource&&) = default;
cuda_memory_resource() = default;
~cuda_memory_resource() override = default;
cuda_memory_resource(cuda_memory_resource const&) = default;
cuda_memory_resource(cuda_memory_resource&&) = default;
cuda_memory_resource& operator=(cuda_memory_resource const&) = default;
cuda_memory_resource& operator=(cuda_memory_resource&&) = default;
cuda_memory_resource& operator=(cuda_memory_resource&&) = default;

/**
* @brief Query whether the resource supports use of non-null CUDA streams for
20 changes: 10 additions & 10 deletions include/rmm/mr/device/detail/arena.hpp
Original file line number Diff line number Diff line change
@@ -277,10 +277,10 @@ class superblock final : public byte_span {
}

// Disable copy semantics.
superblock(superblock const&) = delete;
superblock(superblock const&) = delete;
superblock& operator=(superblock const&) = delete;
// Allow move semantics.
superblock(superblock&&) noexcept = default;
superblock(superblock&&) noexcept = default;
superblock& operator=(superblock&&) noexcept = default;

~superblock() = default;
@@ -515,9 +515,9 @@ class global_arena final {
}

// Disable copy (and move) semantics.
global_arena(global_arena const&) = delete;
global_arena& operator=(global_arena const&) = delete;
global_arena(global_arena&&) noexcept = delete;
global_arena(global_arena const&) = delete;
global_arena& operator=(global_arena const&) = delete;
global_arena(global_arena&&) noexcept = delete;
global_arena& operator=(global_arena&&) noexcept = delete;

/**
@@ -803,9 +803,9 @@ class arena {
explicit arena(global_arena<Upstream>& global_arena) : global_arena_{global_arena} {}

// Disable copy (and move) semantics.
arena(arena const&) = delete;
arena& operator=(arena const&) = delete;
arena(arena&&) noexcept = delete;
arena(arena const&) = delete;
arena& operator=(arena const&) = delete;
arena(arena&&) noexcept = delete;
arena& operator=(arena&&) noexcept = delete;

~arena() = default;
@@ -979,10 +979,10 @@ class arena_cleaner {
explicit arena_cleaner(std::shared_ptr<arena<Upstream>> const& arena) : arena_(arena) {}

// Disable copy (and move) semantics.
arena_cleaner(arena_cleaner const&) = delete;
arena_cleaner(arena_cleaner const&) = delete;
arena_cleaner& operator=(arena_cleaner const&) = delete;
arena_cleaner(arena_cleaner&&) noexcept = delete;
arena_cleaner& operator=(arena_cleaner&&) = delete;
arena_cleaner& operator=(arena_cleaner&&) = delete;

~arena_cleaner()
{
4 changes: 2 additions & 2 deletions include/rmm/mr/device/detail/coalescing_free_list.hpp
Original file line number Diff line number Diff line change
@@ -175,10 +175,10 @@ struct coalescing_free_list : free_list<block> {
coalescing_free_list() = default;
~coalescing_free_list() override = default;

coalescing_free_list(coalescing_free_list const&) = delete;
coalescing_free_list(coalescing_free_list const&) = delete;
coalescing_free_list& operator=(coalescing_free_list const&) = delete;
coalescing_free_list(coalescing_free_list&&) = delete;
coalescing_free_list& operator=(coalescing_free_list&&) = delete;
coalescing_free_list& operator=(coalescing_free_list&&) = delete;

/**
* @brief Inserts a block into the `free_list` in the correct order, coalescing it with the
4 changes: 2 additions & 2 deletions include/rmm/mr/device/detail/fixed_size_free_list.hpp
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ struct fixed_size_free_list : free_list<block_base> {
fixed_size_free_list() = default;
~fixed_size_free_list() override = default;

fixed_size_free_list(fixed_size_free_list const&) = delete;
fixed_size_free_list(fixed_size_free_list const&) = delete;
fixed_size_free_list& operator=(fixed_size_free_list const&) = delete;
fixed_size_free_list(fixed_size_free_list&&) = delete;
fixed_size_free_list& operator=(fixed_size_free_list&&) = delete;
fixed_size_free_list& operator=(fixed_size_free_list&&) = delete;

/**
* @brief Construct a new free_list from range defined by input iterators
4 changes: 2 additions & 2 deletions include/rmm/mr/device/detail/free_list.hpp
Original file line number Diff line number Diff line change
@@ -67,10 +67,10 @@ class free_list {
free_list() = default;
virtual ~free_list() = default;

free_list(free_list const&) = delete;
free_list(free_list const&) = delete;
free_list& operator=(free_list const&) = delete;
free_list(free_list&&) = delete;
free_list& operator=(free_list&&) = delete;
free_list& operator=(free_list&&) = delete;

using block_type = BlockType;
using list_type = ListType;
12 changes: 6 additions & 6 deletions include/rmm/mr/device/detail/stream_ordered_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -78,11 +78,11 @@ class stream_ordered_memory_resource : public crtp<PoolResource>, public device_
public:
~stream_ordered_memory_resource() override { release(); }

stream_ordered_memory_resource() = default;
stream_ordered_memory_resource(stream_ordered_memory_resource const&) = delete;
stream_ordered_memory_resource(stream_ordered_memory_resource&&) = delete;
stream_ordered_memory_resource() = default;
stream_ordered_memory_resource(stream_ordered_memory_resource const&) = delete;
stream_ordered_memory_resource(stream_ordered_memory_resource&&) = delete;
stream_ordered_memory_resource& operator=(stream_ordered_memory_resource const&) = delete;
stream_ordered_memory_resource& operator=(stream_ordered_memory_resource&&) = delete;
stream_ordered_memory_resource& operator=(stream_ordered_memory_resource&&) = delete;

protected:
using free_list = FreeListType;
@@ -269,10 +269,10 @@ class stream_ordered_memory_resource : public crtp<PoolResource>, public device_
~event_wrapper() { RMM_ASSERT_CUDA_SUCCESS(cudaEventDestroy(event)); }
cudaEvent_t event{};

event_wrapper(event_wrapper const&) = delete;
event_wrapper(event_wrapper const&) = delete;
event_wrapper& operator=(event_wrapper const&) = delete;
event_wrapper(event_wrapper&&) noexcept = delete;
event_wrapper& operator=(event_wrapper&&) = delete;
event_wrapper& operator=(event_wrapper&&) = delete;
};

/**
10 changes: 5 additions & 5 deletions include/rmm/mr/device/device_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -81,11 +81,11 @@ namespace rmm::mr {
*/
class device_memory_resource {
public:
device_memory_resource() = default;
virtual ~device_memory_resource() = default;
device_memory_resource(device_memory_resource const&) = default;
device_memory_resource& operator=(device_memory_resource const&) = default;
device_memory_resource(device_memory_resource&&) noexcept = default;
device_memory_resource() = default;
virtual ~device_memory_resource() = default;
device_memory_resource(device_memory_resource const&) = default;
device_memory_resource& operator=(device_memory_resource const&) = default;
device_memory_resource(device_memory_resource&&) noexcept = default;
device_memory_resource& operator=(device_memory_resource&&) noexcept = default;

/**
6 changes: 3 additions & 3 deletions include/rmm/mr/device/failure_callback_resource_adaptor.hpp
Original file line number Diff line number Diff line change
@@ -105,9 +105,9 @@ class failure_callback_resource_adaptor final : public device_memory_resource {
RMM_EXPECTS(nullptr != upstream, "Unexpected null upstream resource pointer.");
}

failure_callback_resource_adaptor() = delete;
~failure_callback_resource_adaptor() override = default;
failure_callback_resource_adaptor(failure_callback_resource_adaptor const&) = delete;
failure_callback_resource_adaptor() = delete;
~failure_callback_resource_adaptor() override = default;
failure_callback_resource_adaptor(failure_callback_resource_adaptor const&) = delete;
failure_callback_resource_adaptor& operator=(failure_callback_resource_adaptor const&) = delete;
failure_callback_resource_adaptor(failure_callback_resource_adaptor&&) noexcept = default;
failure_callback_resource_adaptor& operator=(failure_callback_resource_adaptor&&) noexcept =
10 changes: 5 additions & 5 deletions include/rmm/mr/device/fixed_size_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -84,11 +84,11 @@ class fixed_size_memory_resource
*/
~fixed_size_memory_resource() override { release(); }

fixed_size_memory_resource() = delete;
fixed_size_memory_resource(fixed_size_memory_resource const&) = delete;
fixed_size_memory_resource(fixed_size_memory_resource&&) = delete;
fixed_size_memory_resource() = delete;
fixed_size_memory_resource(fixed_size_memory_resource const&) = delete;
fixed_size_memory_resource(fixed_size_memory_resource&&) = delete;
fixed_size_memory_resource& operator=(fixed_size_memory_resource const&) = delete;
fixed_size_memory_resource& operator=(fixed_size_memory_resource&&) = delete;
fixed_size_memory_resource& operator=(fixed_size_memory_resource&&) = delete;

/**
* @brief Query whether the resource supports use of non-null streams for
@@ -271,7 +271,7 @@ class fixed_size_memory_resource
}

private:
Upstream* upstream_mr_; // The resource from which to allocate new blocks
Upstream* upstream_mr_; // The resource from which to allocate new blocks

std::size_t const block_size_; // size of blocks this MR allocates
std::size_t const upstream_chunk_size_; // size of chunks allocated from heap MR
10 changes: 5 additions & 5 deletions include/rmm/mr/device/limiting_resource_adaptor.hpp
Original file line number Diff line number Diff line change
@@ -57,11 +57,11 @@ class limiting_resource_adaptor final : public device_memory_resource {
RMM_EXPECTS(nullptr != upstream, "Unexpected null upstream resource pointer.");
}

limiting_resource_adaptor() = delete;
~limiting_resource_adaptor() override = default;
limiting_resource_adaptor(limiting_resource_adaptor const&) = delete;
limiting_resource_adaptor(limiting_resource_adaptor&&) noexcept = default;
limiting_resource_adaptor& operator=(limiting_resource_adaptor const&) = delete;
limiting_resource_adaptor() = delete;
~limiting_resource_adaptor() override = default;
limiting_resource_adaptor(limiting_resource_adaptor const&) = delete;
limiting_resource_adaptor(limiting_resource_adaptor&&) noexcept = default;
limiting_resource_adaptor& operator=(limiting_resource_adaptor const&) = delete;
limiting_resource_adaptor& operator=(limiting_resource_adaptor&&) noexcept = default;

/**
14 changes: 7 additions & 7 deletions include/rmm/mr/device/logging_resource_adaptor.hpp
Original file line number Diff line number Diff line change
@@ -108,11 +108,11 @@ class logging_resource_adaptor final : public device_memory_resource {
init_logger(auto_flush);
}

logging_resource_adaptor() = delete;
~logging_resource_adaptor() override = default;
logging_resource_adaptor(logging_resource_adaptor const&) = delete;
logging_resource_adaptor& operator=(logging_resource_adaptor const&) = delete;
logging_resource_adaptor(logging_resource_adaptor&&) noexcept = default;
logging_resource_adaptor() = delete;
~logging_resource_adaptor() override = default;
logging_resource_adaptor(logging_resource_adaptor const&) = delete;
logging_resource_adaptor& operator=(logging_resource_adaptor const&) = delete;
logging_resource_adaptor(logging_resource_adaptor&&) noexcept = default;
logging_resource_adaptor& operator=(logging_resource_adaptor&&) noexcept = default;

/**
@@ -301,8 +301,8 @@ class logging_resource_adaptor final : public device_memory_resource {

std::shared_ptr<spdlog::logger> logger_; ///< spdlog logger object

Upstream* upstream_; ///< The upstream resource used for satisfying
///< allocation requests
Upstream* upstream_; ///< The upstream resource used for satisfying
///< allocation requests
};

/**
10 changes: 5 additions & 5 deletions include/rmm/mr/device/managed_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -29,12 +29,12 @@ namespace rmm::mr {
*/
class managed_memory_resource final : public device_memory_resource {
public:
managed_memory_resource() = default;
~managed_memory_resource() override = default;
managed_memory_resource(managed_memory_resource const&) = default;
managed_memory_resource(managed_memory_resource&&) = default;
managed_memory_resource() = default;
~managed_memory_resource() override = default;
managed_memory_resource(managed_memory_resource const&) = default;
managed_memory_resource(managed_memory_resource&&) = default;
managed_memory_resource& operator=(managed_memory_resource const&) = default;
managed_memory_resource& operator=(managed_memory_resource&&) = default;
managed_memory_resource& operator=(managed_memory_resource&&) = default;

/**
* @brief Query whether the resource supports use of non-null streams for
8 changes: 4 additions & 4 deletions include/rmm/mr/device/pool_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -104,11 +104,11 @@ class pool_memory_resource final
*/
~pool_memory_resource() override { release(); }

pool_memory_resource() = delete;
pool_memory_resource(pool_memory_resource const&) = delete;
pool_memory_resource(pool_memory_resource&&) = delete;
pool_memory_resource() = delete;
pool_memory_resource(pool_memory_resource const&) = delete;
pool_memory_resource(pool_memory_resource&&) = delete;
pool_memory_resource& operator=(pool_memory_resource const&) = delete;
pool_memory_resource& operator=(pool_memory_resource&&) = delete;
pool_memory_resource& operator=(pool_memory_resource&&) = delete;

/**
* @brief Queries whether the resource supports use of non-null CUDA streams for
10 changes: 5 additions & 5 deletions include/rmm/mr/device/statistics_resource_adaptor.hpp
Original file line number Diff line number Diff line change
@@ -79,11 +79,11 @@ class statistics_resource_adaptor final : public device_memory_resource {
RMM_EXPECTS(nullptr != upstream, "Unexpected null upstream resource pointer.");
}

statistics_resource_adaptor() = delete;
~statistics_resource_adaptor() override = default;
statistics_resource_adaptor(statistics_resource_adaptor const&) = delete;
statistics_resource_adaptor& operator=(statistics_resource_adaptor const&) = delete;
statistics_resource_adaptor(statistics_resource_adaptor&&) noexcept = default;
statistics_resource_adaptor() = delete;
~statistics_resource_adaptor() override = default;
statistics_resource_adaptor(statistics_resource_adaptor const&) = delete;
statistics_resource_adaptor& operator=(statistics_resource_adaptor const&) = delete;
statistics_resource_adaptor(statistics_resource_adaptor&&) noexcept = default;
statistics_resource_adaptor& operator=(statistics_resource_adaptor&&) noexcept = default;

/**
10 changes: 5 additions & 5 deletions include/rmm/mr/device/thread_safe_resource_adaptor.hpp
Original file line number Diff line number Diff line change
@@ -52,12 +52,12 @@ class thread_safe_resource_adaptor final : public device_memory_resource {
RMM_EXPECTS(nullptr != upstream, "Unexpected null upstream resource pointer.");
}

thread_safe_resource_adaptor() = delete;
~thread_safe_resource_adaptor() override = default;
thread_safe_resource_adaptor(thread_safe_resource_adaptor const&) = delete;
thread_safe_resource_adaptor(thread_safe_resource_adaptor&&) = delete;
thread_safe_resource_adaptor() = delete;
~thread_safe_resource_adaptor() override = default;
thread_safe_resource_adaptor(thread_safe_resource_adaptor const&) = delete;
thread_safe_resource_adaptor(thread_safe_resource_adaptor&&) = delete;
thread_safe_resource_adaptor& operator=(thread_safe_resource_adaptor const&) = delete;
thread_safe_resource_adaptor& operator=(thread_safe_resource_adaptor&&) = delete;
thread_safe_resource_adaptor& operator=(thread_safe_resource_adaptor&&) = delete;

/**
* @brief Get the upstream memory resource.
10 changes: 5 additions & 5 deletions include/rmm/mr/device/tracking_resource_adaptor.hpp
Original file line number Diff line number Diff line change
@@ -83,11 +83,11 @@ class tracking_resource_adaptor final : public device_memory_resource {
RMM_EXPECTS(nullptr != upstream, "Unexpected null upstream resource pointer.");
}

tracking_resource_adaptor() = delete;
~tracking_resource_adaptor() override = default;
tracking_resource_adaptor(tracking_resource_adaptor const&) = delete;
tracking_resource_adaptor& operator=(tracking_resource_adaptor const&) = delete;
tracking_resource_adaptor(tracking_resource_adaptor&&) noexcept = default;
tracking_resource_adaptor() = delete;
~tracking_resource_adaptor() override = default;
tracking_resource_adaptor(tracking_resource_adaptor const&) = delete;
tracking_resource_adaptor& operator=(tracking_resource_adaptor const&) = delete;
tracking_resource_adaptor(tracking_resource_adaptor&&) noexcept = default;
tracking_resource_adaptor& operator=(tracking_resource_adaptor&&) noexcept = default;

/**
10 changes: 5 additions & 5 deletions include/rmm/mr/host/host_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -46,11 +46,11 @@ namespace rmm::mr {
*/
class host_memory_resource {
public:
host_memory_resource() = default;
virtual ~host_memory_resource() = default;
host_memory_resource(host_memory_resource const&) = default;
host_memory_resource& operator=(host_memory_resource const&) = default;
host_memory_resource(host_memory_resource&&) noexcept = default;
host_memory_resource() = default;
virtual ~host_memory_resource() = default;
host_memory_resource(host_memory_resource const&) = default;
host_memory_resource& operator=(host_memory_resource const&) = default;
host_memory_resource(host_memory_resource&&) noexcept = default;
host_memory_resource& operator=(host_memory_resource&&) noexcept = default;

/**
10 changes: 5 additions & 5 deletions include/rmm/mr/host/new_delete_resource.hpp
Original file line number Diff line number Diff line change
@@ -30,12 +30,12 @@ namespace rmm::mr {
*/
class new_delete_resource final : public host_memory_resource {
public:
new_delete_resource() = default;
~new_delete_resource() override = default;
new_delete_resource(new_delete_resource const&) = default;
new_delete_resource(new_delete_resource&&) = default;
new_delete_resource() = default;
~new_delete_resource() override = default;
new_delete_resource(new_delete_resource const&) = default;
new_delete_resource(new_delete_resource&&) = default;
new_delete_resource& operator=(new_delete_resource const&) = default;
new_delete_resource& operator=(new_delete_resource&&) = default;
new_delete_resource& operator=(new_delete_resource&&) = default;

private:
/**
10 changes: 5 additions & 5 deletions include/rmm/mr/host/pinned_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -32,12 +32,12 @@ namespace rmm::mr {
*/
class pinned_memory_resource final : public host_memory_resource {
public:
pinned_memory_resource() = default;
~pinned_memory_resource() override = default;
pinned_memory_resource(pinned_memory_resource const&) = default;
pinned_memory_resource(pinned_memory_resource&&) = default;
pinned_memory_resource() = default;
~pinned_memory_resource() override = default;
pinned_memory_resource(pinned_memory_resource const&) = default;
pinned_memory_resource(pinned_memory_resource&&) = default;
pinned_memory_resource& operator=(pinned_memory_resource const&) = default;
pinned_memory_resource& operator=(pinned_memory_resource&&) = default;
pinned_memory_resource& operator=(pinned_memory_resource&&) = default;

private:
/**
3 changes: 1 addition & 2 deletions tests/cuda_stream_tests.cpp
Original file line number Diff line number Diff line change
@@ -24,8 +24,7 @@
#include <gtest/gtest-death-test.h>
#include <gtest/gtest.h>

struct CudaStreamTest : public ::testing::Test {
};
struct CudaStreamTest : public ::testing::Test {};

TEST_F(CudaStreamTest, Equality)
{
4 changes: 2 additions & 2 deletions tests/logger_tests.cpp
Original file line number Diff line number Diff line change
@@ -48,10 +48,10 @@ class raii_restore_env {
}
}

raii_restore_env(raii_restore_env const&) = default;
raii_restore_env(raii_restore_env const&) = default;
raii_restore_env& operator=(raii_restore_env const&) = default;
raii_restore_env(raii_restore_env&&) = default;
raii_restore_env& operator=(raii_restore_env&&) = default;
raii_restore_env& operator=(raii_restore_env&&) = default;

private:
std::string name_{};
9 changes: 4 additions & 5 deletions tests/mr/device/arena_mr_tests.cpp
Original file line number Diff line number Diff line change
@@ -486,7 +486,7 @@ TEST_F(ArenaTest, SizeSmallerThanSuperblockSize) // NOLINT

TEST_F(ArenaTest, AllocateNinetyPercent) // NOLINT
{
EXPECT_NO_THROW([]() { // NOLINT(cppcoreguidelines-avoid-goto)
EXPECT_NO_THROW([]() { // NOLINT(cppcoreguidelines-avoid-goto)
auto const free = rmm::detail::available_device_memory().first;
auto const ninety_percent =
rmm::detail::align_up(static_cast<std::size_t>(static_cast<double>(free) * 0.9),
@@ -497,7 +497,7 @@ TEST_F(ArenaTest, AllocateNinetyPercent) // NOLINT

TEST_F(ArenaTest, SmallMediumLarge) // NOLINT
{
EXPECT_NO_THROW([]() { // NOLINT(cppcoreguidelines-avoid-goto)
EXPECT_NO_THROW([]() { // NOLINT(cppcoreguidelines-avoid-goto)
arena_mr mr(rmm::mr::get_current_device_resource());
auto* small = mr.allocate(256);
auto* medium = mr.allocate(64_MiB);
@@ -511,7 +511,7 @@ TEST_F(ArenaTest, SmallMediumLarge) // NOLINT

TEST_F(ArenaTest, Defragment) // NOLINT
{
EXPECT_NO_THROW([]() { // NOLINT(cppcoreguidelines-avoid-goto)
EXPECT_NO_THROW([]() { // NOLINT(cppcoreguidelines-avoid-goto)
auto const arena_size = superblock::minimum_size * 4;
arena_mr mr(rmm::mr::get_current_device_resource(), arena_size);
std::vector<std::thread> threads;
@@ -556,8 +556,7 @@ TEST_F(ArenaTest, DumpLogOnFailure) // NOLINT
// NOLINTNEXTLINE(cppcoreguidelines-avoid-goto)
EXPECT_THROW(mr.allocate(8_MiB), rmm::out_of_memory);

struct stat file_status {
};
struct stat file_status {};
EXPECT_EQ(stat("rmm_arena_memory_dump.log", &file_status), 0);
EXPECT_GE(file_status.st_size, 0);
}
2 changes: 1 addition & 1 deletion tests/mr/device/failure_callback_mr_tests.cpp
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ bool failure_handler(std::size_t /*bytes*/, void* arg)
retried = true;
return true; // First time we request an allocation retry
}
return false; // Second time we let the adaptor throw std::bad_alloc
return false; // Second time we let the adaptor throw std::bad_alloc
}

TEST(FailureCallbackTest, RetryAllocationOnce)
3 changes: 1 addition & 2 deletions tests/mr/device/mr_multithreaded_tests.cpp
Original file line number Diff line number Diff line change
@@ -31,8 +31,7 @@
namespace rmm::test {
namespace {

struct mr_test_mt : public mr_test {
};
struct mr_test_mt : public mr_test {};

INSTANTIATE_TEST_CASE_P(MultiThreadResourceTests,
mr_test_mt,
3 changes: 1 addition & 2 deletions tests/mr/device/mr_test.hpp
Original file line number Diff line number Diff line change
@@ -244,8 +244,7 @@ struct mr_test : public ::testing::TestWithParam<mr_factory> {
rmm::cuda_stream stream{};
};

struct mr_allocation_test : public mr_test {
};
struct mr_allocation_test : public mr_test {};

/// MR factory functions
inline auto make_cuda() { return std::make_shared<rmm::mr::cuda_memory_resource>(); }
2 changes: 1 addition & 1 deletion tests/mr/device/pool_mr_tests.cpp
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ TEST(PoolTest, ForceGrowth)
EXPECT_NO_THROW(mr.allocate(1000));
EXPECT_THROW(mr.allocate(4000), rmm::out_of_memory); // too much
EXPECT_NO_THROW(mr.allocate(500));
EXPECT_NO_THROW(mr.allocate(2000)); // fits
EXPECT_NO_THROW(mr.allocate(2000)); // fits
}
}

3 changes: 1 addition & 2 deletions tests/mr/device/thrust_allocator_tests.cu
Original file line number Diff line number Diff line change
@@ -31,8 +31,7 @@ template class rmm::mr::thrust_allocator<int>;
namespace rmm::test {
namespace {

struct allocator_test : public mr_test {
};
struct allocator_test : public mr_test {};

TEST_P(allocator_test, first)
{

0 comments on commit 0aaf278

Please sign in to comment.