Remove our own align_up/align_down methods, these were not used outside of the arena code, and were causing build errors

Signed-off-by: David Gardner <dagardner@nvidia.com>

Author: dagardner-nv

cpp/mrc/include/mrc/memory/resources/arena_resource.hpp

@@ -22,6 +22,7 @@
 
 #include <cuda_runtime_api.h>
 #include <glog/logging.h>
+#include <rmm/detail/aligned.hpp>
 #include <rmm/detail/error.hpp>
 #include <rmm/logger.hpp>
 
@@ -135,7 +136,7 @@ class arena_resource final : public adaptor<Upstream>
             return nullptr;
         }
 
-        bytes         = detail::arena::align_up(bytes);
+        bytes         = rmm::align_up(bytes, rmm::CUDA_ALLOCATION_ALIGNMENT);
         auto& arena   = get_thread_arena();
         void* pointer = arena.allocate(bytes);
 
@@ -173,7 +174,7 @@ class arena_resource final : public adaptor<Upstream>
             return;
         }
 
-        bytes = detail::arena::align_up(bytes);
+        bytes = rmm::align_up(bytes, rmm::CUDA_ALLOCATION_ALIGNMENT);
         get_thread_arena().deallocate(ptr, bytes);
     }
 

cpp/mrc/include/mrc/memory/resources/detail/arena.hpp

@@ -161,28 +161,6 @@ inline bool block_size_compare(block lhs, block rhs)
     return lhs.size() < rhs.size();
 }
 
-/**
- * @brief Align up to the allocation alignment.
- *
- * @param[in] v value to align
- * @return Return the aligned value
- */
-std::size_t align_up(std::size_t value) noexcept
-{
-    return rmm::align_up(value, rmm::CUDA_ALLOCATION_ALIGNMENT);
-}
-
-/**
- * @brief Align down to the allocation alignment.
- *
- * @param[in] v value to align
- * @return Return the aligned value
- */
-std::size_t align_down(std::size_t value) noexcept
-{
-    return rmm::align_down(value, rmm::CUDA_ALLOCATION_ALIGNMENT);
-}
-
 /**
  * @brief Get the first free block of at least `size` bytes.
  *
@@ -318,9 +296,11 @@ class global_arena final
       maximum_size_{maximum_size}
     {
         RMM_EXPECTS(nullptr != upstream_mr_, "Unexpected null upstream pointer.");
-        RMM_EXPECTS(initial_size == default_initial_size || initial_size == align_up(initial_size),
+        RMM_EXPECTS(initial_size == default_initial_size ||
+                        initial_size == rmm::align_up(initial_size, rmm::CUDA_ALLOCATION_ALIGNMENT),
                     "Error, Initial arena size required to be a multiple of 256 bytes");
-        RMM_EXPECTS(maximum_size_ == default_maximum_size || maximum_size_ == align_up(maximum_size_),
+        RMM_EXPECTS(maximum_size_ == default_maximum_size ||
+                        maximum_size_ == rmm::align_up(maximum_size_, rmm::CUDA_ALLOCATION_ALIGNMENT),
                     "Error, Maximum arena size required to be a multiple of 256 bytes");
 
         if (initial_size == default_initial_size || maximum_size == default_maximum_size)
@@ -330,11 +310,11 @@ class global_arena final
             RMM_CUDA_TRY(cudaMemGetInfo(&free, &total));
             if (initial_size == default_initial_size)
             {
-                initial_size = align_up(std::min(free, total / 2));
+                initial_size = rmm::align_up(std::min(free, total / 2), rmm::CUDA_ALLOCATION_ALIGNMENT);
             }
             if (maximum_size_ == default_maximum_size)
             {
-                maximum_size_ = align_down(free) - reserved_size;
+                maximum_size_ = rmm::align_down(free, rmm::CUDA_ALLOCATION_ALIGNMENT) - reserved_size;
             }
         }
         RMM_EXPECTS(initial_size <= maximum_size_, "Initial arena size exceeds the maximum pool size!");