From 6fc6aee131901b39f85c0abe883b3cc25d76ce82 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 2 Nov 2023 15:48:09 -0700 Subject: [PATCH 1/3] Make the default alignment threshold public --- include/rmm/mr/device/aligned_resource_adaptor.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/rmm/mr/device/aligned_resource_adaptor.hpp b/include/rmm/mr/device/aligned_resource_adaptor.hpp index f65407b72..05e9915cc 100644 --- a/include/rmm/mr/device/aligned_resource_adaptor.hpp +++ b/include/rmm/mr/device/aligned_resource_adaptor.hpp @@ -106,9 +106,13 @@ class aligned_resource_adaptor final : public device_memory_resource { return upstream_->supports_get_mem_info(); } - private: + /** + * @brief The default alignment used by the adaptor. + */ static constexpr std::size_t default_alignment_threshold = 0; - using lock_guard = std::lock_guard; + + private: + using lock_guard = std::lock_guard; /** * @brief Allocates memory of size at least `bytes` using the upstream resource with the specified From 2e308fd5f5824365398869e88f0ab122277d5cb5 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 2 Nov 2023 15:48:32 -0700 Subject: [PATCH 2/3] Make the default filename function public --- include/rmm/mr/device/logging_resource_adaptor.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rmm/mr/device/logging_resource_adaptor.hpp b/include/rmm/mr/device/logging_resource_adaptor.hpp index 781912022..781571157 100644 --- a/include/rmm/mr/device/logging_resource_adaptor.hpp +++ b/include/rmm/mr/device/logging_resource_adaptor.hpp @@ -179,7 +179,6 @@ class logging_resource_adaptor final : public device_memory_resource { return std::string{"Thread,Time,Action,Pointer,Size,Stream"}; } - private: /** * @brief Return the value of the environment variable RMM_LOG_FILE. * @@ -195,6 +194,7 @@ class logging_resource_adaptor final : public device_memory_resource { return std::string{filename}; } + private: static auto make_logger(std::ostream& stream) { return std::make_shared( From cdbd2c7974ea5863b324f076a905c9bf306d09ff Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 2 Nov 2023 15:56:16 -0700 Subject: [PATCH 3/3] Stop allowing these references to fail in Sphinx --- python/docs/conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/docs/conf.py b/python/docs/conf.py index c55d998d6..a063b52eb 100644 --- a/python/docs/conf.py +++ b/python/docs/conf.py @@ -222,8 +222,6 @@ def on_missing_reference(app, env, node, contnode): # Internal objects "detail", "RMM_EXEC_CHECK_DISABLE", - "default_alignment_threshold", - "get_default_filename", # Template types "Base", ]