Cleanups + fix macro check failures

Author: PointKernel

cmake/header_testing.cmake

@@ -20,22 +20,18 @@
 # .inl files are not globbed for, because they are not supposed to be used as public
 # entrypoints.
 
-# Meta target for all header builds:
 add_custom_target(cuco.all.headers)
 
 function(cuco_add_header_test label definitions)
   set(config_prefix "cuco")
 
-  # GLOB ALL THE THINGS - similar to Thrust's approach, including detail headers
-  # Use GLOB_RECURSE to find all headers recursively
   file(GLOB_RECURSE headers
     RELATIVE "${CUCO_SOURCE_DIR}/include"
     CONFIGURE_DEPENDS
     "${CUCO_SOURCE_DIR}/include/cuco/*.cuh"
     "${CUCO_SOURCE_DIR}/include/cuco/*.hpp"
   )
 
-  # Debug: Print found headers
   list(LENGTH headers headers_count)
   message(STATUS "Found ${headers_count} headers for testing: ${headers}")
 
@@ -50,10 +46,9 @@ function(cuco_add_header_test label definitions)
     list(REMOVE_ITEM headers ${excluded_headers})
   endif()
 
-  # Only test with CUDA compiler since cuco is device-only
   set(headertest_target ${config_prefix}.headers.${label})
 
-  # Generate header test sources (simple approach since CCCL utilities aren't available)
+  # Generate header test sources
   set(header_srcs)
   foreach (header IN LISTS headers)
     set(header_src "${CMAKE_CURRENT_BINARY_DIR}/headers/${headertest_target}/${header}.cu")
@@ -79,9 +74,7 @@ function(cuco_add_header_test label definitions)
     $<$<COMPILE_LANGUAGE:CUDA>:--expt-extended-lambda>
   )
 
-  # Disable macro checks for now since cuco has known issues with 'I' identifier
-  # This should be removed once the macro collision issues are fixed
-  target_compile_definitions(${headertest_target} PRIVATE CUCO_IGNORE_HEADER_MACRO_CHECKS)
+  # Macro collision checks are enabled to ensure cuco headers don't conflict with system headers
 
   add_dependencies(cuco.all.headers ${headertest_target})
 endfunction()

include/cuco/detail/pair/tuple_helpers.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ struct tuple_size<volatile cuco::pair<T1, T2>> : tuple_size<cuco::pair<T1, T2>>
 template <typename T1, typename T2>
 struct tuple_size<const volatile cuco::pair<T1, T2>> : tuple_size<cuco::pair<T1, T2>> {};
 
-template <std::size_t I, typename T1, typename T2>
-struct tuple_element<I, cuco::pair<T1, T2>> {
+template <std::size_t Index, typename T1, typename T2>
+struct tuple_element<Index, cuco::pair<T1, T2>> {
   using type = void;
 };
 
@@ -61,48 +61,48 @@ template <typename T1, typename T2>
 struct tuple_element<1, const volatile cuco::pair<T1, T2>> : tuple_element<1, cuco::pair<T1, T2>> {
 };
 
-template <std::size_t I, typename T1, typename T2>
+template <std::size_t Index, typename T1, typename T2>
 __host__ __device__ constexpr auto get(cuco::pair<T1, T2>& p) ->
-  typename tuple_element<I, cuco::pair<T1, T2>>::type&
+  typename tuple_element<Index, cuco::pair<T1, T2>>::type&
 {
-  static_assert(I < 2);
-  if constexpr (I == 0) {
+  static_assert(Index < 2);
+  if constexpr (Index == 0) {
     return p.first;
   } else {
     return p.second;
   }
 }
 
-template <std::size_t I, typename T1, typename T2>
+template <std::size_t Index, typename T1, typename T2>
 __host__ __device__ constexpr auto get(cuco::pair<T1, T2>&& p) ->
-  typename tuple_element<I, cuco::pair<T1, T2>>::type&&
+  typename tuple_element<Index, cuco::pair<T1, T2>>::type&&
 {
-  static_assert(I < 2);
-  if constexpr (I == 0) {
+  static_assert(Index < 2);
+  if constexpr (Index == 0) {
     return cuda::std::move(p.first);
   } else {
     return cuda::std::move(p.second);
   }
 }
 
-template <std::size_t I, typename T1, typename T2>
+template <std::size_t Index, typename T1, typename T2>
 __host__ __device__ constexpr auto get(cuco::pair<T1, T2> const& p) ->
-  typename tuple_element<I, cuco::pair<T1, T2>>::type const&
+  typename tuple_element<Index, cuco::pair<T1, T2>>::type const&
 {
-  static_assert(I < 2);
-  if constexpr (I == 0) {
+  static_assert(Index < 2);
+  if constexpr (Index == 0) {
     return p.first;
   } else {
     return p.second;
   }
 }
 
-template <std::size_t I, typename T1, typename T2>
+template <std::size_t Index, typename T1, typename T2>
 __host__ __device__ constexpr auto get(cuco::pair<T1, T2> const&& p) ->
-  typename tuple_element<I, cuco::pair<T1, T2>>::type const&&
+  typename tuple_element<Index, cuco::pair<T1, T2>>::type const&&
 {
-  static_assert(I < 2);
-  if constexpr (I == 0) {
+  static_assert(Index < 2);
+  if constexpr (Index == 0) {
     return cuda::std::move(p.first);
   } else {
     return cuda::std::move(p.second);