From 7bb379b02dd9784c4e1c0111e12aae4dd2605a8c Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 18 Jan 2024 02:41:32 +0000 Subject: [PATCH] fix meta yaml formatting --- ci/conda/recipes/libmrc/meta.yaml | 6 +++--- cpp/mrc/include/mrc/memory/resources/detail/arena.hpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml index 56c052f62..67cf20c69 100644 --- a/ci/conda/recipes/libmrc/meta.yaml +++ b/ci/conda/recipes/libmrc/meta.yaml @@ -42,7 +42,7 @@ requirements: - {{ compiler("cxx") }} - autoconf >=2.69 - ccache - - cmake = 3.27 + - cmake =3.27 - cuda-cudart-dev # Needed by CMake to compile a test application - libtool - ninja @@ -85,9 +85,9 @@ outputs: - {{ compiler("c") }} - {{ compiler("cuda") }} - {{ compiler("cxx") }} - - cmake = 3.27 + - cmake =3.27 - numactl-libs-cos7-x86_64 - - sysroot_linux-64 = 2.17 + - sysroot_linux-64 =2.17 host: # Any libraries with weak run_exports need to go here to be added to the run. Keep sorted! - boost-cpp diff --git a/cpp/mrc/include/mrc/memory/resources/detail/arena.hpp b/cpp/mrc/include/mrc/memory/resources/detail/arena.hpp index e25631606..bf1036fd6 100644 --- a/cpp/mrc/include/mrc/memory/resources/detail/arena.hpp +++ b/cpp/mrc/include/mrc/memory/resources/detail/arena.hpp @@ -169,7 +169,7 @@ inline bool block_size_compare(block lhs, block rhs) */ constexpr std::size_t align_up(std::size_t value) noexcept { - return rmm::detail::align_up(value, rmm::detail::CUDA_ALLOCATION_ALIGNMENT); + return rmm::align_up(value, rmm::CUDA_ALLOCATION_ALIGNMENT); } /** @@ -180,7 +180,7 @@ constexpr std::size_t align_up(std::size_t value) noexcept */ constexpr std::size_t align_down(std::size_t value) noexcept { - return rmm::detail::align_down(value, rmm::detail::CUDA_ALLOCATION_ALIGNMENT); + return rmm::align_down(value, rmm::CUDA_ALLOCATION_ALIGNMENT); } /**