Revert "re-order includes (fixes #3132) (#3133)" (#3153)

This reverts commit 656d2676.

src/objective/binary_objective.hpp

@@ -5,15 +5,15 @@
 #ifndef LIGHTGBM_OBJECTIVE_BINARY_OBJECTIVE_HPP_
 #define LIGHTGBM_OBJECTIVE_BINARY_OBJECTIVE_HPP_
 
+#include <LightGBM/network.h>
+#include <LightGBM/objective_function.h>
+
 #include <string>
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <vector>
 
-#include <LightGBM/network.h>
-#include <LightGBM/objective_function.h>
-
 namespace LightGBM {
 /*!
 * \brief Objective function for binary classification

src/objective/multiclass_objective.hpp

@@ -5,6 +5,9 @@
 #ifndef LIGHTGBM_OBJECTIVE_MULTICLASS_OBJECTIVE_HPP_
 #define LIGHTGBM_OBJECTIVE_MULTICLASS_OBJECTIVE_HPP_
 
+#include <LightGBM/network.h>
+#include <LightGBM/objective_function.h>
+
 #include <string>
 #include <algorithm>
 #include <cmath>
@@ -12,9 +15,6 @@
 #include <memory>
 #include <vector>
 
-#include <LightGBM/network.h>
-#include <LightGBM/objective_function.h>
-
 #include "binary_objective.hpp"
 
 namespace LightGBM {

src/objective/rank_objective.hpp

@@ -6,6 +6,9 @@
 #ifndef LIGHTGBM_OBJECTIVE_RANK_OBJECTIVE_HPP_
 #define LIGHTGBM_OBJECTIVE_RANK_OBJECTIVE_HPP_
 
+#include <LightGBM/metric.h>
+#include <LightGBM/objective_function.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
@@ -14,9 +17,6 @@
 #include <string>
 #include <vector>
 
-#include <LightGBM/metric.h>
-#include <LightGBM/objective_function.h>
-
 namespace LightGBM {
 
 /*!

src/objective/regression_objective.hpp

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_OBJECTIVE_REGRESSION_OBJECTIVE_HPP_
 #define LIGHTGBM_OBJECTIVE_REGRESSION_OBJECTIVE_HPP_
 
-#include <string>
-#include <algorithm>
-#include <vector>
-
 #include <LightGBM/meta.h>
 #include <LightGBM/objective_function.h>
 #include <LightGBM/utils/array_args.h>
 
+#include <string>
+#include <algorithm>
+#include <vector>
+
 namespace LightGBM {
 
 #define PercentileFun(T, data_reader, cnt_data, alpha)                    \

src/objective/xentropy_objective.hpp

@@ -5,16 +5,16 @@
 #ifndef LIGHTGBM_OBJECTIVE_XENTROPY_OBJECTIVE_HPP_
 #define LIGHTGBM_OBJECTIVE_XENTROPY_OBJECTIVE_HPP_
 
+#include <LightGBM/meta.h>
+#include <LightGBM/objective_function.h>
+#include <LightGBM/utils/common.h>
+
 #include <string>
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <vector>
 
-#include <LightGBM/meta.h>
-#include <LightGBM/objective_function.h>
-#include <LightGBM/utils/common.h>
-
 /*
  * Implements gradients and hessians for the following point losses.
  * Target y is anything in interval [0, 1].

src/treelearner/col_sampler.hpp

@@ -6,15 +6,15 @@
 #ifndef LIGHTGBM_TREELEARNER_COL_SAMPLER_HPP_
 #define LIGHTGBM_TREELEARNER_COL_SAMPLER_HPP_
 
-#include <algorithm>
-#include <vector>
-
 #include <LightGBM/dataset.h>
 #include <LightGBM/meta.h>
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/openmp_wrapper.h>
 #include <LightGBM/utils/random.h>
 
+#include <algorithm>
+#include <vector>
+
 namespace LightGBM {
 class ColSampler {
  public:

src/treelearner/cost_effective_gradient_boosting.hpp

@@ -5,13 +5,13 @@
 #ifndef LIGHTGBM_TREELEARNER_COST_EFFECTIVE_GRADIENT_BOOSTING_HPP_
 #define LIGHTGBM_TREELEARNER_COST_EFFECTIVE_GRADIENT_BOOSTING_HPP_
 
-#include <vector>
-
 #include <LightGBM/config.h>
 #include <LightGBM/dataset.h>
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/log.h>
 
+#include <vector>
+
 #include "data_partition.hpp"
 #include "serial_tree_learner.h"
 #include "split_info.hpp"

src/treelearner/data_partition.hpp

@@ -5,15 +5,15 @@
 #ifndef LIGHTGBM_TREELEARNER_DATA_PARTITION_HPP_
 #define LIGHTGBM_TREELEARNER_DATA_PARTITION_HPP_
 
-#include <algorithm>
-#include <cstring>
-#include <vector>
-
 #include <LightGBM/dataset.h>
 #include <LightGBM/meta.h>
 #include <LightGBM/utils/openmp_wrapper.h>
 #include <LightGBM/utils/threading.h>
 
+#include <algorithm>
+#include <cstring>
+#include <vector>
+
 namespace LightGBM {
 /*!
 * \brief DataPartition is used to store the the partition of data on tree.

src/treelearner/feature_histogram.hpp

@@ -6,6 +6,10 @@
 #ifndef LIGHTGBM_TREELEARNER_FEATURE_HISTOGRAM_HPP_
 #define LIGHTGBM_TREELEARNER_FEATURE_HISTOGRAM_HPP_
 
+#include <LightGBM/bin.h>
+#include <LightGBM/dataset.h>
+#include <LightGBM/utils/array_args.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstring>
@@ -13,10 +17,6 @@
 #include <utility>
 #include <vector>
 
-#include <LightGBM/bin.h>
-#include <LightGBM/dataset.h>
-#include <LightGBM/utils/array_args.h>
-
 #include "monotone_constraints.hpp"
 #include "split_info.hpp"
 

src/treelearner/gpu_tree_learner.cpp

@@ -6,12 +6,12 @@
 
 #include "gpu_tree_learner.h"
 
-#include <algorithm>
-
 #include <LightGBM/bin.h>
 #include <LightGBM/network.h>
 #include <LightGBM/utils/array_args.h>
 
+#include <algorithm>
+
 #include "../io/dense_bin.hpp"
 
 #define GPU_DEBUG 0

src/treelearner/gpu_tree_learner.h

@@ -5,6 +5,12 @@
 #ifndef LIGHTGBM_TREELEARNER_GPU_TREE_LEARNER_H_
 #define LIGHTGBM_TREELEARNER_GPU_TREE_LEARNER_H_
 
+#include <LightGBM/dataset.h>
+#include <LightGBM/feature_group.h>
+#include <LightGBM/tree.h>
+#include <LightGBM/utils/array_args.h>
+#include <LightGBM/utils/random.h>
+
 #include <string>
 #include <cmath>
 #include <cstdio>
@@ -12,12 +18,6 @@
 #include <random>
 #include <vector>
 
-#include <LightGBM/dataset.h>
-#include <LightGBM/feature_group.h>
-#include <LightGBM/tree.h>
-#include <LightGBM/utils/array_args.h>
-#include <LightGBM/utils/random.h>
-
 #include "data_partition.hpp"
 #include "feature_histogram.hpp"
 #include "leaf_splits.hpp"

src/treelearner/leaf_splits.hpp

@@ -5,11 +5,11 @@
 #ifndef LIGHTGBM_TREELEARNER_LEAF_SPLITS_HPP_
 #define LIGHTGBM_TREELEARNER_LEAF_SPLITS_HPP_
 
+#include <LightGBM/meta.h>
+
 #include <limits>
 #include <vector>
 
-#include <LightGBM/meta.h>
-
 #include "data_partition.hpp"
 
 namespace LightGBM {

src/treelearner/parallel_tree_learner.h

@@ -5,13 +5,13 @@
 #ifndef LIGHTGBM_TREELEARNER_PARALLEL_TREE_LEARNER_H_
 #define LIGHTGBM_TREELEARNER_PARALLEL_TREE_LEARNER_H_
 
+#include <LightGBM/network.h>
+#include <LightGBM/utils/array_args.h>
+
 #include <cstring>
 #include <memory>
 #include <vector>
 
-#include <LightGBM/network.h>
-#include <LightGBM/utils/array_args.h>
-
 #include "gpu_tree_learner.h"
 #include "serial_tree_learner.h"
 

src/treelearner/serial_tree_learner.cpp

@@ -4,16 +4,16 @@
  */
 #include "serial_tree_learner.h"
 
-#include <algorithm>
-#include <queue>
-#include <unordered_map>
-#include <utility>
-
 #include <LightGBM/network.h>
 #include <LightGBM/objective_function.h>
 #include <LightGBM/utils/array_args.h>
 #include <LightGBM/utils/common.h>
 
+#include <algorithm>
+#include <queue>
+#include <unordered_map>
+#include <utility>
+
 #include "cost_effective_gradient_boosting.hpp"
 
 namespace LightGBM {

src/treelearner/serial_tree_learner.h

@@ -5,13 +5,6 @@
 #ifndef LIGHTGBM_TREELEARNER_SERIAL_TREE_LEARNER_H_
 #define LIGHTGBM_TREELEARNER_SERIAL_TREE_LEARNER_H_
 
-#include <string>
-#include <cmath>
-#include <cstdio>
-#include <memory>
-#include <random>
-#include <vector>
-
 #include <LightGBM/dataset.h>
 #include <LightGBM/tree.h>
 #include <LightGBM/tree_learner.h>
@@ -19,6 +12,13 @@
 #include <LightGBM/utils/json11.h>
 #include <LightGBM/utils/random.h>
 
+#include <string>
+#include <cmath>
+#include <cstdio>
+#include <memory>
+#include <random>
+#include <vector>
+
 #include "col_sampler.hpp"
 #include "data_partition.hpp"
 #include "feature_histogram.hpp"

src/treelearner/split_info.hpp

@@ -5,6 +5,8 @@
 #ifndef LIGHTGBM_TREELEARNER_SPLIT_INFO_HPP_
 #define LIGHTGBM_TREELEARNER_SPLIT_INFO_HPP_
 
+#include <LightGBM/meta.h>
+
 #include <limits>
 #include <cmath>
 #include <cstdint>
@@ -12,8 +14,6 @@
 #include <functional>
 #include <vector>
 
-#include <LightGBM/meta.h>
-
 namespace LightGBM {
 
 /*!

src/treelearner/voting_parallel_tree_learner.cpp

@@ -2,13 +2,12 @@
  * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License. See LICENSE file in the project root for license information.
  */
+#include <LightGBM/utils/common.h>
 
 #include <cstring>
 #include <tuple>
 #include <vector>
 
-#include <LightGBM/utils/common.h>
-
 #include "parallel_tree_learner.h"
 
 namespace LightGBM {