cuda-cccl 0.3.1__cp310-cp310-manylinux_2_24_aarch64.whl → 0.3.2__cp310-cp310-manylinux_2_24_aarch64.whl

cuda/cccl/headers/include/cuda/std/__fwd/allocator.h

@@ -23,6 +23,19 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
+// std:: forward declarations
+
+#if _CCCL_HAS_HOST_STD_LIB()
+_CCCL_BEGIN_NAMESPACE_STD
+
+template <class _Tp>
+class allocator;
+
+_CCCL_END_NAMESPACE_STD
+#endif // _CCCL_HAS_HOST_STD_LIB()
+
+// cuda::std:: forward declarations
+
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
 template <class _Tp>

cuda/cccl/headers/include/cuda/std/__fwd/char_traits.h

@@ -23,6 +23,19 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
+// std:: forward declarations
+
+#if _CCCL_HAS_HOST_STD_LIB()
+_CCCL_BEGIN_NAMESPACE_STD
+
+template <class _CharT>
+struct char_traits;
+
+_CCCL_END_NAMESPACE_STD
+#endif // _CCCL_HAS_HOST_STD_LIB()
+
+// cuda::std:: forward declarations
+
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
 template <class _CharT>

cuda/cccl/headers/include/cuda/std/__fwd/complex.h

@@ -20,12 +20,21 @@
 #  pragma system_header
 #endif // no system header
 
-#if !_CCCL_COMPILER(NVRTC)
-#  include <complex>
-#endif // !_CCCL_COMPILER(NVRTC)
-
 #include <cuda/std/__cccl/prologue.h>
 
+// std:: forward declarations
+
+#if _CCCL_HAS_HOST_STD_LIB()
+_CCCL_BEGIN_NAMESPACE_STD
+
+template <class>
+class complex;
+
+_CCCL_END_NAMESPACE_STD
+#endif // _CCCL_HAS_HOST_STD_LIB()
+
+// cuda::std:: forward declarations
+
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
 template <class _Tp>

cuda/cccl/headers/include/cuda/std/__fwd/mdspan.h

@@ -83,6 +83,29 @@ inline constexpr bool __is_std_mdspan_v = false;
 template <class _ElementType, class _Extents, class _LayoutPolicy, class _AccessorPolicy>
 inline constexpr bool __is_std_mdspan_v<mdspan<_ElementType, _Extents, _LayoutPolicy, _AccessorPolicy>> = true;
 
+template <typename _Layout>
+inline constexpr bool __is_any_mdspan_layout_mapping_left_v = false;
+
+template <typename _Extents>
+inline constexpr bool __is_any_mdspan_layout_mapping_left_v<layout_left::mapping<_Extents>> = true;
+
+template <typename _Layout>
+inline constexpr bool __is_any_mdspan_layout_mapping_right_v = false;
+
+template <typename _Extents>
+inline constexpr bool __is_any_mdspan_layout_mapping_right_v<layout_right::mapping<_Extents>> = true;
+
+template <typename _Layout>
+inline constexpr bool __is_any_mdspan_layout_mapping_left_or_right_v =
+  __is_any_mdspan_layout_mapping_left_v<_Layout> || __is_any_mdspan_layout_mapping_right_v<_Layout>;
+
+// TODO (fbusato): Add support for layout_right_padded and layout_left_padded
+// template<>
+// inline constexpr bool __is_any_mdspan_layout_mapping_right_v<layout_right_padded> = true;
+
+// template<>
+// inline constexpr bool __is_any_mdspan_layout_mapping_right_v<layout_left_padded> = true;
+
 _CCCL_END_NAMESPACE_CUDA_STD
 
 #include <cuda/std/__cccl/epilogue.h>

cuda/cccl/headers/include/cuda/std/__fwd/pair.h

@@ -22,6 +22,19 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
+// std:: forward declarations
+
+#if _CCCL_HAS_HOST_STD_LIB()
+_CCCL_BEGIN_NAMESPACE_STD
+
+template <class, class>
+struct pair;
+
+_CCCL_END_NAMESPACE_STD
+#endif // _CCCL_HAS_HOST_STD_LIB()
+
+// cuda::std:: forward declarations
+
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
 template <class, class>

cuda/cccl/headers/include/cuda/std/__fwd/string.h

@@ -26,6 +26,28 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
+// std:: forward declarations
+
+#if _CCCL_HAS_HOST_STD_LIB()
+_CCCL_BEGIN_NAMESPACE_STD
+
+// libstdc++ puts basic_string to inline cxx11 namespace
+#  if _GLIBCXX_USE_CXX11_ABI
+inline _GLIBCXX_BEGIN_NAMESPACE_CXX11
+#  endif // _GLIBCXX_USE_CXX11_ABI
+
+  template <class _CharT, class _Traits, class _Alloc>
+  class basic_string;
+
+#  if _GLIBCXX_USE_CXX11_ABI
+_GLIBCXX_END_NAMESPACE_CXX11
+#  endif // _GLIBCXX_USE_CXX11_ABI
+
+_CCCL_END_NAMESPACE_STD
+#endif // _CCCL_HAS_HOST_STD_LIB()
+
+// cuda::std:: forward declarations
+
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
 #if 0 // we don't support these features

cuda/cccl/headers/include/cuda/std/__fwd/string_view.h

@@ -24,6 +24,19 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
+// std:: forward declarations
+
+#if _CCCL_HAS_HOST_STD_LIB() && __cpp_lib_string_view >= 201606L
+_CCCL_BEGIN_NAMESPACE_STD
+
+template <class _CharT, class _Traits>
+class basic_string_view;
+
+_CCCL_END_NAMESPACE_STD
+#endif // _CCCL_HAS_HOST_STD_LIB() && __cpp_lib_string_view >= 201606L
+
+// cuda::std:: forward declarations
+
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
 template <class _CharT, class _Traits = char_traits<_CharT>>
@@ -52,6 +65,7 @@ _CCCL_PREFERRED_NAME(wstring_view)
 #endif // _CCCL_HAS_WCHAR_T()
       basic_string_view;
 // clang-format on
+
 _CCCL_END_NAMESPACE_CUDA_STD
 
 #include <cuda/std/__cccl/epilogue.h>

cuda/cccl/headers/include/cuda/std/__internal/features.h

@@ -69,9 +69,4 @@
 #  define _LIBCUDACXX_HAS_NVBF16() 0
 #endif // _CCCL_HAS_NVBF16() && _CCCL_CTK_AT_LEAST(12, 2)
 
-// NVCC does not have a way of silencing non '_' prefixed UDLs
-#if !_CCCL_CUDA_COMPILER(NVCC) && !_CCCL_COMPILER(NVRTC)
-#  define _LIBCUDACXX_HAS_STL_LITERALS
-#endif // !_CCCL_CUDA_COMPILER(NVCC) && !_CCCL_COMPILER(NVRTC)
-
 #endif // _CUDA_STD___INTERNAL_FEATURES_H

cuda/cccl/headers/include/cuda/std/__internal/namespaces.h

@@ -104,6 +104,27 @@
 #  endif // not defined(_NVHPC_CUDA)
 #endif // not defined(CCCL_DISABLE_ARCH_DEPENDENT_NAMESPACE)
 
+// Host standard library namespaces
+#if _CCCL_HOST_STD_LIB(LIBSTDCXX)
+  // We don't appy attributes on forward declarations, so we omit the _GLIBCXX_VISIBILITY(default)
+#  if _GLIBCXX_INLINE_VERSION
+#    define _CCCL_BEGIN_NAMESPACE_STD _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK() namespace std { inline _GLIBCXX_BEGIN_NAMESPACE_VERSION
+#    define _CCCL_END_NAMESPACE_STD   _GLIBCXX_END_NAMESPACE_VERSION } _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK()
+#  else // ^^^ _GLIBCXX_INLINE_VERSION ^^^ / vvv !_GLIBCXX_INLINE_VERSION vvv
+#    define _CCCL_BEGIN_NAMESPACE_STD _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK() namespace std {
+#    define _CCCL_END_NAMESPACE_STD   } _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK()
+#  endif // ^^^ !_GLIBCXX_INLINE_VERSION ^^^
+#elif _CCCL_HOST_STD_LIB(LIBCXX)
+#  define _CCCL_BEGIN_NAMESPACE_STD _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK() _LIBCPP_BEGIN_NAMESPACE_STD
+#  define _CCCL_END_NAMESPACE_STD   _LIBCPP_END_NAMESPACE_STD _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK()
+#elif _CCCL_HOST_STD_LIB(STL)
+#  define _CCCL_BEGIN_NAMESPACE_STD _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK() _STD_BEGIN
+#  define _CCCL_END_NAMESPACE_STD   _STD_END _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK()
+#else
+#  define _CCCL_BEGIN_NAMESPACE_STD _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK() namespace std {
+#  define _CCCL_END_NAMESPACE_STD   } _LIBCUDACXX_PROLOGUE_INCLUDE_CHECK()
+#endif
+
 // Shorthands for different qualifiers
 #  define _CUDA_VSTD_NOVERSION ::cuda::std
 #  define _CUDA_VSTD           ::cuda::std::_LIBCUDACXX_ABI_NAMESPACE

cuda/cccl/headers/include/cuda/std/__iterator/iterator_traits.h

@@ -173,17 +173,17 @@ _CCCL_REQUIRES(_IsSame<_Iter, ::__gnu_debug::_Safe_iterator<_Ty*, _Range>>::valu
 _CCCL_API inline auto __iter_concept_fn(::__gnu_debug::_Safe_iterator<_Ty*, _Range>, __priority_tag<3>)
   -> contiguous_iterator_tag;
 #endif // _GLIBCXX_DEBUG
-#if defined(__GLIBCXX__)
+#if _CCCL_HOST_STD_LIB(LIBSTDCXX)
 _CCCL_TEMPLATE(class _Iter, class _Ty, class _Range)
 _CCCL_REQUIRES(_IsSame<_Iter, ::__gnu_cxx::__normal_iterator<_Ty*, _Range>>::value)
 _CCCL_API inline auto __iter_concept_fn(::__gnu_cxx::__normal_iterator<_Ty*, _Range>, __priority_tag<3>)
   -> contiguous_iterator_tag;
-#endif // __GLIBCXX__
-#if defined(_LIBCPP_VERSION)
+#endif // _CCCL_HOST_STD_LIB(LIBSTDCXX)
+#if _CCCL_HOST_STD_LIB(LIBCXX)
 _CCCL_TEMPLATE(class _Iter, class _Ty)
 _CCCL_REQUIRES(_IsSame<_Iter, ::std::__wrap_iter<_Ty*>>::value)
 _CCCL_API inline auto __iter_concept_fn(::std::__wrap_iter<_Ty*>, __priority_tag<3>) -> contiguous_iterator_tag;
-#elif defined(_MSVC_STL_VERSION) || defined(_IS_WRS)
+#elif _CCCL_HOST_STD_LIB(STL)
 _CCCL_TEMPLATE(class _Iter)
 _CCCL_REQUIRES(_IsSame<_Iter, class _Iter::_Array_iterator>::value)
 _CCCL_API inline auto __iter_concept_fn(_Iter, __priority_tag<3>) -> contiguous_iterator_tag;
@@ -208,7 +208,7 @@ _CCCL_API inline auto __iter_concept_fn(_Iter, __priority_tag<3>) -> contiguous_
 _CCCL_TEMPLATE(class _Iter)
 _CCCL_REQUIRES(_IsSame<_Iter, class _Iter::_Span_iterator>::value)
 _CCCL_API inline auto __iter_concept_fn(_Iter, __priority_tag<3>) -> contiguous_iterator_tag;
-#endif // _MSVC_STL_VERSION
+#endif // _CCCL_HOST_STD_LIB(STL)
 _CCCL_TEMPLATE(class _Iter, class _Ty)
 _CCCL_REQUIRES(_IsSame<_Iter, _Ty*>::value)
 _CCCL_API inline auto __iter_concept_fn(_Ty*, __priority_tag<3>) -> contiguous_iterator_tag;

cuda/cccl/headers/include/cuda/std/__mdspan/extents.h

@@ -281,6 +281,9 @@ public:
     return _StaticValues::__get(__i);
   }
 
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_MSVC(4702) // Unreachable code
+
   [[nodiscard]] _CCCL_API constexpr _TDynamic __value(size_t __i) const
   {
     if constexpr (__size_ > 0)
@@ -293,7 +296,10 @@ public:
            : static_cast<_TDynamic>(__static_val);
   }
 
-  [[nodiscard]] _CCCL_API constexpr _TDynamic operator[](size_t __i) const
+  _CCCL_DIAG_POP // MSVC(4702) Unreachable code
+
+    [[nodiscard]] _CCCL_API constexpr _TDynamic
+    operator[](size_t __i) const
   {
     if constexpr (__size_ > 0)
     {

cuda/cccl/headers/include/cuda/std/__mdspan/mdspan.h

@@ -63,6 +63,44 @@
 
 _CCCL_BEGIN_NAMESPACE_CUDA_STD
 
+template <class _Extents, class _LayoutPolicy, class _AccessorPolicy>
+struct __mdspan_constraints
+{
+  using extents_type     = _Extents;
+  using layout_type      = _LayoutPolicy;
+  using accessor_type    = _AccessorPolicy;
+  using mapping_type     = typename layout_type::template mapping<extents_type>;
+  using index_type       = typename extents_type::index_type;
+  using data_handle_type = typename accessor_type::data_handle_type;
+
+  static constexpr bool __can_default_construct =
+    (_Extents::rank_dynamic() > 0) && is_default_constructible_v<data_handle_type>
+    && is_default_constructible_v<mapping_type> && is_default_constructible_v<accessor_type>;
+
+  template <class... _OtherIndexTypes>
+  static constexpr bool __can_construct_from_handle_and_variadic =
+    (__mdspan_detail::__matches_dynamic_rank<extents_type, sizeof...(_OtherIndexTypes)>
+     || __mdspan_detail::__matches_static_rank<extents_type, sizeof...(_OtherIndexTypes)>)
+    && __mdspan_detail::__all_convertible_to_index_type<index_type, _OtherIndexTypes...>
+    && is_constructible_v<mapping_type, extents_type> && is_default_constructible_v<accessor_type>;
+
+  template <class _OtherIndexType>
+  static constexpr bool __is_constructible_from_index_type =
+    is_convertible_v<const _OtherIndexType&, index_type>
+    && is_nothrow_constructible_v<index_type, const _OtherIndexType&> && is_constructible_v<mapping_type, extents_type>
+    && is_default_constructible_v<accessor_type>;
+
+  template <class _OtherExtents, class _OtherLayoutPolicy, class _OtherAccessor>
+  static constexpr bool __is_convertible_from =
+    is_constructible_v<mapping_type, const typename _OtherLayoutPolicy::template mapping<_OtherExtents>&>
+    && is_constructible_v<accessor_type, const _OtherAccessor&>;
+
+  template <class _OtherExtents, class _OtherLayoutPolicy, class _OtherAccessor>
+  static constexpr bool __is_implicit_convertible_from =
+    is_convertible_v<const typename _OtherLayoutPolicy::template mapping<_OtherExtents>&, mapping_type>
+    && is_convertible_v<const _OtherAccessor&, accessor_type>;
+};
+
 template <class _ElementType, class _Extents, class _LayoutPolicy, class _AccessorPolicy>
 class mdspan
     : private __mdspan_ebco<typename _AccessorPolicy::data_handle_type,
@@ -83,6 +121,8 @@ private:
   template <class, class, class, class>
   friend class mdspan;
 
+  using __constraints = __mdspan_constraints<_Extents, _LayoutPolicy, _AccessorPolicy>;
+
 public:
   using extents_type     = _Extents;
   using layout_type      = _LayoutPolicy;
@@ -116,17 +156,11 @@ public:
     return mapping().extents().extent(__r);
   }
 
-public:
   //--------------------------------------------------------------------------------
   // [mdspan.mdspan.cons], mdspan constructors, assignment, and destructor
 
-  template <class _Extents2>
-  static constexpr bool __can_default_construct =
-    (_Extents2::rank_dynamic() > 0) && is_default_constructible_v<data_handle_type>
-    && is_default_constructible_v<mapping_type> && is_default_constructible_v<accessor_type>;
-
   _CCCL_TEMPLATE(class _Extents2 = _Extents)
-  _CCCL_REQUIRES(__can_default_construct<_Extents2>)
+  _CCCL_REQUIRES(__mdspan_constraints<_Extents2, _LayoutPolicy, _AccessorPolicy>::__can_default_construct)
   _CCCL_API constexpr mdspan() noexcept(
     is_nothrow_default_constructible_v<data_handle_type> && is_nothrow_default_constructible_v<mapping_type>
     && is_nothrow_default_constructible_v<accessor_type>)
@@ -136,49 +170,36 @@ public:
   _CCCL_HIDE_FROM_ABI constexpr mdspan(const mdspan&) = default;
   _CCCL_HIDE_FROM_ABI constexpr mdspan(mdspan&&)      = default;
 
-  template <class... _OtherIndexTypes>
-  static constexpr bool __can_construct_from_handle_and_variadic =
-    (__mdspan_detail::__matches_dynamic_rank<extents_type, sizeof...(_OtherIndexTypes)>
-     || __mdspan_detail::__matches_static_rank<extents_type, sizeof...(_OtherIndexTypes)>)
-    && __mdspan_detail::__all_convertible_to_index_type<index_type, _OtherIndexTypes...>
-    && is_constructible_v<mapping_type, extents_type> && is_default_constructible_v<accessor_type>;
-
   _CCCL_TEMPLATE(class... _OtherIndexTypes)
-  _CCCL_REQUIRES(__can_construct_from_handle_and_variadic<_OtherIndexTypes...>)
+  _CCCL_REQUIRES(__constraints::template __can_construct_from_handle_and_variadic<_OtherIndexTypes...>)
   _CCCL_API explicit constexpr mdspan(data_handle_type __p, _OtherIndexTypes... __exts)
       : __base(::cuda::std::move(__p), extents_type(static_cast<index_type>(::cuda::std::move(__exts))...))
   {}
 
-  template <class _OtherIndexType>
-  static constexpr bool __is_constructible_from_index_type =
-    is_convertible_v<const _OtherIndexType&, index_type>
-    && is_nothrow_constructible_v<index_type, const _OtherIndexType&> && is_constructible_v<mapping_type, extents_type>
-    && is_default_constructible_v<accessor_type>;
-
   _CCCL_TEMPLATE(class _OtherIndexType, size_t _Size)
   _CCCL_REQUIRES(__mdspan_detail::__matches_dynamic_rank<extents_type, _Size> _CCCL_AND
-                   __is_constructible_from_index_type<_OtherIndexType>)
+                   __constraints::template __is_constructible_from_index_type<_OtherIndexType>)
   _CCCL_API constexpr mdspan(data_handle_type __p, const array<_OtherIndexType, _Size>& __exts)
       : __base(::cuda::std::move(__p), extents_type{__exts})
   {}
 
   _CCCL_TEMPLATE(class _OtherIndexType, size_t _Size)
   _CCCL_REQUIRES(__mdspan_detail::__matches_static_rank<extents_type, _Size> _CCCL_AND
-                   __is_constructible_from_index_type<_OtherIndexType>)
+                   __constraints::template __is_constructible_from_index_type<_OtherIndexType>)
   _CCCL_API explicit constexpr mdspan(data_handle_type __p, const array<_OtherIndexType, _Size>& __exts)
       : __base(::cuda::std::move(__p), extents_type{__exts})
   {}
 
   _CCCL_TEMPLATE(class _OtherIndexType, size_t _Size)
   _CCCL_REQUIRES(__mdspan_detail::__matches_dynamic_rank<extents_type, _Size> _CCCL_AND
-                   __is_constructible_from_index_type<_OtherIndexType>)
+                   __constraints::template __is_constructible_from_index_type<_OtherIndexType>)
   _CCCL_API constexpr mdspan(data_handle_type __p, span<_OtherIndexType, _Size> __exts)
       : __base(::cuda::std::move(__p), extents_type{__exts})
   {}
 
   _CCCL_TEMPLATE(class _OtherIndexType, size_t _Size)
   _CCCL_REQUIRES(__mdspan_detail::__matches_static_rank<extents_type, _Size> _CCCL_AND
-                   __is_constructible_from_index_type<_OtherIndexType>)
+                   __constraints::template __is_constructible_from_index_type<_OtherIndexType>)
   _CCCL_API explicit constexpr mdspan(data_handle_type __p, span<_OtherIndexType, _Size> __exts)
       : __base(::cuda::std::move(__p), extents_type{__exts})
   {}
@@ -200,19 +221,11 @@ public:
       : __base(::cuda::std::move(__p), __m, __a)
   {}
 
-  template <class _OtherExtents, class _OtherLayoutPolicy, class _OtherAccessor>
-  static constexpr bool __is_convertible_from =
-    is_constructible_v<mapping_type, const typename _OtherLayoutPolicy::template mapping<_OtherExtents>&>
-    && is_constructible_v<accessor_type, const _OtherAccessor&>;
-
-  template <class _OtherExtents, class _OtherLayoutPolicy, class _OtherAccessor>
-  static constexpr bool __is_implicit_convertible_from =
-    is_convertible_v<const typename _OtherLayoutPolicy::template mapping<_OtherExtents>&, mapping_type>
-    && is_convertible_v<const _OtherAccessor&, accessor_type>;
-
   _CCCL_TEMPLATE(class _OtherElementType, class _OtherExtents, class _OtherLayoutPolicy, class _OtherAccessor)
-  _CCCL_REQUIRES(__is_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor> //
-                   _CCCL_AND __is_implicit_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor>)
+  _CCCL_REQUIRES(
+    __constraints::template __is_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor> //
+      _CCCL_AND
+        __constraints::template __is_implicit_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor>)
   _CCCL_API constexpr mdspan(const mdspan<_OtherElementType, _OtherExtents, _OtherLayoutPolicy, _OtherAccessor>& __other)
       : __base(__other.data_handle(), __other.mapping(), __other.accessor())
   {
@@ -241,8 +254,9 @@ public:
   }
 
   _CCCL_TEMPLATE(class _OtherElementType, class _OtherExtents, class _OtherLayoutPolicy, class _OtherAccessor)
-  _CCCL_REQUIRES(__is_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor> _CCCL_AND(
-    !__is_implicit_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor>))
+  _CCCL_REQUIRES(
+    __constraints::template __is_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor> _CCCL_AND(
+      !__constraints::template __is_implicit_convertible_from<_OtherExtents, _OtherLayoutPolicy, _OtherAccessor>))
   _CCCL_API explicit constexpr mdspan(
     const mdspan<_OtherElementType, _OtherExtents, _OtherLayoutPolicy, _OtherAccessor>& __other)
       : __base(__other.data_handle(), __other.mapping(), __other.accessor())

cuda/cccl/headers/include/cuda/std/__memory/allocator.h

@@ -34,9 +34,9 @@
 #include <cuda/std/__utility/forward.h>
 #include <cuda/std/cstddef>
 
-#if defined(_CCCL_HAS_CONSTEXPR_ALLOCATION) && !_CCCL_COMPILER(NVRTC)
-#  include <memory>
-#endif // _CCCL_HAS_CONSTEXPR_ALLOCATION && !_CCCL_COMPILER(NVRTC)
+#ifdef _CCCL_HAS_CONSTEXPR_ALLOCATION
+#  include <cuda/std/__cccl/memory_wrapper.h>
+#endif // _CCCL_HAS_CONSTEXPR_ALLOCATION
 
 #include <cuda/std/__cccl/prologue.h>
 

cuda/cccl/headers/include/cuda/std/__memory/construct_at.h

@@ -43,9 +43,7 @@
 #endif // _CCCL_CUDA_COMPILER(CLANG)
 
 #if _CCCL_STD_VER >= 2020 // need to backfill ::std::construct_at
-#  if !_CCCL_COMPILER(NVRTC)
-#    include <memory>
-#  endif // _CCCL_COMPILER(NVRTC)
+#  include <cuda/std/__cccl/memory_wrapper.h>
 
 #  ifndef __cpp_lib_constexpr_dynamic_alloc
 namespace std

cuda/cccl/headers/include/cuda/std/__optional/optional_base.h

@@ -32,6 +32,7 @@
 #include <cuda/std/__type_traits/is_nothrow_constructible.h>
 #include <cuda/std/__type_traits/is_nothrow_copy_assignable.h>
 #include <cuda/std/__type_traits/is_nothrow_copy_constructible.h>
+#include <cuda/std/__type_traits/is_nothrow_default_constructible.h>
 #include <cuda/std/__type_traits/is_nothrow_move_assignable.h>
 #include <cuda/std/__type_traits/is_nothrow_move_constructible.h>
 #include <cuda/std/__type_traits/is_object.h>