Skip to content

Ensure include order of insert_nested_NVTX_range_guard via clang-format #4741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
Merged

Ensure include order of insert_nested_NVTX_range_guard via clang-format #4741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ IncludeCategories:
- Regex: '^<cuda/experimental/__execution/prologue.cuh>'
Priority: 0x7FFFFFFF
SortPriority: 0x7FFFFFFF
- Regex: '^"insert_nested_NVTX_range_guard.h"'
Priority: -1
SortPriority: -1
- Regex: '^<(cuda/std/detail/__config|cub/config.cuh|thrust/detail/config.h|thrust/system/cuda/config.h)'
Priority: 0
SortPriority: 0
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_adjacent_difference_substract_left.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_adjacent_difference.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_adjacent_difference_substract_right.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_adjacent_difference.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_bulk.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_for.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_decoupled_look_back.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#undef NDEBUG
#include <cub/device/device_scan.cuh>
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_for.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_for.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_for_api.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_for.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_for_copy.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_for.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_for_each_in_extents_api.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#if !_CCCL_COMPILER(MSVC)

# include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

# include <cub/device/device_for.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_for_utils.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_for.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_merge.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_merge.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_merge_api.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_merge.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_merge_no_unroll.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#define CCCL_AVOID_SORT_UNROLL

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_merge.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_merge_sort.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_merge_sort.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_merge_sort_iterators.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_merge_sort.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_merge_sort_vsmem.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_merge_sort.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_partition_flagged.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_partition.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_partition_if.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_partition.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_radix_sort_custom.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_radix_sort.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_radix_sort_keys.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_radix_sort.cuh>
#include <cub/util_type.cuh>
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_radix_sort_pairs.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_radix_sort.cuh>
#include <cub/util_type.cuh>
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_reduce.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
*
******************************************************************************/
#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_reduce_by_key.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_reduce_by_key_iterators.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_reduce_fp_inf.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_reduce_iterators.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_reduce_large_offsets.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_reduce.cuh>
#include <cub/thread/thread_operators.cuh>
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_run_length_encode.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_run_length_encode.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_run_length_encode_non_trivial_runs.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_run_length_encode.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_scan.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_scan.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_scan_by_key.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_scan.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_scan_by_key_iterators.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_scan.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_scan_by_key_large_offsets.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_scan.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_scan_iterators.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_scan.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_scan_large_offsets.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_scan.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_segmented_radix_sort_keys.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
*
******************************************************************************/
#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_radix_sort.cuh>
#include <cub/util_type.cuh>
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_segmented_radix_sort_pairs.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
*
******************************************************************************/
#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_radix_sort.cuh>
#include <cub/util_type.cuh>
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_segmented_reduce.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_segmented_reduce_api.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_segmented_reduce_iterators.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_segmented_reduce_iterators_64bit.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_reduce.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_segmented_reduce_large_offsets.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_reduce.cuh>
#include <cub/thread/thread_operators.cuh>
Expand Down
2 changes: 1 addition & 1 deletion cub/test/catch2_test_device_segmented_sort_keys.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_segmented_sort.cuh>
#include <cub/util_type.cuh>

Expand Down
2 changes: 0 additions & 2 deletions cub/test/catch2_test_device_segmented_sort_pairs.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
*
******************************************************************************/
#include "catch2_radix_sort_helper.cuh"
// above header needs to be included first

#include "catch2_segmented_sort_helper.cuh"
#include <c2h/catch2_test_helper.h>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_select_api.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_select.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_select_flagged.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_select.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_select_flagged_if.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_select.cuh>

Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_select_if.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_select.cuh>
#include <cub/device/dispatch/dispatch_select_if.cuh>
Expand Down
1 change: 0 additions & 1 deletion cub/test/catch2_test_device_select_if_vsmem.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
******************************************************************************/

#include "insert_nested_NVTX_range_guard.h"
// above header needs to be included first

#include <cub/device/device_select.cuh>

Expand Down
Loading
Loading