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

This reverts commit d3a0efbf16.

src/common/base64.h

@@ -8,11 +8,10 @@
 #ifndef XGBOOST_COMMON_BASE64_H_
 #define XGBOOST_COMMON_BASE64_H_
 
+#include <xgboost/logging.h>
 #include <cctype>
 #include <cstdio>
 #include <string>
-
-#include "xgboost/logging.h"
 #include "./io.h"
 
 namespace xgboost {

src/common/common.h

@@ -6,6 +6,9 @@
 #ifndef XGBOOST_COMMON_COMMON_H_
 #define XGBOOST_COMMON_COMMON_H_
 
+#include <xgboost/base.h>
+#include <xgboost/logging.h>
+
 #include <exception>
 #include <limits>
 #include <type_traits>
@@ -13,9 +16,6 @@
 #include <string>
 #include <sstream>
 
-#include <xgboost/base.h>
-#include <xgboost/logging.h>
-
 #if defined(__CUDACC__)
 #include <thrust/system/cuda/error.h>
 #include <thrust/system_error.h>

src/common/compressed_iterator.h

@@ -3,11 +3,11 @@
  * \file compressed_iterator.h
  */
 #pragma once
+#include <xgboost/base.h>
 #include <cmath>
 #include <cstddef>
 #include <algorithm>
 
-#include "xgboost/base.h"
 #include "common.h"
 
 #ifdef __CUDACC__

src/common/hist_util.cc

@@ -2,21 +2,19 @@
  * Copyright 2017-2020 by Contributors
  * \file hist_util.cc
  */
-#include <numeric>
-#include <vector>
-
 #include <dmlc/timer.h>
 #include <dmlc/omp.h>
 
 #include <rabit/rabit.h>
+#include <numeric>
+#include <vector>
 
 #include "xgboost/base.h"
+#include "../common/common.h"
 #include "hist_util.h"
 #include "random.h"
 #include "column_matrix.h"
 #include "quantile.h"
-
-#include "../common/common.h"
 #include "./../tree/updater_quantile_hist.h"
 
 #if defined(XGBOOST_MM_PREFETCH_PRESENT)

src/common/hist_util.cu

@@ -1,10 +1,6 @@
 /*!
  * Copyright 2018 XGBoost contributors
  */
-#include <memory>
-#include <mutex>
-#include <utility>
-#include <vector>
 
 #include <xgboost/logging.h>
 
@@ -17,6 +13,11 @@
 #include <thrust/binary_search.h>
 #include <thrust/execution_policy.h>
 
+#include <memory>
+#include <mutex>
+#include <utility>
+#include <vector>
+
 #include "device_helpers.cuh"
 #include "hist_util.h"
 #include "hist_util.cuh"

src/common/hist_util.h

@@ -7,6 +7,8 @@
 #ifndef XGBOOST_COMMON_HIST_UTIL_H_
 #define XGBOOST_COMMON_HIST_UTIL_H_
 
+#include <xgboost/data.h>
+#include <xgboost/generic_parameters.h>
 #include <limits>
 #include <vector>
 #include <algorithm>
@@ -14,9 +16,6 @@
 #include <utility>
 #include <map>
 
-#include "xgboost/data.h"
-#include "xgboost/generic_parameters.h"
-
 #include "row_set.h"
 #include "threading_utils.h"
 #include "../tree/param.h"

src/common/host_device_vector.cc

@@ -4,12 +4,12 @@
 #ifndef XGBOOST_USE_CUDA
 
 // dummy implementation of HostDeviceVector in case CUDA is not used
+
+#include <xgboost/base.h>
+#include <xgboost/data.h>
 #include <cstdint>
 #include <memory>
 #include <utility>
-
-#include "xgboost/base.h"
-#include "xgboost/data.h"
 #include "xgboost/host_device_vector.h"
 
 namespace xgboost {

src/common/host_device_vector.cu

@@ -1,12 +1,14 @@
 /*!
  * Copyright 2017 XGBoost contributors
  */
-#include <algorithm>
-#include <cstdint>
 
 #include <thrust/fill.h>
 #include <thrust/device_ptr.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <mutex>
+
 #include "xgboost/data.h"
 #include "xgboost/host_device_vector.h"
 #include "device_helpers.cuh"

src/common/io.h

@@ -7,11 +7,11 @@
 
 #ifndef XGBOOST_COMMON_IO_H_
 #define XGBOOST_COMMON_IO_H_
-#include <string>
-#include <cstring>
 
 #include <dmlc/io.h>
 #include <rabit/rabit.h>
+#include <string>
+#include <cstring>
 
 #include "common.h"
 

src/common/math.h

@@ -7,14 +7,14 @@
 #ifndef XGBOOST_COMMON_MATH_H_
 #define XGBOOST_COMMON_MATH_H_
 
+#include <xgboost/base.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <utility>
 #include <vector>
 
-#include <xgboost/base.h>
-
 namespace xgboost {
 namespace common {
 /*!

src/common/probability_distribution.cc

@@ -4,9 +4,9 @@
  * \brief Implementation of a few useful probability distributions
  * \author Avinash Barnwal and Hyunsu Cho
  */
-#include <cmath>
 
-#include "xgboost/logging.h"
+#include <xgboost/logging.h>
+#include <cmath>
 #include "probability_distribution.h"
 
 namespace xgboost {

src/common/quantile.h

@@ -7,15 +7,14 @@
 #ifndef XGBOOST_COMMON_QUANTILE_H_
 #define XGBOOST_COMMON_QUANTILE_H_
 
+#include <dmlc/base.h>
+#include <xgboost/logging.h>
 #include <cmath>
 #include <vector>
 #include <cstring>
 #include <algorithm>
 #include <iostream>
 
-#include <dmlc/base.h>
-#include <xgboost/logging.h>
-
 namespace xgboost {
 namespace common {
 /*!

src/common/random.h

@@ -7,6 +7,8 @@
 #ifndef XGBOOST_COMMON_RANDOM_H_
 #define XGBOOST_COMMON_RANDOM_H_
 
+#include <rabit/rabit.h>
+#include <xgboost/logging.h>
 #include <algorithm>
 #include <vector>
 #include <limits>
@@ -15,8 +17,6 @@
 #include <numeric>
 #include <random>
 
-#include "rabit/rabit.h"
-#include "xgboost/logging.h"
 #include "xgboost/host_device_vector.h"
 
 namespace xgboost {

src/common/row_set.h

@@ -7,12 +7,11 @@
 #ifndef XGBOOST_COMMON_ROW_SET_H_
 #define XGBOOST_COMMON_ROW_SET_H_
 
+#include <xgboost/data.h>
 #include <algorithm>
 #include <vector>
 #include <utility>
 
-#include "xgboost/data.h"
-
 namespace xgboost {
 namespace common {
 

src/common/survival_util.cc

@@ -6,10 +6,9 @@
  * \author Avinash Barnwal, Hyunsu Cho and Toby Hocking
  */
 
+#include <dmlc/registry.h>
 #include <algorithm>
 #include <cmath>
-
-#include <dmlc/registry.h>
 #include "survival_util.h"
 
 /*

src/common/survival_util.h

@@ -8,9 +8,8 @@
 #ifndef XGBOOST_COMMON_SURVIVAL_UTIL_H_
 #define XGBOOST_COMMON_SURVIVAL_UTIL_H_
 
+#include <xgboost/parameter.h>
 #include <memory>
-
-#include "xgboost/parameter.h"
 #include "probability_distribution.h"
 
 DECLARE_FIELD_ENUM_CLASS(xgboost::common::ProbabilityDistributionType);

src/common/timer.cc

@@ -1,15 +1,14 @@
 /*!
  * Copyright by Contributors 2019
  */
+#include <rabit/rabit.h>
 #include <algorithm>
 #include <type_traits>
 #include <utility>
 #include <vector>
 #include <sstream>
-
-#include <rabit/rabit.h>
-#include "xgboost/json.h"
 #include "timer.h"
+#include "xgboost/json.h"
 
 #if defined(XGBOOST_USE_NVTX)
 #include <nvToolsExt.h>

src/common/timer.h

@@ -2,6 +2,7 @@
  * Copyright by Contributors 2017-2019
  */
 #pragma once
+#include <xgboost/logging.h>
 #include <chrono>
 #include <iostream>
 #include <map>
@@ -9,8 +10,6 @@
 #include <utility>
 #include <vector>
 
-#include <xgboost/logging.h>
-
 namespace xgboost {
 namespace common {
 

src/common/transform.h

@@ -3,14 +3,15 @@
  */
 #ifndef XGBOOST_COMMON_TRANSFORM_H_
 #define XGBOOST_COMMON_TRANSFORM_H_
-#include <utility>
-#include <vector>
-#include <type_traits>  // enable_if
 
 #include <dmlc/omp.h>
 #include <dmlc/common.h>
 
-#include "xgboost/data.h"
+#include <xgboost/data.h>
+#include <utility>
+#include <vector>
+#include <type_traits>  // enable_if
+
 #include "xgboost/host_device_vector.h"
 #include "xgboost/span.h"
 

src/common/version.cc

@@ -1,12 +1,12 @@
 /*!
  * Copyright 2019 XGBoost contributors
  */
+#include <dmlc/io.h>
+
 #include <string>
 #include <tuple>
 #include <vector>
 
-#include <dmlc/io.h>
-
 #include "xgboost/logging.h"
 #include "xgboost/json.h"
 #include "xgboost/version_config.h"

src/common/version.h

@@ -4,10 +4,10 @@
 #ifndef XGBOOST_COMMON_VERSION_H_
 #define XGBOOST_COMMON_VERSION_H_
 
+#include <dmlc/io.h>
 #include <string>
 #include <tuple>
 
-#include <dmlc/io.h>
 #include "xgboost/base.h"
 
 namespace xgboost {