Drop CUB_RUNTIME_ENABLED and __THRUST_HAS_CUDART__ (#3305)

Author: bernhardmgruber

cub/cub/detail/detect_cuda_runtime.cuh

@@ -73,40 +73,15 @@
  */
 #  define CUB_RUNTIME_FUNCTION
 
-/**
- * \def CUB_RUNTIME_ENABLED
- *
- * Whether or not the active compiler pass is allowed to invoke device kernels
- * or methods from the CUDA runtime API.
- *
- * This macro should not be used in CUB, as it depends on `__CUDA_ARCH__`
- * and is not compatible with `NV_IF_TARGET`. It is provided for legacy
- * purposes only.
- *
- * Replace any usages with `CUB_RDC_ENABLED` and `NV_IF_TARGET`.
- */
-#  define CUB_RUNTIME_ENABLED
-
 #else // Non-doxygen pass:
 
 #  ifndef CUB_RUNTIME_FUNCTION
-
 #    if defined(__CUDACC_RDC__) && !defined(CUB_DISABLE_CDP)
-
 #      define CUB_RDC_ENABLED
 #      define CUB_RUNTIME_FUNCTION _CCCL_HOST_DEVICE
-
 #    else // RDC disabled:
-
 #      define CUB_RUNTIME_FUNCTION _CCCL_HOST
-
 #    endif // RDC enabled
-
-#    if !defined(__CUDA_ARCH__) || defined(__CUDACC_RDC__)
-// Legacy only -- do not use in new code.
-#      define CUB_RUNTIME_ENABLED
-#    endif
-
 #  endif // CUB_RUNTIME_FUNCTION predefined
 
 #  ifdef CUB_RDC_ENABLED

cub/test/cmake/check_source_files.cmake

@@ -83,24 +83,6 @@ if (NOT valid_count EQUAL 5)
     "Matched ${valid_count} times, expected 5.")
 endif()
 
-################################################################################
-# Legacy macro checks.
-# Check all files in CUB to make sure that they aren't using the legacy
-# CUB_RUNTIME_ENABLED and __THRUST_HAS_CUDART__ macros.
-#
-# These macros depend on __CUDA_ARCH__ and are not compatible with NV_IF_TARGET.
-# They are provided for legacy purposes and should be replaced with
-# [THRUST|CUB]_RDC_ENABLED and NV_IF_TARGET in Thrust/CUB code.
-#
-#
-set(legacy_macro_header_exclusions
-  # This header defines a legacy CUDART macro:
-  cub/detail/detect_cuda_runtime.cuh
-)
-
-set(cub_legacy_macro_regex "CUB_RUNTIME_ENABLED")
-set(thrust_legacy_macro_regex "__THRUST_HAS_CUDART__")
-
 ################################################################################
 # Read source files:
 foreach(src ${cub_srcs})
@@ -156,21 +138,6 @@ foreach(src ${cub_srcs})
       set(found_errors 1)
     endif()
   endif()
-
-  if (NOT ${src} IN_LIST legacy_macro_header_exclusions)
-    count_substrings("${src_contents}" "${thrust_legacy_macro_regex}" thrust_count)
-    count_substrings("${src_contents}" "${cub_legacy_macro_regex}" cub_count)
-
-    if (NOT thrust_count EQUAL 0)
-      message("'${src}' uses __THRUST_HAS_CUDART__. Replace with THRUST_RDC_ENABLED and NV_IF_TARGET.")
-      set(found_errors 1)
-    endif()
-
-    if (NOT cub_count EQUAL 0)
-      message("'${src}' uses CUB_RUNTIME_ENABLED. Replace with CUB_RDC_ENABLED and NV_IF_TARGET.")
-      set(found_errors 1)
-    endif()
-  endif()
 endforeach()
 
 if (NOT found_errors EQUAL 0)

thrust/testing/cmake/check_source_files.cmake

@@ -84,24 +84,6 @@ if (NOT valid_count EQUAL 5)
     "Matched ${valid_count} times, expected 5.")
 endif()
 
-################################################################################
-# Legacy macro checks.
-# Check all files in Thrust to make sure that they aren't using the legacy
-# CUB_RUNTIME_ENABLED and __THRUST_HAS_CUDART__ macros.
-#
-# These macros depend on __CUDA_ARCH__ and are not compatible with NV_IF_TARGET.
-# They are provided for legacy purposes and should be replaced with
-# [THRUST|CUB]_RDC_ENABLED and NV_IF_TARGET in Thrust/CUB code.
-#
-#
-set(legacy_macro_header_exclusions
-  # This header defines a legacy CUDART macro:
-  thrust/system/cuda/config.h
-)
-
-set(cub_legacy_macro_regex "CUB_RUNTIME_ENABLED")
-set(thrust_legacy_macro_regex "__THRUST_HAS_CUDART__")
-
 ################################################################################
 # Read source files:
 foreach(src ${thrust_srcs})
@@ -163,21 +145,6 @@ foreach(src ${thrust_srcs})
       set(found_errors 1)
     endif()
   endif()
-
-  if (NOT ${src} IN_LIST legacy_macro_header_exclusions)
-    count_substrings("${src_contents}" "${thrust_legacy_macro_regex}" thrust_count)
-    count_substrings("${src_contents}" "${cub_legacy_macro_regex}" cub_count)
-
-    if (NOT thrust_count EQUAL 0)
-      message("'${src}' uses __THRUST_HAS_CUDART__. Replace with THRUST_RDC_ENABLED and NV_IF_TARGET.")
-      set(found_errors 1)
-    endif()
-
-    if (NOT cub_count EQUAL 0)
-      message("'${src}' uses CUB_RUNTIME_ENABLED. Replace with CUB_RDC_ENABLED and NV_IF_TARGET.")
-      set(found_errors 1)
-    endif()
-  endif()
 endforeach()
 
 if (NOT found_errors EQUAL 0)

thrust/thrust/system/cuda/config.h

@@ -66,24 +66,6 @@
 #  define THRUST_RDC_ENABLED
 #endif
 
-/**
- * \def __THRUST_HAS_CUDART__
- *
- * Whether or not the active compiler pass is allowed to invoke device kernels
- * or methods from the CUDA runtime API.
- *
- * This macro should not be used in Thrust, as it depends on `__CUDA_ARCH__`
- * and is not compatible with `NV_IF_TARGET`. It is provided for legacy
- * purposes only.
- *
- * Replace any usages with `THRUST_RDC_ENABLED` and `NV_IF_TARGET`.
- */
-#ifdef CUB_RUNTIME_ENABLED
-#  define __THRUST_HAS_CUDART__ 1
-#else
-#  define __THRUST_HAS_CUDART__ 0
-#endif
-
 #ifdef THRUST_AGENT_ENTRY_NOINLINE
 #  define THRUST_AGENT_ENTRY_INLINE_ATTR __noinline__
 #else