Address review notes

NVIDIA · Nov 28, 2023 · d6ba9a2 · d6ba9a2
1 parent c5737a7
commit d6ba9a2
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/cub/cub/util_macro.cuh b/cub/cub/util_macro.cuh
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include <cub/version.cuh>
+#include <cuda/__cccl_config>
 
 #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
 #  pragma GCC system_header
@@ -134,12 +134,13 @@ constexpr __host__ __device__ auto max CUB_PREVENT_MACRO_SUBSTITUTION(T &&t,
 #if !defined(CUB_DISABLE_KERNEL_VISIBILITY_WARNING_SUPPRESSION)
 _CCCL_DIAG_SUPPRESS_GCC("-Wattributes")
 _CCCL_DIAG_SUPPRESS_CLANG("-Wattributes")
-#if !defined(_CCCL_CUDA_COMPILER_NVHPC)
+#  if !defined(_CCCL_CUDA_COMPILER_NVHPC)
 _CCCL_DIAG_SUPPRESS_NVHPC(attribute_requires_external_linkage)
-#endif // !_CCCL_CUDA_COMPILER_NVHPC
-#if defined(__ICC)
-#pragma warning(disable: 1890)
-#endif
+#  endif // !_CCCL_CUDA_COMPILER_NVHPC
+#  if defined(_CCCL_COMPILER_ICC) || defined(_CCCL_COMPILER_ICC_LLVM)
+#    pragma warning(disable : 1890) // the "__visibility__" attribute can only appear on functions and
+                                    // variables with external linkage'
+#  endif
 #endif // !CUB_DISABLE_KERNEL_VISIBILITY_WARNING_SUPPRESSION
 
 /** @} */       // end group UtilModule