Revert "Reorder includes. (#5749)" (#5771)

This reverts commit d3a0efbf16.

src/tree/constraints.cu

@@ -1,15 +1,15 @@
 /*!
  * Copyright 2019 XGBoost contributors
  */
-#include <algorithm>
-#include <string>
-#include <set>
-
 #include <thrust/copy.h>
 #include <thrust/device_vector.h>
 #include <thrust/execution_policy.h>
 #include <thrust/iterator/counting_iterator.h>
 
+#include <algorithm>
+#include <string>
+#include <set>
+
 #include "xgboost/logging.h"
 #include "xgboost/span.h"
 #include "constraints.cuh"

src/tree/gpu_hist/gradient_based_sampler.cu

@@ -1,16 +1,15 @@
 /*!
  * Copyright 2019 by XGBoost Contributors
  */
-#include <algorithm>
-#include <limits>
-
 #include <thrust/functional.h>
 #include <thrust/random.h>
 #include <thrust/transform.h>
-
 #include <xgboost/host_device_vector.h>
 #include <xgboost/logging.h>
 
+#include <algorithm>
+#include <limits>
+
 #include "../../common/compressed_iterator.h"
 #include "../../common/random.h"
 #include "gradient_based_sampler.cuh"

src/tree/gpu_hist/histogram.cu

@@ -1,13 +1,12 @@
 /*!
  * Copyright 2020 by XGBoost Contributors
  */
+#include <thrust/reduce.h>
+#include <thrust/iterator/transform_iterator.h>
 #include <algorithm>
 #include <ctgmath>
 #include <limits>
 
-#include <thrust/reduce.h>
-#include <thrust/iterator/transform_iterator.h>
-
 #include "xgboost/base.h"
 #include "row_partitioner.cuh"
 

src/tree/gpu_hist/row_partitioner.cu

@@ -1,12 +1,10 @@
 /*!
  * Copyright 2017-2019 XGBoost contributors
  */
-#include <vector>
-
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/transform_output_iterator.h>
 #include <thrust/sequence.h>
-
+#include <vector>
 #include "../../common/device_helpers.cuh"
 #include "row_partitioner.cuh"
 

src/tree/split_evaluator.cc

@@ -3,6 +3,9 @@
  * \file split_evaluator.cc
  * \brief Contains implementations of different split evaluators.
  */
+#include <dmlc/json.h>
+#include <dmlc/registry.h>
+
 #include <algorithm>
 #include <unordered_set>
 #include <vector>
@@ -12,9 +15,6 @@
 #include <sstream>
 #include <utility>
 
-#include <dmlc/json.h>
-#include <dmlc/registry.h>
-
 #include "xgboost/logging.h"
 #include "xgboost/parameter.h"
 

src/tree/split_evaluator.h

@@ -7,15 +7,15 @@
 
 #ifndef XGBOOST_TREE_SPLIT_EVALUATOR_H_
 #define XGBOOST_TREE_SPLIT_EVALUATOR_H_
+
+#include <dmlc/registry.h>
+#include <xgboost/base.h>
 #include <functional>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <dmlc/registry.h>
-#include <xgboost/base.h>
-
 #include "param.h"
 
 #define ROOT_PARENT_ID (-1 & ((1U << 31) - 1))

src/tree/tree_model.cc

@@ -3,12 +3,6 @@
  * \file tree_model.cc
  * \brief model structure for tree
  */
-#include <sstream>
-#include <limits>
-#include <cmath>
-#include <iomanip>
-#include <stack>
-
 #include <dmlc/registry.h>
 #include <dmlc/json.h>
 
@@ -16,6 +10,12 @@
 #include <xgboost/logging.h>
 #include <xgboost/json.h>
 
+#include <sstream>
+#include <limits>
+#include <cmath>
+#include <iomanip>
+#include <stack>
+
 #include "param.h"
 #include "../common/common.h"
 

src/tree/updater_basemaker-inl.h

@@ -7,13 +7,15 @@
 #ifndef XGBOOST_TREE_UPDATER_BASEMAKER_INL_H_
 #define XGBOOST_TREE_UPDATER_BASEMAKER_INL_H_
 
+#include <rabit/rabit.h>
+
+
 #include <vector>
 #include <algorithm>
 #include <string>
 #include <limits>
 #include <utility>
 
-#include <rabit/rabit.h>
 #include "xgboost/base.h"
 #include "xgboost/json.h"
 #include "xgboost/tree_updater.h"

src/tree/updater_colmaker.cc

@@ -4,13 +4,12 @@
  * \brief use columnwise update to construct a tree
  * \author Tianqi Chen
  */
+#include <rabit/rabit.h>
 #include <memory>
 #include <vector>
 #include <cmath>
 #include <algorithm>
 
-#include <rabit/rabit.h>
-
 #include "xgboost/parameter.h"
 #include "xgboost/tree_updater.h"
 #include "xgboost/logging.h"

src/tree/updater_gpu_hist.cu

@@ -1,6 +1,9 @@
 /*!
  * Copyright 2017-2020 XGBoost contributors
  */
+#include <thrust/copy.h>
+#include <thrust/reduce.h>
+#include <xgboost/tree_updater.h>
 #include <algorithm>
 #include <cmath>
 #include <memory>
@@ -9,10 +12,6 @@
 #include <utility>
 #include <vector>
 
-#include <thrust/copy.h>
-#include <thrust/reduce.h>
-
-#include "xgboost/tree_updater.h"
 #include "xgboost/host_device_vector.h"
 #include "xgboost/parameter.h"
 #include "xgboost/span.h"

src/tree/updater_histmaker.cc

@@ -4,10 +4,10 @@
  * \brief use histogram counting to construct a tree
  * \author Tianqi Chen
  */
+#include <rabit/rabit.h>
 #include <vector>
 #include <algorithm>
 
-#include <rabit/rabit.h>
 #include "xgboost/tree_updater.h"
 #include "xgboost/base.h"
 #include "xgboost/logging.h"

src/tree/updater_prune.cc

@@ -4,18 +4,17 @@
  * \brief prune a tree given the statistics
  * \author Tianqi Chen
  */
+#include <rabit/rabit.h>
+#include <xgboost/tree_updater.h>
+
 #include <string>
 #include <memory>
 
-#include <rabit/rabit.h>
-
-#include "xgboost/tree_updater.h"
 #include "xgboost/base.h"
 #include "xgboost/json.h"
 #include "./param.h"
 #include "../common/io.h"
 #include "../common/timer.h"
-
 namespace xgboost {
 namespace tree {
 

src/tree/updater_quantile_hist.cc

@@ -4,6 +4,9 @@
  * \brief use quantized feature values to construct a tree
  * \author Philip Cho, Tianqi Checn, Egor Smirnov
  */
+#include <dmlc/timer.h>
+#include <rabit/rabit.h>
+
 #include <cmath>
 #include <memory>
 #include <vector>
@@ -14,8 +17,6 @@
 #include <string>
 #include <utility>
 
-#include <dmlc/timer.h>
-#include <rabit/rabit.h>
 #include "xgboost/logging.h"
 #include "xgboost/tree_updater.h"
 

src/tree/updater_quantile_hist.h

@@ -7,6 +7,10 @@
 #ifndef XGBOOST_TREE_UPDATER_QUANTILE_HIST_H_
 #define XGBOOST_TREE_UPDATER_QUANTILE_HIST_H_
 
+#include <dmlc/timer.h>
+#include <rabit/rabit.h>
+#include <xgboost/tree_updater.h>
+
 #include <memory>
 #include <vector>
 #include <string>
@@ -15,13 +19,8 @@
 #include <unordered_map>
 #include <utility>
 
-#include <dmlc/timer.h>
-#include <rabit/rabit.h>
-
-#include "xgboost/tree_updater.h"
 #include "xgboost/data.h"
 #include "xgboost/json.h"
-
 #include "constraints.h"
 #include "./param.h"
 #include "./split_evaluator.h"

src/tree/updater_refresh.cc

@@ -4,12 +4,12 @@
  * \brief refresh the statistics and leaf value on the tree on the dataset
  * \author Tianqi Chen
  */
+#include <rabit/rabit.h>
+#include <xgboost/tree_updater.h>
+
 #include <vector>
 #include <limits>
 
-#include <rabit/rabit.h>
-
-#include "xgboost/tree_updater.h"
 #include "xgboost/json.h"
 #include "./param.h"
 #include "../common/io.h"

src/tree/updater_skmaker.cc

@@ -5,13 +5,12 @@
           a refresh is needed to make the statistics exactly correct
  * \author Tianqi Chen
  */
+#include <rabit/rabit.h>
+#include <xgboost/base.h>
+#include <xgboost/tree_updater.h>
 #include <vector>
 #include <algorithm>
 
-#include <rabit/rabit.h>
-#include "xgboost/base.h"
-#include "xgboost/tree_updater.h"
-
 #include "../common/quantile.h"
 #include "../common/group_data.h"
 #include "./updater_basemaker-inl.h"

src/tree/updater_sync.cc

@@ -3,11 +3,11 @@
  * \file updater_sync.cc
  * \brief synchronize the tree in all distributed nodes
  */
+#include <xgboost/tree_updater.h>
 #include <vector>
 #include <string>
 #include <limits>
 
-#include "xgboost/tree_updater.h"
 #include "xgboost/json.h"
 #include "../common/io.h"