Separate cuda/experimental when sorting includes (NVIDIA#2094)

pciolkosz · Aug 4, 2024 · 4ecffd0 · 4ecffd0
1 parent a0346b9
commit 4ecffd0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/.clang-format b/.clang-format
@@ -117,12 +117,15 @@ IncludeCategories:
   - Regex:           '^<thrust/'
     Priority:            3
     SortPriority:        2
+  - Regex:           '^<cuda/experimental'
+    Priority:            5
+    SortPriority:        4
   - Regex:           '^<cuda/'
     Priority:            4
     SortPriority:        3
   - Regex:           '^<[a-z_]*>$'
-    Priority:            5
-    SortPriority:        4
+    Priority:            6
+    SortPriority:        5
   - Regex:           '^<cuda'
     Priority:            0
     SortPriority:        0

diff --git a/cudax/include/cuda/experimental/__event/event.cuh b/cudax/include/cuda/experimental/__event/event.cuh
@@ -24,12 +24,13 @@
 #  pragma system_header
 #endif // no system header
 
-#include <cuda/experimental/__detail/utility.cuh>
-#include <cuda/experimental/__event/event_ref.cuh>
 #include <cuda/std/__cuda/api_wrapper.h>
 #include <cuda/std/cstddef>
 #include <cuda/std/utility>
 
+#include <cuda/experimental/__detail/utility.cuh>
+#include <cuda/experimental/__event/event_ref.cuh>
+
 namespace cuda::experimental
 {
 class timed_event;

diff --git a/cudax/include/cuda/experimental/__event/timed_event.cuh b/cudax/include/cuda/experimental/__event/timed_event.cuh
@@ -24,12 +24,13 @@
 #  pragma system_header
 #endif // no system header
 
-#include <cuda/experimental/__detail/utility.cuh>
-#include <cuda/experimental/__event/event.cuh>
 #include <cuda/std/__cuda/api_wrapper.h>
 #include <cuda/std/chrono>
 #include <cuda/std/cstddef>
 
+#include <cuda/experimental/__detail/utility.cuh>
+#include <cuda/experimental/__event/event.cuh>
+
 namespace cuda::experimental
 {
 //! @brief An owning wrapper for a `cudaEvent_t` with timing enabled.

diff --git a/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh b/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh
@@ -11,10 +11,11 @@
 #ifndef _CUDAX__HIERARCHY_HIERARCHY_DIMENSIONS
 #define _CUDAX__HIERARCHY_HIERARCHY_DIMENSIONS
 
-#include <cuda/experimental/__hierarchy/level_dimensions.cuh>
 #include <cuda/std/__utility/declval.h>
 #include <cuda/std/tuple>
 
+#include <cuda/experimental/__hierarchy/level_dimensions.cuh>
+
 #include <nv/target>
 
 #if _CCCL_STD_VER >= 2017

diff --git a/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh b/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh
@@ -11,9 +11,10 @@
 #ifndef _CUDAX__HIERARCHY_LEVEL_DIMENSIONS
 #define _CUDAX__HIERARCHY_LEVEL_DIMENSIONS
 
-#include <cuda/experimental/__hierarchy/hierarchy_levels.cuh>
 #include <cuda/std/type_traits>
 
+#include <cuda/experimental/__hierarchy/hierarchy_levels.cuh>
+
 #if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {

diff --git a/cudax/include/cuda/experimental/__launch/configuration.cuh b/cudax/include/cuda/experimental/__launch/configuration.cuh
@@ -11,10 +11,11 @@
 #ifndef _CUDAX__LAUNCH_CONFIGURATION
 #define _CUDAX__LAUNCH_CONFIGURATION
 
-#include <cuda/experimental/hierarchy.cuh>
 #include <cuda/std/span>
 #include <cuda/std/tuple>
 
+#include <cuda/experimental/hierarchy.cuh>
+
 #if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {

diff --git a/cudax/include/cuda/experimental/__launch/launch.cuh b/cudax/include/cuda/experimental/__launch/launch.cuh
@@ -12,11 +12,12 @@
 #define _CUDAX__LAUNCH_LAUNCH
 #include <cuda_runtime.h>
 
+#include <cuda/std/__exception/cuda_error.h>
+#include <cuda/stream_ref>
+
 #include <cuda/experimental/__launch/configuration.cuh>
 #include <cuda/experimental/__launch/hierarchy_draft.cuh>
 #include <cuda/experimental/__launch/kernel_launchers.cuh>
-#include <cuda/std/__exception/cuda_error.h>
-#include <cuda/stream_ref>
 
 #if _CCCL_STD_VER >= 2017
 namespace cuda::experimental

diff --git a/cudax/test/launch/launch_smoke.cu b/cudax/test/launch/launch_smoke.cu
@@ -9,6 +9,7 @@
 //===----------------------------------------------------------------------===//
 #define LIBCUDACXX_ENABLE_EXCEPTIONS
 #include <cuda/atomic>
+
 #include <cuda/experimental/launch.cuh>
 
 #include "../hierarchy/testing_common.cuh"