Skip to content

Commit

Permalink
Fix parameter name in asserts (#875)
Browse files Browse the repository at this point in the history
#857 introduced a few naming issues in debug builds due to parameter name changes. I rebuilt both C++ and Cython-generated code in debug mode and ran tests, both build and tests succeed now.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - MithunR (https://github.com/mythrocks)
  - Rong Ou (https://github.com/rongou)
  - Jake Hemstad (https://github.com/jrhemstad)

URL: #875
  • Loading branch information
vyasr committed Sep 17, 2021
1 parent e4bf138 commit 180c4e9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions include/rmm/mr/device/detail/arena.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class block {
*/
[[nodiscard]] std::pair<block, block> split(std::size_t size) const
{
RMM_LOGGING_ASSERT(size_ >= sz);
RMM_LOGGING_ASSERT(size_ >= size);
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
if (size_ > size) { return {{pointer_, size}, {pointer_ + size, size_ - size}}; }
return {*this, {}};
Expand All @@ -125,7 +125,7 @@ class block {
*/
[[nodiscard]] block merge(block const& blk) const
{
RMM_LOGGING_ASSERT(is_contiguous_before(b));
RMM_LOGGING_ASSERT(is_contiguous_before(blk));
return {pointer_, size_ + blk.size_};
}

Expand Down
2 changes: 1 addition & 1 deletion include/rmm/mr/device/detail/coalescing_free_list.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct block : public block_base {
*/
[[nodiscard]] inline block merge(block const& blk) const noexcept
{
assert(is_contiguous_before(b));
assert(is_contiguous_before(blk));
return {pointer(), size() + blk.size(), is_head()};
}

Expand Down

0 comments on commit 180c4e9

Please sign in to comment.