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

This reverts commit 656d2676.

R-package/src/lightgbm_R.cpp

@@ -5,13 +5,6 @@
 
 #include "lightgbm_R.h"
 
-#include <string>
-#include <cstdio>
-#include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/log.h>
 #include <LightGBM/utils/openmp_wrapper.h>
@@ -19,6 +12,13 @@
 
 #include <R_ext/Rdynload.h>
 
+#include <string>
+#include <cstdio>
+#include <cstring>
+#include <memory>
+#include <utility>
+#include <vector>
+
 #define COL_MAJOR (0)
 
 #define R_API_BEGIN() \

include/LightGBM/application.h

@@ -5,12 +5,12 @@
 #ifndef LIGHTGBM_APPLICATION_H_
 #define LIGHTGBM_APPLICATION_H_
 
-#include <memory>
-#include <vector>
-
 #include <LightGBM/config.h>
 #include <LightGBM/meta.h>
 
+#include <memory>
+#include <vector>
+
 namespace LightGBM {
 
 class DatasetLoader;

include/LightGBM/bin.h

@@ -5,6 +5,10 @@
 #ifndef LIGHTGBM_BIN_H_
 #define LIGHTGBM_BIN_H_
 
+#include <LightGBM/meta.h>
+#include <LightGBM/utils/common.h>
+#include <LightGBM/utils/file_io.h>
+
 #include <limits>
 #include <string>
 #include <functional>
@@ -12,10 +16,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <LightGBM/meta.h>
-#include <LightGBM/utils/common.h>
-#include <LightGBM/utils/file_io.h>
-
 namespace LightGBM {
 
 enum BinType {

include/LightGBM/boosting.h

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_BOOSTING_H_
 #define LIGHTGBM_BOOSTING_H_
 
+#include <LightGBM/config.h>
+#include <LightGBM/meta.h>
+
 #include <string>
 #include <map>
 #include <unordered_map>
 #include <vector>
 
-#include <LightGBM/config.h>
-#include <LightGBM/meta.h>
-
 namespace LightGBM {
 
 /*! \brief forward declaration */

include/LightGBM/c_api.h

@@ -13,12 +13,12 @@
 #ifndef LIGHTGBM_C_API_H_
 #define LIGHTGBM_C_API_H_
 
+#include <LightGBM/export.h>
+
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 
-#include <LightGBM/export.h>
-
 
 typedef void* DatasetHandle;  /*!< \brief Handle of dataset. */
 typedef void* BoosterHandle;  /*!< \brief Handle of booster. */

include/LightGBM/config.h

@@ -11,6 +11,11 @@
 #ifndef LIGHTGBM_CONFIG_H_
 #define LIGHTGBM_CONFIG_H_
 
+#include <LightGBM/export.h>
+#include <LightGBM/meta.h>
+#include <LightGBM/utils/common.h>
+#include <LightGBM/utils/log.h>
+
 #include <string>
 #include <algorithm>
 #include <memory>
@@ -18,11 +23,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include <LightGBM/export.h>
-#include <LightGBM/meta.h>
-#include <LightGBM/utils/common.h>
-#include <LightGBM/utils/log.h>
-
 namespace LightGBM {
 
 /*! \brief Types of tasks */

include/LightGBM/dataset.h

@@ -5,6 +5,13 @@
 #ifndef LIGHTGBM_DATASET_H_
 #define LIGHTGBM_DATASET_H_
 
+#include <LightGBM/config.h>
+#include <LightGBM/feature_group.h>
+#include <LightGBM/meta.h>
+#include <LightGBM/utils/openmp_wrapper.h>
+#include <LightGBM/utils/random.h>
+#include <LightGBM/utils/text_reader.h>
+
 #include <string>
 #include <functional>
 #include <memory>
@@ -13,13 +20,6 @@
 #include <utility>
 #include <vector>
 
-#include <LightGBM/config.h>
-#include <LightGBM/feature_group.h>
-#include <LightGBM/meta.h>
-#include <LightGBM/utils/openmp_wrapper.h>
-#include <LightGBM/utils/random.h>
-#include <LightGBM/utils/text_reader.h>
-
 namespace LightGBM {
 
 /*! \brief forward declaration */

include/LightGBM/dataset_loader.h

@@ -5,12 +5,12 @@
 #ifndef LIGHTGBM_DATASET_LOADER_H_
 #define LIGHTGBM_DATASET_LOADER_H_
 
+#include <LightGBM/dataset.h>
+
 #include <string>
 #include <unordered_set>
 #include <vector>
 
-#include <LightGBM/dataset.h>
-
 namespace LightGBM {
 
 class DatasetLoader {

include/LightGBM/feature_group.h

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_FEATURE_GROUP_H_
 #define LIGHTGBM_FEATURE_GROUP_H_
 
-#include <cstdio>
-#include <memory>
-#include <vector>
-
 #include <LightGBM/bin.h>
 #include <LightGBM/meta.h>
 #include <LightGBM/utils/random.h>
 
+#include <cstdio>
+#include <memory>
+#include <vector>
+
 namespace LightGBM {
 
 class Dataset;

include/LightGBM/metric.h

@@ -5,9 +5,6 @@
 #ifndef LIGHTGBM_METRIC_H_
 #define LIGHTGBM_METRIC_H_
 
-#include <string>
-#include <vector>
-
 #include <LightGBM/config.h>
 #include <LightGBM/dataset.h>
 #include <LightGBM/meta.h>
@@ -15,6 +12,9 @@
 #include <LightGBM/utils/log.h>
 #include <LightGBM/utils/common.h>
 
+#include <string>
+#include <vector>
+
 namespace LightGBM {
 
 /*!

include/LightGBM/network.h

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_NETWORK_H_
 #define LIGHTGBM_NETWORK_H_
 
-#include <functional>
-#include <memory>
-#include <vector>
-
 #include <LightGBM/config.h>
 #include <LightGBM/meta.h>
 #include <LightGBM/utils/log.h>
 
+#include <functional>
+#include <memory>
+#include <vector>
+
 namespace LightGBM {
 
 /*! \brief forward declaration */

include/LightGBM/objective_function.h

@@ -5,13 +5,13 @@
 #ifndef LIGHTGBM_OBJECTIVE_FUNCTION_H_
 #define LIGHTGBM_OBJECTIVE_FUNCTION_H_
 
-#include <string>
-#include <functional>
-
 #include <LightGBM/config.h>
 #include <LightGBM/dataset.h>
 #include <LightGBM/meta.h>
 
+#include <string>
+#include <functional>
+
 namespace LightGBM {
 /*!
 * \brief The interface of Objective Function.

include/LightGBM/prediction_early_stop.h

@@ -5,11 +5,11 @@
 #ifndef LIGHTGBM_PREDICTION_EARLY_STOP_H_
 #define LIGHTGBM_PREDICTION_EARLY_STOP_H_
 
+#include <LightGBM/export.h>
+
 #include <string>
 #include <functional>
 
-#include <LightGBM/export.h>
-
 namespace LightGBM {
 
 struct PredictionEarlyStopInstance {

include/LightGBM/tree.h

@@ -5,15 +5,15 @@
 #ifndef LIGHTGBM_TREE_H_
 #define LIGHTGBM_TREE_H_
 
+#include <LightGBM/dataset.h>
+#include <LightGBM/meta.h>
+
 #include <string>
 #include <map>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
-#include <LightGBM/dataset.h>
-#include <LightGBM/meta.h>
-
 namespace LightGBM {
 
 #define kCategoricalMask (1)

include/LightGBM/tree_learner.h

@@ -5,13 +5,13 @@
 #ifndef LIGHTGBM_TREE_LEARNER_H_
 #define LIGHTGBM_TREE_LEARNER_H_
 
-#include <string>
-#include <vector>
-
 #include <LightGBM/config.h>
 #include <LightGBM/meta.h>
 #include <LightGBM/utils/json11.h>
 
+#include <string>
+#include <vector>
+
 namespace LightGBM {
 
 using json11::Json;

include/LightGBM/utils/array_args.h

@@ -5,13 +5,13 @@
 #ifndef LIGHTGBM_UTILS_ARRAY_AGRS_H_
 #define LIGHTGBM_UTILS_ARRAY_AGRS_H_
 
+#include <LightGBM/utils/openmp_wrapper.h>
+#include <LightGBM/utils/threading.h>
+
 #include <algorithm>
 #include <utility>
 #include <vector>
 
-#include <LightGBM/utils/openmp_wrapper.h>
-#include <LightGBM/utils/threading.h>
-
 namespace LightGBM {
 
 /*!

include/LightGBM/utils/common.h

@@ -5,6 +5,9 @@
 #ifndef LIGHTGBM_UTILS_COMMON_FUN_H_
 #define LIGHTGBM_UTILS_COMMON_FUN_H_
 
+#include <LightGBM/utils/log.h>
+#include <LightGBM/utils/openmp_wrapper.h>
+
 #include <limits>
 #include <string>
 #include <algorithm>
@@ -23,9 +26,6 @@
 #include <utility>
 #include <vector>
 
-#include <LightGBM/utils/log.h>
-#include <LightGBM/utils/openmp_wrapper.h>
-
 #if defined(_MSC_VER)
 #include <malloc.h>
 #elif MM_MALLOC

include/LightGBM/utils/openmp_wrapper.h

@@ -6,16 +6,16 @@
 #define LIGHTGBM_OPENMP_WRAPPER_H_
 #ifdef _OPENMP
 
+#include <LightGBM/utils/log.h>
+
+#include <omp.h>
+
 #include <exception>
 #include <memory>
 #include <mutex>
 #include <stdexcept>
 #include <vector>
 
-#include <omp.h>
-
-#include <LightGBM/utils/log.h>
-
 inline int OMP_NUM_THREADS() {
   int ret = 1;
 #pragma omp parallel

include/LightGBM/utils/pipeline_reader.h

@@ -5,6 +5,9 @@
 #ifndef LIGHTGBM_UTILS_PIPELINE_READER_H_
 #define LIGHTGBM_UTILS_PIPELINE_READER_H_
 
+#include <LightGBM/utils/file_io.h>
+#include <LightGBM/utils/log.h>
+
 #include <algorithm>
 #include <cstdio>
 #include <functional>
@@ -13,9 +16,6 @@
 #include <utility>
 #include <vector>
 
-#include <LightGBM/utils/file_io.h>
-#include <LightGBM/utils/log.h>
-
 namespace LightGBM {
 
 /*!

include/LightGBM/utils/text_reader.h

@@ -5,16 +5,16 @@
 #ifndef LIGHTGBM_UTILS_TEXT_READER_H_
 #define LIGHTGBM_UTILS_TEXT_READER_H_
 
+#include <LightGBM/utils/log.h>
+#include <LightGBM/utils/pipeline_reader.h>
+#include <LightGBM/utils/random.h>
+
 #include <string>
 #include <cstdio>
 #include <functional>
 #include <sstream>
 #include <vector>
 
-#include <LightGBM/utils/log.h>
-#include <LightGBM/utils/pipeline_reader.h>
-#include <LightGBM/utils/random.h>
-
 namespace LightGBM {
 
 const size_t kGbs = size_t(1024) * 1024 * 1024;