Skip to content
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

Separate cuda/experimental when sorting includes #2094

Merged
merged 2 commits into from
Jul 29, 2024
+20 −10
Merged

Separate cuda/experimental when sorting includes #2094

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e363f27
Separate cuda/experimental when sorting includes
bernhardmgruber Jul 29, 2024
51b044f
Run clang-format
bernhardmgruber Jul 29, 2024
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
7 changes: 5 additions & 2 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions cudax/include/cuda/experimental/__event/event.cuh
View file
Original file line number Diff line number Diff line change
@@ -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;
5 changes: 3 additions & 2 deletions cudax/include/cuda/experimental/__event/timed_event.cuh
View file
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 2 additions & 1 deletion cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh
View file
Original file line number Diff line number Diff line change
@@ -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
{
3 changes: 2 additions & 1 deletion cudax/include/cuda/experimental/__launch/configuration.cuh
View file
Original file line number Diff line number Diff line change
@@ -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
{
3 changes: 2 additions & 1 deletion cudax/include/cuda/experimental/__launch/launch.cuh
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,11 @@
#define _CUDAX__LAUNCH_LAUNCH
#include <cuda_runtime.h>

#include <cuda/experimental/__launch/configuration.cuh>
#include <cuda/std/__exception/cuda_error.h>
#include <cuda/stream_ref>

#include <cuda/experimental/__launch/configuration.cuh>

#if _CCCL_STD_VER >= 2017
namespace cuda::experimental
{
1 change: 1 addition & 0 deletions cudax/test/launch/launch_smoke.cu
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
//===----------------------------------------------------------------------===//
#define LIBCUDACXX_ENABLE_EXCEPTIONS
#include <cuda/atomic>

#include <cuda/experimental/launch.cuh>

#include "../hierarchy/testing_common.cuh"