cuda-cccl 0.3.2__cp313-cp313-manylinux_2_24_aarch64.whl → 0.3.4__cp313-cp313-manylinux_2_24_aarch64.whl

cuda/cccl/headers/include/thrust/detail/type_traits/is_thrust_pointer.h

@@ -23,10 +23,8 @@
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
-
 namespace pointer_traits_detail
 {
-
 template <typename Ptr, typename Enable = void>
 struct pointer_raw_pointer_impl
 {};
@@ -42,7 +40,6 @@ struct pointer_raw_pointer_impl<Ptr, ::cuda::std::void_t<typename Ptr::raw_point
 {
   using type = typename Ptr::raw_pointer;
 };
-
 } // namespace pointer_traits_detail
 
 template <typename T>
@@ -53,7 +50,6 @@ struct pointer_raw_pointer : pointer_traits_detail::pointer_raw_pointer_impl<T>
 // sufficient just to check if pointer_raw_pointer<T> has meaning
 template <typename T>
 inline constexpr bool is_thrust_pointer_v = is_metafunction_defined<pointer_raw_pointer<T>>::value;
-
 } // namespace detail
 
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/detail/type_traits/pointer_traits.h

@@ -37,7 +37,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
-
 template <typename Ptr>
 struct pointer_element;
 
@@ -141,7 +140,6 @@ struct rebind_pointer<
 
 namespace pointer_traits_detail
 {
-
 template <typename Void>
 struct capture_address
 {
@@ -165,7 +163,6 @@ struct pointer_to_param
                               ::cuda::std::type_identity<capture_address<T>>,
                               ::cuda::std::add_lvalue_reference<T>>
 {};
-
 } // namespace pointer_traits_detail
 
 template <typename Ptr>
@@ -327,6 +324,5 @@ template <typename FromPtr, typename ToPtr, typename T = void>
 struct enable_if_void_pointer_is_system_convertible
     : ::cuda::std::enable_if<lazy_is_void_pointer_system_convertible<FromPtr, ToPtr>::type::value, T>
 {};
-
 } // namespace detail
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/detail/uninitialized_copy.inl

@@ -27,11 +27,23 @@
 #endif // no system header
 
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/uninitialized_copy.h>
 #include <thrust/system/detail/generic/select_system.h>
-#include <thrust/system/detail/generic/uninitialized_copy.h>
 #include <thrust/uninitialized_copy.h>
 
+// Include all active backend system implementations (generic, sequential, host and device)
+#include <thrust/system/detail/generic/uninitialized_copy.h>
+#include <thrust/system/detail/sequential/uninitialized_copy.h>
+#include __THRUST_HOST_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(uninitialized_copy.h)
+#include __THRUST_DEVICE_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(uninitialized_copy.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/detail/uninitialized_copy.h>
+#  include <thrust/system/cuda/detail/uninitialized_copy.h>
+#  include <thrust/system/omp/detail/uninitialized_copy.h>
+#  include <thrust/system/tbb/detail/uninitialized_copy.h>
+#endif
+
 THRUST_NAMESPACE_BEGIN
 
 _CCCL_EXEC_CHECK_DISABLE

cuda/cccl/headers/include/thrust/detail/uninitialized_fill.inl

@@ -27,11 +27,23 @@
 #endif // no system header
 
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/uninitialized_fill.h>
 #include <thrust/system/detail/generic/select_system.h>
-#include <thrust/system/detail/generic/uninitialized_fill.h>
 #include <thrust/uninitialized_fill.h>
 
+// Include all active backend system implementations (generic, sequential, host and device)
+#include <thrust/system/detail/generic/uninitialized_fill.h>
+#include <thrust/system/detail/sequential/uninitialized_fill.h>
+#include __THRUST_HOST_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(uninitialized_fill.h)
+#include __THRUST_DEVICE_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(uninitialized_fill.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/detail/uninitialized_fill.h>
+#  include <thrust/system/cuda/detail/uninitialized_fill.h>
+#  include <thrust/system/omp/detail/uninitialized_fill.h>
+#  include <thrust/system/tbb/detail/uninitialized_fill.h>
+#endif
+
 THRUST_NAMESPACE_BEGIN
 
 _CCCL_EXEC_CHECK_DISABLE

cuda/cccl/headers/include/thrust/detail/unique.inl

@@ -27,12 +27,30 @@
 #endif // no system header
 #include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/unique.h>
-#include <thrust/system/detail/adl/unique_by_key.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/unique.h>
+
+// Include all active backend system implementations (generic, sequential, host and device)
 #include <thrust/system/detail/generic/unique.h>
 #include <thrust/system/detail/generic/unique_by_key.h>
-#include <thrust/unique.h>
+#include <thrust/system/detail/sequential/unique.h>
+#include <thrust/system/detail/sequential/unique_by_key.h>
+#include __THRUST_HOST_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(unique.h)
+#include __THRUST_DEVICE_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(unique.h)
+#include __THRUST_HOST_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(unique_by_key.h)
+#include __THRUST_DEVICE_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(unique_by_key.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/detail/unique.h>
+#  include <thrust/system/cpp/detail/unique_by_key.h>
+#  include <thrust/system/cuda/detail/unique.h>
+#  include <thrust/system/cuda/detail/unique_by_key.h>
+#  include <thrust/system/omp/detail/unique.h>
+#  include <thrust/system/omp/detail/unique_by_key.h>
+#  include <thrust/system/tbb/detail/unique.h>
+#  include <thrust/system/tbb/detail/unique_by_key.h>
+#endif
 
 THRUST_NAMESPACE_BEGIN
 

cuda/cccl/headers/include/thrust/detail/vector_base.h

@@ -58,7 +58,6 @@ inline constexpr no_init_t no_init;
 
 namespace detail
 {
-
 template <typename T, typename Alloc>
 class vector_base
 {
@@ -605,7 +604,6 @@ bool operator!=(const vector_base<T1, Alloc1>& lhs, const std::vector<T2, Alloc2
 
 template <typename T1, typename Alloc1, typename T2, typename Alloc2>
 bool operator!=(const std::vector<T1, Alloc1>& lhs, const vector_base<T2, Alloc2>& rhs);
-
 } // namespace detail
 
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/detail/vector_base.inl

@@ -46,7 +46,6 @@ THRUST_NAMESPACE_BEGIN
 
 namespace detail
 {
-
 template <typename T, typename Alloc>
 vector_base<T, Alloc>::vector_base()
     : m_storage()
@@ -1204,7 +1203,6 @@ bool operator!=(const std::vector<T1, Alloc1>& lhs, const vector_base<T2, Alloc2
 {
   return !(lhs == rhs);
 }
-
 } // end namespace detail
 
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/execution_policy.h

@@ -21,15 +21,16 @@
 
 //! \cond
 
-// #include the host system's execution_policy header
-#define __THRUST_HOST_SYSTEM_EXECUTION_POLICY_HEADER <__THRUST_HOST_SYSTEM_ROOT/execution_policy.h>
-#include __THRUST_HOST_SYSTEM_EXECUTION_POLICY_HEADER
-#undef __THRUST_HOST_SYSTEM_EXECUTION_POLICY_HEADER
-
-// #include the device system's execution_policy.h header
-#define __THRUST_DEVICE_SYSTEM_EXECUTION_POLICY_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/execution_policy.h>
-#include __THRUST_DEVICE_SYSTEM_EXECUTION_POLICY_HEADER
-#undef __THRUST_DEVICE_SYSTEM_EXECUTION_POLICY_HEADER
+#include __THRUST_HOST_SYSTEM_ALGORITH_HEADER_INCLUDE(execution_policy.h)
+#include __THRUST_DEVICE_SYSTEM_ALGORITH_HEADER_INCLUDE(execution_policy.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/execution_policy.h>
+#  include <thrust/system/cuda/execution_policy.h>
+#  include <thrust/system/omp/execution_policy.h>
+#  include <thrust/system/tbb/execution_policy.h>
+#endif
 
 //! \endcond
 

cuda/cccl/headers/include/thrust/functional.h

@@ -343,7 +343,6 @@ _CCCL_REQUIRES(::cuda::std::is_constructible_v<::cuda::std::decay_t<_Fn>, _Fn>
  */
 namespace placeholders
 {
-
 /*! \p thrust::placeholders::_1 is the placeholder for the first function parameter.
  */
 _CCCL_GLOBAL_CONSTANT thrust::detail::functional::placeholder<0>::type _1;
@@ -383,7 +382,6 @@ _CCCL_GLOBAL_CONSTANT thrust::detail::functional::placeholder<8>::type _9;
 /*! \p thrust::placeholders::_10 is the placeholder for the tenth function parameter.
  */
 _CCCL_GLOBAL_CONSTANT thrust::detail::functional::placeholder<9>::type _10;
-
 } // namespace placeholders
 
 /*! \} // placeholder_objects

cuda/cccl/headers/include/thrust/iterator/detail/device_system_tag.h

@@ -26,10 +26,15 @@
 #  pragma system_header
 #endif // no system header
 
-// #include the device system's execution_policy header
-#define __THRUST_DEVICE_SYSTEM_TAG_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/execution_policy.h>
-#include __THRUST_DEVICE_SYSTEM_TAG_HEADER
-#undef __THRUST_DEVICE_SYSTEM_TAG_HEADER
+#include __THRUST_DEVICE_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(execution_policy.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/detail/execution_policy.h>
+#  include <thrust/system/cuda/detail/execution_policy.h>
+#  include <thrust/system/omp/detail/execution_policy.h>
+#  include <thrust/system/tbb/detail/execution_policy.h>
+#endif
 
 THRUST_NAMESPACE_BEGIN
 

cuda/cccl/headers/include/thrust/iterator/detail/host_system_tag.h

@@ -26,10 +26,14 @@
 #  pragma system_header
 #endif // no system header
 
-// #include the host system's execution_policy header
-#define __THRUST_HOST_SYSTEM_TAG_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/execution_policy.h>
-#include __THRUST_HOST_SYSTEM_TAG_HEADER
-#undef __THRUST_HOST_SYSTEM_TAG_HEADER
+#include __THRUST_HOST_SYSTEM_ALGORITH_DETAIL_HEADER_INCLUDE(execution_policy.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/detail/execution_policy.h>
+#  include <thrust/system/omp/detail/execution_policy.h>
+#  include <thrust/system/tbb/detail/execution_policy.h>
+#endif
 
 THRUST_NAMESPACE_BEGIN
 

cuda/cccl/headers/include/thrust/iterator/detail/iterator_adaptor_base.h

@@ -76,6 +76,5 @@ private:
 public:
   using type = iterator_facade<Derived, value, system, traversal, reference, difference>;
 };
-
 } // namespace detail
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/iterator/detail/iterator_category_with_system_and_traversal.h

@@ -52,6 +52,5 @@ struct iterator_category_to_traversal<iterator_category_with_system_and_traversa
 {
   using type = Traversal;
 };
-
 } // namespace detail
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/iterator/detail/iterator_facade_category.h

@@ -177,6 +177,5 @@ using iterator_facade_category_t =
   typename ::cuda::std::_If<is_iterator_category<CategoryOrTraversal>,
                             ::cuda::std::type_identity<CategoryOrTraversal>,
                             iterator_facade_category_impl<CategoryOrSystem, CategoryOrTraversal>>::type;
-
 } // namespace detail
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/iterator/detail/minimum_system.h

@@ -53,6 +53,5 @@ _CCCL_HOST_DEVICE auto minimum_system_impl(long) -> unrelated_systems<Ts...>;
 // otherwise, collect the arguments and report them as unrelated
 template <typename... Ts>
 using minimum_system_t = decltype(minimum_system_impl<Ts...>(0));
-
 } // namespace detail
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/iterator/detail/tagged_iterator.h

@@ -70,7 +70,6 @@ auto make_tagged_iterator(Iterator iter) -> tagged_iterator<Iterator, Tag>
 {
   return tagged_iterator<Iterator, Tag>(iter);
 }
-
 } // namespace detail
 
 // tagged_iterator is trivial if its base iterator is.

cuda/cccl/headers/include/thrust/iterator/detail/tuple_of_iterator_references.h

@@ -38,7 +38,6 @@ THRUST_NAMESPACE_BEGIN
 
 namespace detail
 {
-
 template <typename... Ts>
 class tuple_of_iterator_references;
 
@@ -131,7 +130,6 @@ public:
     return {maybe_unwrap_nested<Us, Ts>{}(get<Id>(*this))...};
   }
 };
-
 } // namespace detail
 
 THRUST_NAMESPACE_END
@@ -139,8 +137,8 @@ THRUST_NAMESPACE_END
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
 template <class... Ts>
-struct __is_tuple_of_iterator_references<THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts...>> : true_type
-{};
+inline constexpr bool
+  __is_tuple_of_iterator_references_v<THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts...>> = true;
 
 // define tuple_size, tuple_element, etc.
 template <class... Ts>
@@ -159,7 +157,6 @@ _CCCL_END_NAMESPACE_CUDA_STD
 #if !_CCCL_COMPILER(NVRTC)
 namespace std
 {
-
 template <class... Ts>
 struct tuple_size<THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts...>>
     : integral_constant<size_t, sizeof...(Ts)>
@@ -169,6 +166,5 @@ template <size_t Id, class... Ts>
 struct tuple_element<Id, THRUST_NS_QUALIFIER::detail::tuple_of_iterator_references<Ts...>>
     : ::cuda::std::tuple_element<Id, ::cuda::std::tuple<Ts...>>
 {};
-
 } // namespace std
 #endif // !_CCCL_COMPILER(NVRTC)

cuda/cccl/headers/include/thrust/iterator/transform_input_output_iterator.h

@@ -107,7 +107,6 @@ public:
 template <typename InputFunction, typename OutputFunction, typename Iterator>
 inline constexpr bool
   is_proxy_reference_v<transform_input_output_iterator_proxy<InputFunction, OutputFunction, Iterator>> = true;
-
 } // namespace detail
 
 //! \addtogroup iterators

cuda/cccl/headers/include/thrust/iterator/transform_iterator.h

@@ -58,7 +58,6 @@ class transform_iterator;
 
 namespace detail
 {
-
 template <class UnaryFunc, class Iterator>
 struct transform_iterator_reference
 {
@@ -97,7 +96,6 @@ public:
                      use_default, // pick traversal from Iterator
                      reference>;
 };
-
 } // namespace detail
 
 //! \addtogroup iterators

cuda/cccl/headers/include/thrust/mr/allocator.h

@@ -42,7 +42,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
-
 /*! \addtogroup allocators Allocators
  *  \ingroup memory_management
  *  \{
@@ -224,6 +223,5 @@ public:
 
 /*! \} // allocators
  */
-
 } // namespace mr
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/mr/device_memory_resource.h

@@ -26,10 +26,15 @@
 #  pragma system_header
 #endif // no system header
 
-// #include the device system's memory_resource header
-#define __THRUST_DEVICE_SYSTEM_MEMORY_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/memory_resource.h>
-#include __THRUST_DEVICE_SYSTEM_MEMORY_HEADER
-#undef __THRUST_DEVICE_SYSTEM_MEMORY_HEADER
+#include __THRUST_DEVICE_SYSTEM_ALGORITH_HEADER_INCLUDE(memory_resource.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/memory_resource.h>
+#  include <thrust/system/cuda/memory_resource.h>
+#  include <thrust/system/omp/memory_resource.h>
+#  include <thrust/system/tbb/memory_resource.h>
+#endif
 
 THRUST_NAMESPACE_BEGIN
 

cuda/cccl/headers/include/thrust/mr/disjoint_pool.h

@@ -41,6 +41,8 @@
 #include <thrust/mr/memory_resource.h>
 #include <thrust/mr/pool_options.h>
 
+#include <cuda/__cmath/ilog.h>
+#include <cuda/__cmath/pow2.h>
 #include <cuda/std/__algorithm/max.h>
 #include <cuda/std/__algorithm/min.h>
 #include <cuda/std/__cccl/algorithm_wrapper.h>
@@ -50,7 +52,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
-
 /** \addtogroup memory_resources Memory Resources
  *  \ingroup memory_management
  *  \{
@@ -123,7 +124,7 @@ public:
       : m_upstream(upstream)
       , m_bookkeeper(bookkeeper)
       , m_options(options)
-      , m_smallest_block_log2(detail::log2_ri(m_options.smallest_block_size))
+      , m_smallest_block_log2(::cuda::ceil_ilog2(m_options.smallest_block_size))
       , m_pools(m_bookkeeper)
       , m_allocated(m_bookkeeper)
       , m_cached_oversized(m_bookkeeper)
@@ -133,7 +134,7 @@ public:
 
     pointer_vector free(m_bookkeeper);
     pool p(free);
-    m_pools.resize(detail::log2_ri(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
+    m_pools.resize(::cuda::ceil_ilog2(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
   }
 
   // TODO: C++11: use delegating constructors
@@ -146,7 +147,7 @@ public:
       : m_upstream(get_global_resource<Upstream>())
       , m_bookkeeper(get_global_resource<Bookkeeper>())
       , m_options(options)
-      , m_smallest_block_log2(detail::log2_ri(m_options.smallest_block_size))
+      , m_smallest_block_log2(::cuda::ceil_ilog2(m_options.smallest_block_size))
       , m_pools(m_bookkeeper)
       , m_allocated(m_bookkeeper)
       , m_cached_oversized(m_bookkeeper)
@@ -156,7 +157,7 @@ public:
 
     pointer_vector free(m_bookkeeper);
     pool p(free);
-    m_pools.resize(detail::log2_ri(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
+    m_pools.resize(::cuda::ceil_ilog2(m_options.largest_block_size) - m_smallest_block_log2 + 1, p);
   }
 
   /*! Destructor. Releases all held memory to upstream.
@@ -370,7 +371,7 @@ public:
   [[nodiscard]] void_ptr do_allocate_impl(std::size_t bytes, std::size_t alignment)
   {
     bytes = (std::max) (bytes, m_options.smallest_block_size);
-    assert(detail::is_power_of_2(alignment));
+    assert(::cuda::is_power_of_two(alignment));
 
     // an oversized and/or overaligned allocation requested; needs to be allocated separately
     if (bytes > m_options.largest_block_size || alignment > m_options.alignment)
@@ -430,7 +431,7 @@ public:
 
     // the request is NOT for oversized and/or overaligned memory
     // allocate a block from an appropriate bucket
-    std::size_t bytes_log2 = thrust::detail::log2_ri(bytes);
+    std::size_t bytes_log2 = ::cuda::ceil_ilog2(bytes);
     std::size_t pool_idx   = bytes_log2 - m_smallest_block_log2;
     pool& bucket           = m_pools[pool_idx];
 
@@ -482,7 +483,7 @@ public:
   virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
   {
     n = (std::max) (n, m_options.smallest_block_size);
-    assert(detail::is_power_of_2(alignment));
+    assert(::cuda::is_power_of_two(alignment));
 
     // verify that the pointer is at least as aligned as claimed
     assert(reinterpret_cast<::cuda::std::intmax_t>(detail::pointer_traits<void_ptr>::get(p)) % alignment == 0);
@@ -511,7 +512,7 @@ public:
     }
 
     // push the block to the front of the appropriate bucket's free list
-    std::size_t n_log2   = thrust::detail::log2_ri(n);
+    std::size_t n_log2   = ::cuda::ceil_ilog2(n);
     std::size_t pool_idx = n_log2 - m_smallest_block_log2;
     pool& bucket         = m_pools[pool_idx];
 
@@ -521,6 +522,5 @@ public:
 
 /*! \} // memory_resource
  */
-
 } // namespace mr
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/mr/disjoint_sync_pool.h

@@ -36,7 +36,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
-
 /*! \addtogroup memory_resources Memory Resources
  *  \ingroup memory_management
  *  \{
@@ -113,6 +112,5 @@ private:
 
 /*! \} // memory_resources
  */
-
 } // namespace mr
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/mr/disjoint_tls_pool.h

@@ -34,7 +34,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
-
 /*! \addtogroup memory_resources Memory Resources
  *  \ingroup memory_management
  *  \{
@@ -62,6 +61,5 @@ tls_disjoint_pool(Upstream* upstream = nullptr, Bookkeeper* bookkeeper = nullptr
 
 /*! \}
  */
-
 } // namespace mr
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/mr/fancy_pointer_resource.h

@@ -32,7 +32,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
-
 template <typename Upstream, typename Pointer>
 class fancy_pointer_resource final
     : public memory_resource<Pointer>
@@ -62,6 +61,5 @@ public:
 private:
   Upstream* m_upstream;
 };
-
 } // namespace mr
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/mr/host_memory_resource.h

@@ -26,10 +26,14 @@
 #  pragma system_header
 #endif // no system header
 
-// #include the host system's memory_resource header
-#define __THRUST_HOST_SYSTEM_MEMORY_HEADER <__THRUST_HOST_SYSTEM_ROOT/memory_resource.h>
-#include __THRUST_HOST_SYSTEM_MEMORY_HEADER
-#undef __THRUST_HOST_SYSTEM_MEMORY_HEADER
+#include __THRUST_HOST_SYSTEM_ALGORITH_HEADER_INCLUDE(memory_resource.h)
+
+// Some build systems need a hint to know which files we could include
+#if 0
+#  include <thrust/system/cpp/memory_resource.h>
+#  include <thrust/system/omp/memory_resource.h>
+#  include <thrust/system/tbb/memory_resource.h>
+#endif
 
 THRUST_NAMESPACE_BEGIN
 

cuda/cccl/headers/include/thrust/mr/memory_resource.h

@@ -42,7 +42,6 @@ THRUST_NAMESPACE_BEGIN
  */
 namespace mr
 {
-
 /** \addtogroup memory_resources Memory Resources
  *  \ingroup memory_management
  *  \{
@@ -212,6 +211,5 @@ _CCCL_HOST MR* get_global_resource()
 
 /*! \} // memory_resource
  */
-
 } // namespace mr
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/mr/new.h

@@ -35,7 +35,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
-
 /** \addtogroup memory_resources Memory Resources
  *  \ingroup memory_management
  *  \{
@@ -95,6 +94,5 @@ class new_delete_resource final : public new_delete_resource_base
 
 /*! \} // memory_resources
  */
-
 } // namespace mr
 THRUST_NAMESPACE_END

cuda/cccl/headers/include/thrust/mr/polymorphic_adaptor.h

@@ -31,7 +31,6 @@
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
-
 template <typename Pointer = void*>
 class polymorphic_adaptor_resource final : public memory_resource<Pointer>
 {
@@ -58,6 +57,5 @@ public:
 private:
   memory_resource<Pointer>* upstream_resource;
 };
-
 } // namespace mr
 THRUST_NAMESPACE_END