Fix missing deallocate in cub

Author: pciolkosz

cub/cub/detail/device_memory_resource.cuh

@@ -68,6 +68,11 @@ struct device_memory_resource
     return ptr;
   }
 
+  CUB_RUNTIME_FUNCTION void deallocate(::cuda::stream_ref stream, void* ptr, size_t bytes, size_t /* alignment */)
+  {
+    deallocate(stream, ptr, bytes);
+  }
+
   CUB_RUNTIME_FUNCTION void deallocate(::cuda::stream_ref stream, void* ptr, size_t /* bytes */)
   {
     NV_IF_TARGET( //

cub/cub/detail/temporary_storage.cuh

@@ -367,9 +367,9 @@ deallocate(::cuda::stream_ref stream, void* d_temp_storage, size_t temp_storage_
   NV_IF_ELSE_TARGET(
     NV_IS_HOST,
     (
-      try { mr.deallocate(stream, d_temp_storage, temp_storage_bytes, alignof(::cuda::std::max_align_t)); } catch (...) {
-        return cudaErrorMemoryAllocation;
-      }),
+      try {
+        mr.deallocate(stream, d_temp_storage, temp_storage_bytes, alignof(::cuda::std::max_align_t));
+      } catch (...) { return cudaErrorMemoryAllocation; }),
     (mr.deallocate(stream, d_temp_storage, temp_storage_bytes, alignof(::cuda::std::max_align_t));));
   return cudaSuccess;
 }

libcudacxx/include/cuda/__memory_resource/any_resource.h

@@ -133,8 +133,8 @@ struct __ibasic_resource : __basic_interface<__ibasic_resource>
   }
 
   CCCL_DEPRECATED_BECAUSE("Specify an explicit alignment argument. The default alignment will be removed in a future "
-                           "release.")
-  _CCCL_PUBLIC_HOST_API void* allocate_sync(size_t __bytes)
+                          "release.") _CCCL_PUBLIC_HOST_API void*
+  allocate_sync(size_t __bytes)
   {
     return allocate_sync(__bytes, alignof(::cuda::std::max_align_t));
   }
@@ -145,8 +145,8 @@ struct __ibasic_resource : __basic_interface<__ibasic_resource>
   }
 
   CCCL_DEPRECATED_BECAUSE("Specify an explicit alignment argument. The default alignment will be removed in a future "
-                           "release.")
-  _CCCL_PUBLIC_HOST_API void deallocate_sync(void* __pv, size_t __bytes) noexcept
+                          "release.") _CCCL_PUBLIC_HOST_API void
+  deallocate_sync(void* __pv, size_t __bytes) noexcept
   {
     return deallocate_sync(__pv, __bytes, alignof(::cuda::std::max_align_t));
   }
@@ -164,8 +164,8 @@ struct __ibasic_async_resource : __basic_interface<__ibasic_async_resource>
   }
 
   CCCL_DEPRECATED_BECAUSE("Specify an explicit alignment argument. The default alignment will be removed in a future "
-                           "release.")
-  _CCCL_PUBLIC_HOST_API void* allocate(::cuda::stream_ref __stream, size_t __bytes)
+                          "release.") _CCCL_PUBLIC_HOST_API void*
+  allocate(::cuda::stream_ref __stream, size_t __bytes)
   {
     return ::cuda::__virtcall<&__allocate_async<__ibasic_async_resource>>(
       this, __stream, __bytes, alignof(::cuda::std::max_align_t));
@@ -178,8 +178,8 @@ struct __ibasic_async_resource : __basic_interface<__ibasic_async_resource>
   }
 
   CCCL_DEPRECATED_BECAUSE("Specify an explicit alignment argument. The default alignment will be removed in a future "
-                           "release.")
-  _CCCL_PUBLIC_HOST_API void deallocate(::cuda::stream_ref __stream, void* __pv, size_t __bytes) noexcept
+                          "release.") _CCCL_PUBLIC_HOST_API void
+  deallocate(::cuda::stream_ref __stream, void* __pv, size_t __bytes) noexcept
   {
     return ::cuda::__virtcall<&__deallocate_async<__ibasic_async_resource>>(
       this, __stream, __pv, __bytes, alignof(::cuda::std::max_align_t));