diff --git a/.clang-format b/.clang-format index 26b9a5bf4..35ebdbfae 100644 --- a/.clang-format +++ b/.clang-format @@ -71,8 +71,20 @@ ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH -IncludeBlocks: Preserve -IncludeIsMainRegex: '([-_](test|unittest))?$' +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^"' # quoted includes + Priority: 1 + - Regex: '^ #include -#include - #include - #include #include +#include + #include #include diff --git a/benchmarks/multi_stream_allocations/multi_stream_allocations_bench.cu b/benchmarks/multi_stream_allocations/multi_stream_allocations_bench.cu index 4943e507f..d38e89a3b 100644 --- a/benchmarks/multi_stream_allocations/multi_stream_allocations_bench.cu +++ b/benchmarks/multi_stream_allocations/multi_stream_allocations_bench.cu @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -31,6 +29,7 @@ #include #include +#include #include diff --git a/benchmarks/random_allocations/random_allocations.cpp b/benchmarks/random_allocations/random_allocations.cpp index 2856cd323..57116743b 100644 --- a/benchmarks/random_allocations/random_allocations.cpp +++ b/benchmarks/random_allocations/random_allocations.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -26,6 +24,7 @@ #include #include +#include #include #include diff --git a/benchmarks/replay/replay.cpp b/benchmarks/replay/replay.cpp index 253708ace..5afed036a 100644 --- a/benchmarks/replay/replay.cpp +++ b/benchmarks/replay/replay.cpp @@ -14,10 +14,6 @@ * limitations under the License. */ -#include -#include -#include - #include #include #include @@ -33,7 +29,9 @@ #include #include - +#include +#include +#include #include #include diff --git a/benchmarks/synchronization/synchronization.hpp b/benchmarks/synchronization/synchronization.hpp index 1f26beb37..596b3684b 100644 --- a/benchmarks/synchronization/synchronization.hpp +++ b/benchmarks/synchronization/synchronization.hpp @@ -61,9 +61,10 @@ #include // Google Benchmark library -#include #include +#include + class cuda_event_timer { public: /** diff --git a/benchmarks/utilities/log_parser.hpp b/benchmarks/utilities/log_parser.hpp index bc1aee47c..2283ace93 100644 --- a/benchmarks/utilities/log_parser.hpp +++ b/benchmarks/utilities/log_parser.hpp @@ -16,12 +16,12 @@ #pragma once -#include +#include "rapidcsv.h" + #include #include -#include "rapidcsv.h" - +#include #include #include #include diff --git a/include/rmm/cuda_stream.hpp b/include/rmm/cuda_stream.hpp index cb5654ac3..197095c39 100644 --- a/include/rmm/cuda_stream.hpp +++ b/include/rmm/cuda_stream.hpp @@ -16,13 +16,13 @@ #pragma once -#include #include #include #include #include +#include #include namespace rmm { diff --git a/include/rmm/cuda_stream_view.hpp b/include/rmm/cuda_stream_view.hpp index f8564b16b..a34897df6 100644 --- a/include/rmm/cuda_stream_view.hpp +++ b/include/rmm/cuda_stream_view.hpp @@ -18,9 +18,8 @@ #include -#include - #include +#include #include #include diff --git a/include/rmm/detail/logging_assert.hpp b/include/rmm/detail/logging_assert.hpp index 321bddab8..7eb667211 100644 --- a/include/rmm/detail/logging_assert.hpp +++ b/include/rmm/detail/logging_assert.hpp @@ -20,9 +20,10 @@ // logger can be extremely expensive to compile, so we want to avoid including // it. #if !defined(NDEBUG) -#include #include #include + +#include #endif /** diff --git a/include/rmm/device_buffer.hpp b/include/rmm/device_buffer.hpp index 167d07c4b..4663b5733 100644 --- a/include/rmm/device_buffer.hpp +++ b/include/rmm/device_buffer.hpp @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -28,8 +29,6 @@ #include #include -#include - namespace rmm { /** * @addtogroup data_containers diff --git a/include/rmm/device_uvector.hpp b/include/rmm/device_uvector.hpp index 0750ef796..ff6a7d837 100644 --- a/include/rmm/device_uvector.hpp +++ b/include/rmm/device_uvector.hpp @@ -23,11 +23,11 @@ #include #include +#include + #include #include -#include - namespace rmm { /** * @addtogroup data_containers diff --git a/include/rmm/device_vector.hpp b/include/rmm/device_vector.hpp index 7caf5845b..64fd8b993 100644 --- a/include/rmm/device_vector.hpp +++ b/include/rmm/device_vector.hpp @@ -16,9 +16,9 @@ #pragma once +#include #include -#include #include namespace rmm { diff --git a/include/rmm/exec_policy.hpp b/include/rmm/exec_policy.hpp index 5acd062e3..a343afb8b 100644 --- a/include/rmm/exec_policy.hpp +++ b/include/rmm/exec_policy.hpp @@ -22,10 +22,10 @@ #pragma once #include +#include #include #include -#include #include #include diff --git a/include/rmm/mr/device/cuda_async_memory_resource.hpp b/include/rmm/mr/device/cuda_async_memory_resource.hpp index 69e23624d..1bd761eb2 100644 --- a/include/rmm/mr/device/cuda_async_memory_resource.hpp +++ b/include/rmm/mr/device/cuda_async_memory_resource.hpp @@ -19,13 +19,12 @@ #include #include #include +#include #include #include -#include -#include - #include +#include #include #include diff --git a/include/rmm/mr/device/cuda_async_view_memory_resource.hpp b/include/rmm/mr/device/cuda_async_view_memory_resource.hpp index 6c24cccc3..c07730f70 100644 --- a/include/rmm/mr/device/cuda_async_view_memory_resource.hpp +++ b/include/rmm/mr/device/cuda_async_view_memory_resource.hpp @@ -19,12 +19,11 @@ #include #include #include -#include - #include -#include +#include #include +#include #include #include diff --git a/include/rmm/mr/device/cuda_memory_resource.hpp b/include/rmm/mr/device/cuda_memory_resource.hpp index 0652d6360..16100b06a 100644 --- a/include/rmm/mr/device/cuda_memory_resource.hpp +++ b/include/rmm/mr/device/cuda_memory_resource.hpp @@ -15,10 +15,9 @@ */ #pragma once -#include - #include #include +#include #include diff --git a/include/rmm/mr/device/fixed_size_memory_resource.hpp b/include/rmm/mr/device/fixed_size_memory_resource.hpp index 296ef103c..d34ad8d7e 100644 --- a/include/rmm/mr/device/fixed_size_memory_resource.hpp +++ b/include/rmm/mr/device/fixed_size_memory_resource.hpp @@ -19,15 +19,14 @@ #include #include #include +#include #include #include -#include +#include #include #include -#include - #include #include #include diff --git a/include/rmm/mr/device/managed_memory_resource.hpp b/include/rmm/mr/device/managed_memory_resource.hpp index 708adad8e..ea43315de 100644 --- a/include/rmm/mr/device/managed_memory_resource.hpp +++ b/include/rmm/mr/device/managed_memory_resource.hpp @@ -15,10 +15,9 @@ */ #pragma once -#include - #include #include +#include #include diff --git a/include/rmm/mr/device/pool_memory_resource.hpp b/include/rmm/mr/device/pool_memory_resource.hpp index 5f70e73d1..4f2d46a7c 100644 --- a/include/rmm/mr/device/pool_memory_resource.hpp +++ b/include/rmm/mr/device/pool_memory_resource.hpp @@ -19,20 +19,19 @@ #include #include #include +#include #include #include #include #include -#include +#include #include #include #include #include -#include - #include #include #include diff --git a/include/rmm/mr/device/thrust_allocator_adaptor.hpp b/include/rmm/mr/device/thrust_allocator_adaptor.hpp index ece495c37..f2b1a6027 100644 --- a/include/rmm/mr/device/thrust_allocator_adaptor.hpp +++ b/include/rmm/mr/device/thrust_allocator_adaptor.hpp @@ -16,16 +16,15 @@ #pragma once +#include #include #include -#include +#include #include #include #include -#include - namespace rmm::mr { /** * @addtogroup device_resource_adaptors diff --git a/include/rmm/mr/host/new_delete_resource.hpp b/include/rmm/mr/host/new_delete_resource.hpp index ccb294d21..a48f61447 100644 --- a/include/rmm/mr/host/new_delete_resource.hpp +++ b/include/rmm/mr/host/new_delete_resource.hpp @@ -15,10 +15,9 @@ */ #pragma once -#include - #include #include +#include #include #include diff --git a/include/rmm/mr/pinned_host_memory_resource.hpp b/include/rmm/mr/pinned_host_memory_resource.hpp index e92b2985e..ee409dbac 100644 --- a/include/rmm/mr/pinned_host_memory_resource.hpp +++ b/include/rmm/mr/pinned_host_memory_resource.hpp @@ -21,7 +21,6 @@ #include #include - #include #include diff --git a/include/rmm/thrust_rmm_allocator.h b/include/rmm/thrust_rmm_allocator.h index 0b78d5497..ad71e107a 100644 --- a/include/rmm/thrust_rmm_allocator.h +++ b/include/rmm/thrust_rmm_allocator.h @@ -17,10 +17,10 @@ #pragma once #include +#include #include #include -#include #include namespace rmm { diff --git a/python/rmm/_lib/_torch_allocator.cpp b/python/rmm/_lib/_torch_allocator.cpp index 5e5b2dcb4..dc92e4639 100644 --- a/python/rmm/_lib/_torch_allocator.cpp +++ b/python/rmm/_lib/_torch_allocator.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include - #include #include #include +#include + // These signatures must match those required by CUDAPluggableAllocator in // github.com/pytorch/pytorch/blob/main/torch/csrc/cuda/CUDAPluggableAllocator.h // Since the loading is done at runtime via dlopen, no error checking diff --git a/tests/cuda_stream_pool_tests.cpp b/tests/cuda_stream_pool_tests.cpp index de17f8c3c..ad1d421d7 100644 --- a/tests/cuda_stream_pool_tests.cpp +++ b/tests/cuda_stream_pool_tests.cpp @@ -18,10 +18,10 @@ #include #include -#include - #include +#include + struct CudaStreamPoolTest : public ::testing::Test { rmm::cuda_stream_pool pool{}; }; diff --git a/tests/cuda_stream_tests.cpp b/tests/cuda_stream_tests.cpp index 465e5d4c5..1cc068434 100644 --- a/tests/cuda_stream_tests.cpp +++ b/tests/cuda_stream_tests.cpp @@ -17,13 +17,14 @@ #include #include #include -#include #include #include #include +#include + struct CudaStreamTest : public ::testing::Test {}; TEST_F(CudaStreamTest, Equality) diff --git a/tests/device_scalar_tests.cpp b/tests/device_scalar_tests.cpp index 5a7825533..6f80a5de1 100644 --- a/tests/device_scalar_tests.cpp +++ b/tests/device_scalar_tests.cpp @@ -14,17 +14,16 @@ * limitations under the License. */ -#include - #include #include #include #include #include +#include #include -#include +#include #include #include diff --git a/tests/logger_tests.cpp b/tests/logger_tests.cpp index f6531bc59..5e3b2f899 100644 --- a/tests/logger_tests.cpp +++ b/tests/logger_tests.cpp @@ -15,11 +15,11 @@ */ #include "./byte_literals.hpp" -#include #include #include +#include #include #include diff --git a/tests/mr/device/arena_mr_tests.cpp b/tests/mr/device/arena_mr_tests.cpp index c8c60f7fb..1eb38888e 100644 --- a/tests/mr/device/arena_mr_tests.cpp +++ b/tests/mr/device/arena_mr_tests.cpp @@ -26,10 +26,9 @@ #include #include - -#include #include +#include #include #include diff --git a/tests/mr/device/callback_mr_tests.cpp b/tests/mr/device/callback_mr_tests.cpp index 95dac93ec..34a2cc8cc 100644 --- a/tests/mr/device/callback_mr_tests.cpp +++ b/tests/mr/device/callback_mr_tests.cpp @@ -16,19 +16,19 @@ #include "../../byte_literals.hpp" #include "../../mock_resource.hpp" + #include #include #include #include #include -#include - #include - #include #include +#include + namespace rmm::test { namespace { diff --git a/tests/mr/device/mr_ref_multithreaded_tests.cpp b/tests/mr/device/mr_ref_multithreaded_tests.cpp index 352a9fa16..d0d11ccbe 100644 --- a/tests/mr/device/mr_ref_multithreaded_tests.cpp +++ b/tests/mr/device/mr_ref_multithreaded_tests.cpp @@ -16,8 +16,6 @@ #include "mr_ref_test.hpp" -#include - #include #include #include @@ -27,6 +25,8 @@ #include +#include + #include #include diff --git a/tests/mr/device/mr_ref_test.hpp b/tests/mr/device/mr_ref_test.hpp index 0beea8656..a8a6226f1 100644 --- a/tests/mr/device/mr_ref_test.hpp +++ b/tests/mr/device/mr_ref_test.hpp @@ -36,10 +36,10 @@ #include #include -#include - #include +#include + #include #include #include diff --git a/tests/mr/device/polymorphic_allocator_tests.cpp b/tests/mr/device/polymorphic_allocator_tests.cpp index 4c8346730..3b73d4a49 100644 --- a/tests/mr/device/polymorphic_allocator_tests.cpp +++ b/tests/mr/device/polymorphic_allocator_tests.cpp @@ -14,15 +14,16 @@ * limitations under the License. */ -#include - -#include #include #include #include #include #include +#include + +#include + namespace { struct allocator_test : public ::testing::Test { diff --git a/tests/mr/device/thrust_allocator_tests.cu b/tests/mr/device/thrust_allocator_tests.cu index cabfe9661..ed66c220c 100644 --- a/tests/mr/device/thrust_allocator_tests.cu +++ b/tests/mr/device/thrust_allocator_tests.cu @@ -22,10 +22,10 @@ #include #include -#include - #include +#include + // explicit instantiation for test coverage purposes template class rmm::mr::thrust_allocator; diff --git a/tests/mr/device/tracking_mr_tests.cpp b/tests/mr/device/tracking_mr_tests.cpp index 2af720d3f..65d2f955c 100644 --- a/tests/mr/device/tracking_mr_tests.cpp +++ b/tests/mr/device/tracking_mr_tests.cpp @@ -23,7 +23,6 @@ #include #include - #include namespace rmm::test { diff --git a/tests/mr/host/mr_ref_tests.cpp b/tests/mr/host/mr_ref_tests.cpp index 416641f18..49b5bf061 100644 --- a/tests/mr/host/mr_ref_tests.cpp +++ b/tests/mr/host/mr_ref_tests.cpp @@ -21,9 +21,8 @@ #include #include -#include - #include +#include #include