Remove IncludeCategories from .clang-format

cpp/.clang-format

@@ -72,15 +72,6 @@ ForEachMacros:
   - Q_FOREACH
   - BOOST_FOREACH
 IncludeBlocks: Preserve
-IncludeCategories:
-  - Regex:           '^<ext/.*\.h>'
-    Priority:        2
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^<.*'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseLabels: true
 IndentPPDirectives: None

cpp/benchmarks/transpose/transpose_benchmark.cu

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <thrust/transform.h>
 #include <benchmarks/fixture/benchmark_fixture.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 #include <cudf/transpose.hpp>
 #include <cudf/types.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <memory>
+#include <thrust/transform.h>
 
 using cudf::test::fixed_width_column_wrapper;
 

cpp/include/cudf/detail/reduction_operators.cuh

@@ -21,8 +21,8 @@
 #include <cudf/detail/utilities/transform_unary_functions.cuh>
 #include <cudf/types.hpp>  //for CUDA_HOST_DEVICE_CALLABLE
 
-#include <thrust/functional.h>
 #include <cmath>
+#include <thrust/functional.h>
 
 namespace cudf {
 namespace reduction {

cpp/include/cudf/strings/string.cuh

@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <thrust/logical.h>
 #include <cudf/strings/string_view.cuh>
+#include <thrust/logical.h>
 
 namespace cudf {
 namespace strings {

cpp/libcudf_kafka/include/cudf_kafka/kafka_consumer.hpp

@@ -15,10 +15,10 @@
  */
 #pragma once
 
-#include <librdkafka/rdkafkacpp.h>
 #include <algorithm>
 #include <chrono>
 #include <cudf/io/datasource.hpp>
+#include <librdkafka/rdkafkacpp.h>
 #include <map>
 #include <memory>
 #include <string>

cpp/libcudf_kafka/src/kafka_consumer.cpp

@@ -15,8 +15,8 @@
  */
 
 #include "cudf_kafka/kafka_consumer.hpp"
-#include <librdkafka/rdkafkacpp.h>
 #include <chrono>
+#include <librdkafka/rdkafkacpp.h>
 #include <memory>
 
 namespace cudf {

cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include "cudf_kafka/kafka_consumer.hpp"
 #include <gtest/gtest.h>
 #include <map>
 #include <memory>
 #include <string>
-#include "cudf_kafka/kafka_consumer.hpp"
 
 #include <cudf/io/csv.hpp>
 #include <cudf/io/datasource.hpp>

cpp/src/dictionary/set_keys.cu

@@ -31,9 +31,9 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <thrust/binary_search.h>
 #include <algorithm>
 #include <iterator>
+#include <thrust/binary_search.h>
 
 namespace cudf {
 namespace dictionary {

cpp/src/groupby/hash/groupby_kernels.cuh

@@ -16,11 +16,11 @@
 
 #pragma once
 
+#include "multi_pass_kernels.cuh"
 #include <cudf/detail/aggregation/aggregation.cuh>
 #include <cudf/detail/aggregation/aggregation.hpp>
 #include <cudf/groupby.hpp>
 #include <cudf/utilities/bit.hpp>
-#include "multi_pass_kernels.cuh"
 
 namespace cudf {
 namespace groupby {

cpp/src/groupby/hash/multi_pass_kernels.cuh

@@ -16,15 +16,17 @@
 
 #pragma once
 
-#include <cmath>
 #include <cudf/aggregation.hpp>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/detail/aggregation/aggregation.hpp>
 #include <cudf/detail/utilities/assert.cuh>
 #include <cudf/detail/utilities/device_atomics.cuh>
+#include <cudf/dictionary/dictionary_column_view.hpp>
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/utilities/type_dispatcher.hpp>
 
+#include <cmath>
+
 namespace cudf {
 namespace detail {
 

cpp/src/groupby/sort/group_nth_element.cu

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <thrust/iterator/discard_iterator.h>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/column/column_factories.hpp>
 #include <cudf/column/column_view.hpp>
@@ -24,6 +23,7 @@
 #include <cudf/detail/iterator.cuh>
 #include <cudf/types.hpp>
 #include <cudf/utilities/span.hpp>
+#include <thrust/iterator/discard_iterator.h>
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>

cpp/src/groupby/sort/group_quantiles.cu

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <quantiles/quantiles_util.hpp>
 #include "group_reductions.hpp"
+#include <quantiles/quantiles_util.hpp>
 
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/column/column_factories.hpp>

cpp/src/io/avro/avro.h

@@ -18,12 +18,12 @@
 
 #include "avro_common.h"
 
+#include <algorithm>
+#include <map>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <algorithm>
-#include <map>
 #include <string>
 #include <vector>
 

cpp/src/io/avro/avro_common.h

@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include <io/utilities/column_buffer.hpp>
 #include <stdint.h>
 #include <stdio.h>
-#include <io/utilities/column_buffer.hpp>
 
 namespace cudf {
 namespace io {

cpp/src/io/comp/cpu_unbz2.cpp

@@ -79,11 +79,11 @@ Jon L. Bentley
 For more information on these sources, see the manual.
 --*/
 
+#include "io_uncomp.h"
+#include "unbz2.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <vector>
-#include "io_uncomp.h"
-#include "unbz2.h"
 
 namespace cudf {
 namespace io {

cpp/src/io/functions.cpp

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <io/orc/orc.h>
 #include <algorithm>
 #include <cudf/detail/nvtx/ranges.hpp>
 #include <cudf/io/avro.hpp>
@@ -32,6 +31,7 @@
 #include <cudf/io/parquet.hpp>
 #include <cudf/table/table.hpp>
 #include <cudf/utilities/error.hpp>
+#include <io/orc/orc.h>
 
 namespace cudf {
 namespace io {

cpp/src/io/orc/orc.h

@@ -18,17 +18,17 @@
 
 #include "orc_common.h"
 
-#include <io/comp/io_uncomp.h>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/io/datasource.hpp>
 #include <cudf/io/orc_metadata.hpp>
 #include <cudf/utilities/error.hpp>
+#include <io/comp/io_uncomp.h>
 
-#include <stddef.h>
-#include <stdint.h>
 #include <algorithm>
 #include <memory>
 #include <optional>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 

cpp/src/io/orc/orc_field_reader.hpp

@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <string>
 #include "orc.h"
+#include <string>
 
 /**
  * @file orc_field_reader.hpp

cpp/src/io/orc/orc_field_writer.hpp

@@ -15,9 +15,9 @@
  */
 #pragma once
 
+#include "orc.h"
 #include <numeric>
 #include <string>
-#include "orc.h"
 
 /**
  * @file orc_field_writer.hpp

cpp/src/io/orc/orc_gpu.h

@@ -18,14 +18,14 @@
 
 #include "timezone.cuh"
 
-#include <io/comp/gpuinflate.h>
+#include "orc.h"
+#include "orc_common.h"
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/types.hpp>
 #include <cudf/utilities/span.hpp>
+#include <io/comp/gpuinflate.h>
 #include <io/statistics/statistics.cuh>
 #include <io/utilities/column_buffer.hpp>
-#include "orc.h"
-#include "orc_common.h"
 
 #include <rmm/cuda_stream_view.hpp>
 

cpp/src/io/orc/timezone.cuh

@@ -20,9 +20,9 @@
 #include <cudf/utilities/span.hpp>
 #include <io/utilities/time_utils.cuh>
 
+#include <rmm/device_uvector.hpp>
 #include <thrust/binary_search.h>
 #include <thrust/execution_policy.h>
-#include <rmm/device_uvector.hpp>
 
 #include <stdint.h>
 #include <string>

cpp/src/io/orc/writer_impl.hpp

@@ -29,9 +29,9 @@
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/utilities/error.hpp>
 
-#include <thrust/iterator/counting_iterator.h>
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/iterator/counting_iterator.h>
 
 #include <memory>
 #include <string>

cpp/src/io/parquet/compact_protocol_writer.hpp

@@ -19,9 +19,9 @@
 #include "parquet.hpp"
 #include "parquet_common.hpp"
 
+#include <algorithm>
 #include <stddef.h>
 #include <stdint.h>
-#include <algorithm>
 #include <string>
 #include <vector>
 

cpp/src/io/parquet/page_data.cu

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "parquet_gpu.hpp"
 #include <io/utilities/block_utils.cuh>
 #include <io/utilities/column_buffer.hpp>
-#include "parquet_gpu.hpp"
 
 #include <cudf/detail/utilities/assert.cuh>
 #include <cudf/utilities/bit.hpp>

cpp/src/io/parquet/page_enc.cu

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <io/utilities/block_utils.cuh>
 #include "parquet_gpu.hpp"
+#include <io/utilities/block_utils.cuh>
 
 #include <cudf/detail/iterator.cuh>
 #include <cudf/detail/utilities/cuda.cuh>
@@ -25,10 +25,10 @@
 
 #include <cub/cub.cuh>
 
-#include <thrust/gather.h>
-#include <thrust/iterator/discard_iterator.h>
 #include <cub/cub.cuh>
 #include <cuda/std/chrono>
+#include <thrust/gather.h>
+#include <thrust/iterator/discard_iterator.h>
 
 namespace cudf {
 namespace io {

cpp/src/io/parquet/page_hdr.cu

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <thrust/tuple.h>
-#include <io/utilities/block_utils.cuh>
 #include "parquet_gpu.hpp"
+#include <io/utilities/block_utils.cuh>
+#include <thrust/tuple.h>
 
 #include <rmm/cuda_stream_view.hpp>
 

cpp/src/io/parquet/parquet.hpp

@@ -18,9 +18,9 @@
 
 #include "parquet_common.hpp"
 
+#include <algorithm>
 #include <stddef.h>
 #include <stdint.h>
-#include <algorithm>
 #include <string>
 #include <tuple>
 #include <vector>

cpp/src/io/parquet/writer_impl.cu

@@ -19,12 +19,12 @@
  * @brief cuDF-IO parquet writer class implementation
  */
 
-#include <io/statistics/column_statistics.cuh>
 #include "writer_impl.hpp"
+#include <io/statistics/column_statistics.cuh>
 
+#include "compact_protocol_writer.hpp"
 #include <io/utilities/column_utils.cuh>
 #include <io/utilities/config_utils.hpp>
-#include "compact_protocol_writer.hpp"
 
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/detail/utilities/vector_factories.hpp>

cpp/src/io/utilities/data_sink.cpp

@@ -16,9 +16,9 @@
 
 #include <fstream>
 
+#include "file_io_utilities.hpp"
 #include <cudf/io/data_sink.hpp>
 #include <cudf/utilities/error.hpp>
-#include "file_io_utilities.hpp"
 
 #include <rmm/cuda_stream_view.hpp>
 

cpp/src/io/utilities/file_io_utilities.hpp

@@ -19,8 +19,8 @@
 #ifdef CUFILE_FOUND
 #include "thread_pool.hpp"
 
-#include <cufile.h>
 #include <cudf_test/file_utilities.hpp>
+#include <cufile.h>
 #endif
 
 #include <rmm/cuda_stream_view.hpp>