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

This reverts commit 656d2676.

src/io/metadata.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/dataset.h>
+#include <LightGBM/utils/common.h>
 
 #include <string>
 #include <vector>
 
-#include <LightGBM/dataset.h>
-#include <LightGBM/utils/common.h>
-
 namespace LightGBM {
 
 Metadata::Metadata() {

src/io/multi_val_dense_bin.hpp

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_IO_MULTI_VAL_DENSE_BIN_HPP_
 #define LIGHTGBM_IO_MULTI_VAL_DENSE_BIN_HPP_
 
+#include <LightGBM/bin.h>
+#include <LightGBM/utils/openmp_wrapper.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include <LightGBM/bin.h>
-#include <LightGBM/utils/openmp_wrapper.h>
-
 namespace LightGBM {
 
 template <typename VAL_T>

src/io/multi_val_sparse_bin.hpp

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_IO_MULTI_VAL_SPARSE_BIN_HPP_
 #define LIGHTGBM_IO_MULTI_VAL_SPARSE_BIN_HPP_
 
+#include <LightGBM/bin.h>
+#include <LightGBM/utils/openmp_wrapper.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include <LightGBM/bin.h>
-#include <LightGBM/utils/openmp_wrapper.h>
-
 namespace LightGBM {
 
 template <typename INDEX_T, typename VAL_T>

src/io/parser.cpp

@@ -2,6 +2,7 @@
  * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License. See LICENSE file in the project root for license information.
  */
+#include "parser.hpp"
 
 #include <string>
 #include <algorithm>
@@ -10,8 +11,6 @@
 #include <iostream>
 #include <memory>
 
-#include "parser.hpp"
-
 namespace LightGBM {
 
 void GetStatistic(const char* str, int* comma_cnt, int* tab_cnt, int* colon_cnt) {

src/io/parser.hpp

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_IO_PARSER_HPP_
 #define LIGHTGBM_IO_PARSER_HPP_
 
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
 #include <LightGBM/dataset.h>
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/log.h>
 
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 namespace LightGBM {
 
 class CSVParser: public Parser {

src/io/sparse_bin.hpp

@@ -6,6 +6,10 @@
 #ifndef LIGHTGBM_IO_SPARSE_BIN_HPP_
 #define LIGHTGBM_IO_SPARSE_BIN_HPP_
 
+#include <LightGBM/bin.h>
+#include <LightGBM/utils/log.h>
+#include <LightGBM/utils/openmp_wrapper.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -13,10 +17,6 @@
 #include <utility>
 #include <vector>
 
-#include <LightGBM/bin.h>
-#include <LightGBM/utils/log.h>
-#include <LightGBM/utils/openmp_wrapper.h>
-
 namespace LightGBM {
 
 template <typename VAL_T>

src/io/tree.cpp

@@ -2,17 +2,16 @@
  * Copyright (c) 2016 Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License. See LICENSE file in the project root for license information.
  */
-
-#include <functional>
-#include <iomanip>
-#include <sstream>
-
 #include <LightGBM/tree.h>
 
 #include <LightGBM/dataset.h>
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/threading.h>
 
+#include <functional>
+#include <iomanip>
+#include <sstream>
+
 namespace LightGBM {
 
 Tree::Tree(int max_leaves)

src/main.cpp

@@ -2,11 +2,10 @@
  * 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/application.h>
 
 #include <iostream>
 
-#include <LightGBM/application.h>
-
 #include "network/linkers.h"
 
 int main(int argc, char** argv) {

src/metric/binary_metric.hpp

@@ -5,15 +5,15 @@
 #ifndef LIGHTGBM_METRIC_BINARY_METRIC_HPP_
 #define LIGHTGBM_METRIC_BINARY_METRIC_HPP_
 
+#include <LightGBM/metric.h>
+#include <LightGBM/utils/common.h>
+#include <LightGBM/utils/log.h>
+
 #include <string>
 #include <algorithm>
 #include <sstream>
 #include <vector>
 
-#include <LightGBM/metric.h>
-#include <LightGBM/utils/common.h>
-#include <LightGBM/utils/log.h>
-
 namespace LightGBM {
 
 /*!

src/metric/dcg_calculator.cpp

@@ -2,14 +2,13 @@
  * 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/metric.h>
+#include <LightGBM/utils/log.h>
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
-#include <LightGBM/metric.h>
-#include <LightGBM/utils/log.h>
-
 namespace LightGBM {
 
 /*! \brief Declaration for some static members */

src/metric/map_metric.hpp

@@ -5,16 +5,16 @@
 #ifndef LIGHTGBM_METRIC_MAP_METRIC_HPP_
 #define LIGHTGBM_METRIC_MAP_METRIC_HPP_
 
-#include <string>
-#include <algorithm>
-#include <sstream>
-#include <vector>
-
 #include <LightGBM/metric.h>
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/log.h>
 #include <LightGBM/utils/openmp_wrapper.h>
 
+#include <string>
+#include <algorithm>
+#include <sstream>
+#include <vector>
+
 namespace LightGBM {
 
 class MapMetric:public Metric {

src/metric/multiclass_metric.hpp

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_METRIC_MULTICLASS_METRIC_HPP_
 #define LIGHTGBM_METRIC_MULTICLASS_METRIC_HPP_
 
+#include <LightGBM/metric.h>
+#include <LightGBM/utils/log.h>
+
 #include <string>
 #include <cmath>
 #include <utility>
 #include <vector>
 
-#include <LightGBM/metric.h>
-#include <LightGBM/utils/log.h>
-
 namespace LightGBM {
 /*!
 * \brief Metric for multiclass task.

src/metric/rank_metric.hpp

@@ -5,15 +5,15 @@
 #ifndef LIGHTGBM_METRIC_RANK_METRIC_HPP_
 #define LIGHTGBM_METRIC_RANK_METRIC_HPP_
 
-#include <string>
-#include <sstream>
-#include <vector>
-
 #include <LightGBM/metric.h>
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/log.h>
 #include <LightGBM/utils/openmp_wrapper.h>
 
+#include <string>
+#include <sstream>
+#include <vector>
+
 namespace LightGBM {
 
 class NDCGMetric:public Metric {

src/metric/regression_metric.hpp

@@ -5,14 +5,14 @@
 #ifndef LIGHTGBM_METRIC_REGRESSION_METRIC_HPP_
 #define LIGHTGBM_METRIC_REGRESSION_METRIC_HPP_
 
+#include <LightGBM/metric.h>
+#include <LightGBM/utils/log.h>
+
 #include <string>
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
-#include <LightGBM/metric.h>
-#include <LightGBM/utils/log.h>
-
 namespace LightGBM {
 /*!
 * \brief Metric for regression task.

src/metric/xentropy_metric.hpp

@@ -5,16 +5,16 @@
 #ifndef LIGHTGBM_METRIC_XENTROPY_METRIC_HPP_
 #define LIGHTGBM_METRIC_XENTROPY_METRIC_HPP_
 
-#include <string>
-#include <algorithm>
-#include <sstream>
-#include <vector>
-
 #include <LightGBM/meta.h>
 #include <LightGBM/metric.h>
 #include <LightGBM/utils/common.h>
 #include <LightGBM/utils/log.h>
 
+#include <string>
+#include <algorithm>
+#include <sstream>
+#include <vector>
+
 /*
  * Implements three related metrics:
  *

src/network/linker_topo.cpp

@@ -2,15 +2,14 @@
  * 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/network.h>
+#include <LightGBM/utils/common.h>
+#include <LightGBM/utils/log.h>
 
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <LightGBM/network.h>
-#include <LightGBM/utils/common.h>
-#include <LightGBM/utils/log.h>
-
 namespace LightGBM {
 
 

src/network/linkers.h

@@ -5,6 +5,11 @@
 #ifndef LIGHTGBM_NETWORK_LINKERS_H_
 #define LIGHTGBM_NETWORK_LINKERS_H_
 
+#include <LightGBM/config.h>
+#include <LightGBM/meta.h>
+#include <LightGBM/network.h>
+#include <LightGBM/utils/common.h>
+
 #include <string>
 #include <algorithm>
 #include <chrono>
@@ -13,11 +18,6 @@
 #include <thread>
 #include <vector>
 
-#include <LightGBM/config.h>
-#include <LightGBM/meta.h>
-#include <LightGBM/network.h>
-#include <LightGBM/utils/common.h>
-
 #ifdef USE_SOCKET
 #include "socket_wrapper.hpp"
 #endif

src/network/linkers_socket.cpp

@@ -4,6 +4,10 @@
  */
 #ifdef USE_SOCKET
 
+#include <LightGBM/config.h>
+#include <LightGBM/utils/common.h>
+#include <LightGBM/utils/text_reader.h>
+
 #include <string>
 #include <chrono>
 #include <cstring>
@@ -12,10 +16,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include <LightGBM/config.h>
-#include <LightGBM/utils/common.h>
-#include <LightGBM/utils/text_reader.h>
-
 #include "linkers.h"
 
 namespace LightGBM {

src/network/network.cpp

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

src/network/socket_wrapper.hpp

@@ -6,13 +6,13 @@
 #define LIGHTGBM_NETWORK_SOCKET_WRAPPER_HPP_
 #ifdef USE_SOCKET
 
+#include <LightGBM/utils/log.h>
+
 #include <string>
 #include <cerrno>
 #include <cstdlib>
 #include <unordered_set>
 
-#include <LightGBM/utils/log.h>
-
 #if defined(_WIN32)
 
 #ifdef _MSC_VER