Merge branch 'ctk12_cdp_updates' into staging/ctk_12.0

Author: alliepiper

dependencies/cub

@@ -42,13 +42,29 @@
  * \endcode
  */
 
-#ifdef THRUST_RDC_ENABLED
+#if defined(CUB_DETAIL_CDPv1)
 
-// seq_impl unused.
+// Special case for NVCC -- need to inform the device path about the kernels
+// that are launched from the host path.
+#if defined(__CUDACC__) && defined(__CUDA_ARCH__)
+
+// seq_impl only used on platforms that do not support device synchronization.
 #define THRUST_CDP_DISPATCH(par_impl, seq_impl)                                \
-  NV_IF_TARGET(NV_ANY_TARGET, par_impl, par_impl)
+  if (false)                                                                   \
+  { /* Without this, the device pass won't compile any kernels. */             \
+    NV_IF_TARGET(NV_ANY_TARGET, par_impl);                                     \
+  }                                                                            \
+  NV_DISPATCH_TARGET(NV_PROVIDES_SM_90, seq_impl, NV_ANY_TARGET, par_impl)
 
-#else // THRUST_RDC_ENABLED
+#else // NVCC device pass
+
+// seq_impl only used on platforms that do not support device synchronization.
+#define THRUST_CDP_DISPATCH(par_impl, seq_impl)                                \
+  NV_DISPATCH_TARGET(NV_PROVIDES_SM_90, seq_impl, NV_ANY_TARGET, par_impl)
+
+#endif // NVCC device pass
+
+#else // CDPv1 unavailable. Always fallback to serial on device:
 
 // Special case for NVCC -- need to inform the device path about the kernels
 // that are launched from the host path.
@@ -62,11 +78,11 @@
   }                                                                            \
   NV_IF_TARGET(NV_IS_HOST, par_impl, seq_impl)
 
-#else // NVCC device pass
+#else // !(NVCC device pass):
 
 #define THRUST_CDP_DISPATCH(par_impl, seq_impl)                                \
   NV_IF_TARGET(NV_IS_HOST, par_impl, seq_impl)
 
 #endif // NVCC device pass
 
-#endif // THRUST_RDC_ENABLED
+#endif // CDP version