Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the conda build with RMM 23.02 #348

Merged
merged 2 commits into from
Jul 7, 2023
Merged

Fix the conda build with RMM 23.02 #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26d4851
Fix the conda build with RMM 23.02
mdemoret-nv Jul 7, 2023
bd1f6fd
Adding CONDA_ALWAYS_YES
mdemoret-nv Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/conda/recipes/run_conda_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ export CMAKE_C_COMPILER_LAUNCHER="ccache"
export CMAKE_CXX_COMPILER_LAUNCHER="ccache"
export CMAKE_CUDA_COMPILER_LAUNCHER="ccache"

# Avoid confirmation messages during the conda build
export CONDA_ALWAYS_YES=true

# Holds the arguments in an array to allow for complex json objects
CONDA_ARGS_ARRAY=()

Expand Down
3 changes: 1 addition & 2 deletions cpp/mrc/include/mrc/memory/resources/arena_resource.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <cuda_runtime_api.h>
#include <glog/logging.h>
#include <rmm/detail/error.hpp>
#include <rmm/detail/logging_assert.hpp>
#include <rmm/logger.hpp>

#include <cstddef>
Expand Down Expand Up @@ -242,7 +241,7 @@ class arena_resource final : public adaptor<Upstream>
* @return arena& The arena associated with the given stream.
arena& get_stream_arena(cuda_stream_view stream)
{
RMM_LOGGING_ASSERT(!use_per_thread_arena(stream));
DCHECK(!use_per_thread_arena(stream));
{
read_lock lock(mtx_);
auto const iter = stream_arenas_.find(stream.value());
Expand Down
6 changes: 3 additions & 3 deletions cpp/mrc/include/mrc/memory/resources/detail/arena.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#pragma once

#include <cuda_runtime_api.h>
#include <glog/logging.h>
#include <rmm/cuda_stream_view.hpp>
#include <rmm/detail/aligned.hpp>
#include <rmm/detail/error.hpp>
#include <rmm/detail/logging_assert.hpp>
#include <rmm/logger.hpp>

#include <algorithm>
Expand Down Expand Up @@ -122,7 +122,7 @@ class block
*/
[[nodiscard]] std::pair<block, block> split(std::size_t size) const
{
RMM_LOGGING_ASSERT(size_ >= size);
DCHECK(size_ >= size);
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
if (size_ > size)
{
Expand All @@ -141,7 +141,7 @@ class block
*/
[[nodiscard]] block merge(block const& blk) const
{
RMM_LOGGING_ASSERT(is_contiguous_before(blk));
DCHECK(is_contiguous_before(blk));
return {pointer_, size_ + blk.size_};
}

Expand Down