Correct namespace markup

Author: robertmaynard

include/rmm/mr/device/aligned_resource_adaptor.hpp

@@ -27,7 +27,8 @@
 #include <optional>
 #include <unordered_map>
 
-namespace RMM_EXPORT rmm::mr {
+namespace RMM_EXPORT rmm {
+namespace mr {
 /**
  * @addtogroup device_resource_adaptors
  * @{
@@ -195,4 +196,5 @@ class aligned_resource_adaptor final : public device_memory_resource {
 };
 
 /** @} */  // end of group
-}  // namespace rmm::mr
+}  // namespace mr
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/arena_memory_resource.hpp

@@ -32,7 +32,8 @@
 #include <shared_mutex>
 #include <thread>
 
-namespace RMM_EXPORT rmm::mr {
+namespace RMM_EXPORT rmm {
+namespace mr {
 /**
  * @addtogroup device_memory_resources
  * @{
@@ -343,4 +344,5 @@ class arena_memory_resource final : public device_memory_resource {
 };
 
 /** @} */  // end of group
-}  // namespace rmm::mr
+}  // namespace mr
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/binning_memory_resource.hpp

@@ -29,7 +29,8 @@
 #include <memory>
 #include <vector>
 
-namespace RMM_EXPORT rmm::mr {
+namespace RMM_EXPORT rmm {
+namespace mr {
 /**
  * @addtogroup device_memory_resources
  * @{
@@ -195,4 +196,5 @@ class binning_memory_resource final : public device_memory_resource {
 };
 
 /** @} */  // end of group
-}  // namespace rmm::mr
+}  // namespace mr
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/callback_memory_resource.hpp

@@ -22,7 +22,8 @@
 #include <functional>
 #include <utility>
 
-namespace RMM_EXPORT rmm::mr {
+namespace RMM_EXPORT rmm {
+namespace mr {
 /**
  * @addtogroup device_memory_resources
  * @{
@@ -146,4 +147,5 @@ class callback_memory_resource final : public device_memory_resource {
 };
 
 /** @} */  // end of group
-}  // namespace rmm::mr
+}  // namespace mr
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/cuda_async_memory_resource.hpp

@@ -37,7 +37,8 @@
 #endif
 #endif
 
-namespace RMM_EXPORT rmm::mr {
+namespace RMM_EXPORT rmm {
+namespace mr {
 /**
  * @addtogroup device_memory_resources
  * @{
@@ -221,4 +222,5 @@ class cuda_async_memory_resource final : public device_memory_resource {
 };
 
 /** @} */  // end of group
-}  // namespace rmm::mr
+}  // namespace mr
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/cuda_async_view_memory_resource.hpp

@@ -32,7 +32,8 @@
 #define RMM_CUDA_MALLOC_ASYNC_SUPPORT
 #endif
 
-namespace RMM_EXPORT rmm::mr {
+namespace RMM_EXPORT rmm {
+namespace mr {
 /**
  * @addtogroup device_memory_resources
  * @{
@@ -156,4 +157,5 @@ class cuda_async_view_memory_resource final : public device_memory_resource {
 };
 
 /** @} */  // end of group
-}  // namespace rmm::mr
+}  // namespace mr
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/cuda_memory_resource.hpp

@@ -22,7 +22,8 @@
 
 #include <cstddef>
 
-namespace RMM_EXPORT rmm::mr {
+namespace RMM_EXPORT rmm {
+namespace mr {
 /**
  * @addtogroup device_memory_resources
  * @{
@@ -95,4 +96,5 @@ class cuda_memory_resource final : public device_memory_resource {
   }
 };
 /** @} */  // end of group
-}  // namespace rmm::mr
+}  // namespace mr
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/detail/arena.hpp

@@ -38,7 +38,8 @@
 #include <optional>
 #include <set>
 
-namespace RMM_EXPORT rmm::mr::detail::arena {
+namespace RMM_EXPORT rmm {
+namespace mr::detail::arena {
 
 /**
  * @brief Align up to nearest size class.
@@ -999,4 +1000,5 @@ class arena_cleaner {
   std::weak_ptr<arena<Upstream>> arena_;
 };
 
-}  // namespace rmm::mr::detail::arena
+}  // namespace mr::detail::arena
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/detail/coalescing_free_list.hpp

@@ -29,7 +29,8 @@
 #include <iterator>
 #include <list>
 
-namespace RMM_EXPORT rmm::mr::detail {
+namespace RMM_EXPORT rmm {
+namespace mr::detail {
 
 /**
  * @brief A simple block structure specifying the size and location of a block
@@ -268,4 +269,5 @@ struct coalescing_free_list : free_list<block> {
 #endif
 };  // coalescing_free_list
 
-}  // namespace rmm::mr::detail
+}  // namespace mr::detail
+}  // namespace RMM_EXPORT rmm

include/rmm/mr/device/detail/fixed_size_free_list.hpp

@@ -16,64 +16,66 @@
 
 #pragma once
 
-rmm::mr::detail
+#include <rmm/detail/export.hpp>
 #include <rmm/mr/device/detail/free_list.hpp>
 
 #include <cstddef>
 #include <iostream>
 
-  namespace RMM_EXPORT rmm::mr::detail
-{
-  struct fixed_size_free_list : free_list<block_base> {
-    fixed_size_free_list()           = default;
-    ~fixed_size_free_list() override = default;
+namespace RMM_EXPORT rmm {
+namespace mr::detail {
 
-    fixed_size_free_list(fixed_size_free_list const&)            = delete;
-    fixed_size_free_list& operator=(fixed_size_free_list const&) = delete;
-    fixed_size_free_list(fixed_size_free_list&&)                 = delete;
-    fixed_size_free_list& operator=(fixed_size_free_list&&)      = delete;
+struct fixed_size_free_list : free_list<block_base> {
+  fixed_size_free_list()           = default;
+  ~fixed_size_free_list() override = default;
 
-    /**
-     * @brief Construct a new free_list from range defined by input iterators
-     *
-     * @tparam InputIt Input iterator
-     * @param first The start of the range to insert into the free_list
-     * @param last The end of the range to insert into the free_list
-     */
-    template <class InputIt>
-    fixed_size_free_list(InputIt first, InputIt last)
-    {
-      std::for_each(first, last, [this](block_type const& block) { insert(block); });
-    }
+  fixed_size_free_list(fixed_size_free_list const&)            = delete;
+  fixed_size_free_list& operator=(fixed_size_free_list const&) = delete;
+  fixed_size_free_list(fixed_size_free_list&&)                 = delete;
+  fixed_size_free_list& operator=(fixed_size_free_list&&)      = delete;
 
-    /**
-     * @brief Inserts a block into the `free_list` in the correct order, coalescing it with the
-     *        preceding and following blocks if either is contiguous.
-     *
-     * @param block The block to insert.
-     */
-    void insert(block_type const& block) { push_back(block); }
+  /**
+   * @brief Construct a new free_list from range defined by input iterators
+   *
+   * @tparam InputIt Input iterator
+   * @param first The start of the range to insert into the free_list
+   * @param last The end of the range to insert into the free_list
+   */
+  template <class InputIt>
+  fixed_size_free_list(InputIt first, InputIt last)
+  {
+    std::for_each(first, last, [this](block_type const& block) { insert(block); });
+  }
 
-    /**
-     * @brief Inserts blocks from another free list into this free_list.
-     *
-     * @param other The free_list to insert into this free_list.
-     */
-    void insert(free_list&& other) { splice(cend(), std::move(other)); }
+  /**
+   * @brief Inserts a block into the `free_list` in the correct order, coalescing it with the
+   *        preceding and following blocks if either is contiguous.
+   *
+   * @param block The block to insert.
+   */
+  void insert(block_type const& block) { push_back(block); }
 
-    /**
-     * @brief Returns the first block in the free list.
-     *
-     * @param size The size in bytes of the desired block (unused).
-     * @return A block large enough to store `size` bytes.
-     */
-    block_type get_block(std::size_t size)
-    {
-      if (is_empty()) { return block_type{}; }
-      block_type block = *begin();
-      pop_front();
-      return block;
-    }
-  };
+  /**
+   * @brief Inserts blocks from another free list into this free_list.
+   *
+   * @param other The free_list to insert into this free_list.
+   */
+  void insert(free_list&& other) { splice(cend(), std::move(other)); }
 
-}  // namespace RMM_EXPORT rmm::mr::detail
+  /**
+   * @brief Returns the first block in the free list.
+   *
+   * @param size The size in bytes of the desired block (unused).
+   * @return A block large enough to store `size` bytes.
+   */
+  block_type get_block(std::size_t size)
+  {
+    if (is_empty()) { return block_type{}; }
+    block_type block = *begin();
+    pop_front();
+    return block;
+  }
+};
+
+}  // namespace mr::detail
+}  // namespace RMM_EXPORT rmm