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/bench/common/ml_benchmark.hpp

@@ -18,10 +18,10 @@
 
 #include <benchmark/benchmark.h>
 #include <cuda_runtime.h>
-#include <raft/cudart_utils.h>
 #include <cuml/common/logger.hpp>
 #include <cuml/common/utils.hpp>
 #include <memory>
+#include <raft/cudart_utils.h>
 #include <raft/mr/device/allocator.hpp>
 #include <sstream>
 #include <string>

cpp/bench/prims/distance_common.cuh

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <raft/cudart_utils.h>
 #include <common/ml_benchmark.hpp>
+#include <raft/cudart_utils.h>
 #include <raft/distance/distance.hpp>
 
 namespace MLCommon {

cpp/bench/prims/fused_l2_nn.cu

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <raft/cudart_utils.h>
 #include <common/ml_benchmark.hpp>
 #include <limits>
+#include <raft/cudart_utils.h>
 #include <raft/distance/fused_l2_nn.hpp>
 #include <raft/handle.hpp>
 #include <raft/linalg/norm.cuh>

cpp/bench/prims/gram_matrix.cu

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <cuml/matrix/kernelparams.h>
-#include <raft/linalg/cublas_wrappers.h>
 #include <common/ml_benchmark.hpp>
+#include <cuml/matrix/kernelparams.h>
 #include <matrix/grammatrix.cuh>
 #include <matrix/kernelfactory.cuh>
 #include <memory>
+#include <raft/linalg/cublas_wrappers.h>
 #include <raft/random/rng.hpp>
 #include <sstream>
 #include <string>

cpp/bench/prims/permute.cu

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <raft/cudart_utils.h>
 #include <common/ml_benchmark.hpp>
+#include <raft/cudart_utils.h>
 #include <raft/mr/device/allocator.hpp>
 #include <raft/random/rng.hpp>
 #include <random/permute.cuh>

cpp/bench/prims/rng.cu

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <raft/cudart_utils.h>
 #include <common/ml_benchmark.hpp>
+#include <raft/cudart_utils.h>
 #include <raft/random/rng.hpp>
 
 namespace MLCommon {

cpp/bench/sg/arima_loglikelihood.cu

@@ -24,8 +24,8 @@
 #include <raft/random/rng.hpp>
 #include <rmm/device_uvector.hpp>
 
-#include <raft/cudart_utils.h>
 #include "benchmark.cuh"
+#include <raft/cudart_utils.h>
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/benchmark.cuh

@@ -16,15 +16,15 @@
 
 #pragma once
 
+#include "../common/ml_benchmark.hpp"
+#include "dataset.cuh"
+#include "dataset_ts.cuh"
 #include <benchmark/benchmark.h>
 #include <cuda_runtime.h>
-#include <raft/cudart_utils.h>
 #include <cuml/common/logger.hpp>
+#include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
 #include <raft/mr/device/allocator.hpp>
-#include "../common/ml_benchmark.hpp"
-#include "dataset.cuh"
-#include "dataset_ts.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/dataset.cuh

@@ -16,13 +16,13 @@
 
 #pragma once
 
-#include <raft/cudart_utils.h>
-#include <raft/linalg/transpose.h>
 #include <cuml/datasets/make_blobs.hpp>
 #include <fstream>
 #include <iostream>
 #include <raft/cuda_utils.cuh>
+#include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
+#include <raft/linalg/transpose.h>
 #include <raft/linalg/unary_op.cuh>
 #include <random/make_regression.cuh>
 #include <sstream>

cpp/bench/sg/dataset_ts.cuh

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <raft/cudart_utils.h>
 #include <raft/cuda_utils.cuh>
+#include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
 #include <raft/random/rng.hpp>
 

cpp/bench/sg/dbscan.cu

@@ -16,8 +16,8 @@
 
 #include <cuml/cluster/dbscan.hpp>
 
-#include <utility>
 #include "benchmark.cuh"
+#include <utility>
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/fil.cu

@@ -16,13 +16,13 @@
 
 #include <cuml/fil/fil.h>
 
+#include "benchmark.cuh"
+#include <cuml/common/logger.hpp>
+#include <cuml/ensemble/randomforest.hpp>
 #include <cuml/tree/algo_helper.h>
 #include <treelite/c_api.h>
 #include <treelite/tree.h>
-#include <cuml/common/logger.hpp>
-#include <cuml/ensemble/randomforest.hpp>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/kmeans.cu

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "benchmark.cuh"
 #include <cuml/cluster/kmeans.hpp>
 #include <cuml/common/logger.hpp>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/linkage.cu

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <raft/linalg/distance_type.h>
-#include <raft/sparse/hierarchy/common.h>
+#include "benchmark.cuh"
 #include <cuml/cluster/linkage.hpp>
 #include <cuml/common/logger.hpp>
+#include <raft/linalg/distance_type.h>
+#include <raft/sparse/hierarchy/common.h>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/rf_classifier.cu

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "benchmark.cuh"
 #include <cmath>
 #include <cuml/ensemble/randomforest.hpp>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/rf_regressor.cu

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "benchmark.cuh"
 #include <cmath>
 #include <cuml/ensemble/randomforest.hpp>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/svc.cu

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
+#include "benchmark.cuh"
+#include <cmath>
 #include <cuml/matrix/kernelparams.h>
+#include <cuml/svm/svc.hpp>
 #include <cuml/svm/svm_model.h>
 #include <cuml/svm/svm_parameter.h>
-#include <cmath>
-#include <cuml/svm/svc.hpp>
 #include <sstream>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/svr.cu

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
+#include "benchmark.cuh"
+#include <cmath>
 #include <cuml/matrix/kernelparams.h>
+#include <cuml/svm/svc.hpp>
 #include <cuml/svm/svm_model.h>
 #include <cuml/svm/svm_parameter.h>
-#include <cmath>
-#include <cuml/svm/svc.hpp>
 #include <cuml/svm/svr.hpp>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/bench/sg/umap.cu

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <cuml/manifold/umapparams.h>
+#include "benchmark.cuh"
 #include <cuml/manifold/umap.hpp>
+#include <cuml/manifold/umapparams.h>
 #include <raft/cuda_utils.cuh>
 #include <utility>
-#include "benchmark.cuh"
 
 namespace ML {
 namespace Bench {

cpp/examples/dbscan/dbscan_example.cpp

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cuda_runtime.h>
 #include <algorithm>
 #include <cmath>
+#include <cuda_runtime.h>
 #include <fstream>
 #include <iomanip>
 #include <iostream>

cpp/examples/symreg/symreg_example.cpp

@@ -23,10 +23,10 @@
 #include <sstream>
 #include <vector>
 
+#include <cuml/common/logger.hpp>
 #include <cuml/genetic/common.h>
 #include <cuml/genetic/genetic.h>
 #include <cuml/genetic/program.h>
-#include <cuml/common/logger.hpp>
 
 #include <raft/cudart_utils.h>
 #include <raft/mr/device/allocator.hpp>

cpp/include/cuml/cluster/dbscan.hpp

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <raft/linalg/distance_type.h>
 #include <cuml/common/log_levels.hpp>
+#include <raft/linalg/distance_type.h>
 
 namespace raft {
 class handle_t;

cpp/include/cuml/cluster/hdbscan.hpp

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <raft/linalg/distance_type.h>
 #include <raft/handle.hpp>
+#include <raft/linalg/distance_type.h>
 
 #include <rmm/device_uvector.hpp>
 

cpp/include/cuml/cluster/linkage.hpp

@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include <raft/handle.hpp>
 #include <raft/linalg/distance_type.h>
 #include <raft/sparse/hierarchy/common.h>
-#include <raft/handle.hpp>
 
 namespace raft {
 class handle_t;

cpp/include/cuml/common/logger.hpp

@@ -15,10 +15,10 @@
  */
 #pragma once
 
-#include <stdarg.h>
 #include <memory>
 #include <mutex>
 #include <sstream>
+#include <stdarg.h>
 #include <string>
 
 #include <cuml/common/log_levels.hpp>

cpp/include/cuml/common/utils.hpp

@@ -16,12 +16,12 @@
 
 #pragma once
 
+#include "logger.hpp"
+#include <cstdio>
 #include <cuda_runtime.h>
 #include <execinfo.h>
 #include <raft/cudart_utils.h>
-#include <cstdio>
 #include <raft/error.hpp>
 #include <sstream>
 #include <stdexcept>
 #include <string>
-#include "logger.hpp"

cpp/include/cuml/decomposition/pca_mg.hpp

@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include "pca.hpp"
 #include <opg/matrix/data.hpp>
 #include <opg/matrix/part_descriptor.hpp>
-#include "pca.hpp"
 namespace ML {
 
 enum class mg_solver { COV_EIG_DQ, COV_EIG_JACOBI, QR };

cpp/include/cuml/decomposition/tsvd_mg.hpp

@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include "tsvd.hpp"
 #include <opg/matrix/data.hpp>
 #include <opg/matrix/part_descriptor.hpp>
-#include "tsvd.hpp"
 
 namespace ML {
 namespace TSVD {

cpp/include/cuml/fil/fil.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <stddef.h>
 #include <cuml/ensemble/treelite_defs.hpp>
+#include <stddef.h>
 
 namespace raft {
 class handle_t;

cpp/include/cuml/fil/fnv_hash.h

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <limits.h>
 #include <cstdint>
+#include <limits.h>
 #include <numeric>
 
 // Implements https://tools.ietf.org/html/draft-eastlake-fnv-17.html