From 50ce01b55e6bbac1dd00e2f9b1b639dcc37f2660 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 12 Apr 2019 00:55:27 +0300 Subject: [PATCH] reworked includes in source files (#2066) * added all necessary includes - fixed build/include_what_you_use error * fixed the order of includes (build/include_order) --- include/LightGBM/application.h | 4 +-- include/LightGBM/bin.h | 8 ++--- include/LightGBM/boosting.h | 5 +-- include/LightGBM/c_api.h | 4 +-- include/LightGBM/config.h | 12 +++---- include/LightGBM/dataset.h | 18 +++++------ include/LightGBM/dataset_loader.h | 4 +++ include/LightGBM/feature_group.h | 5 ++- include/LightGBM/json11.hpp | 5 +-- include/LightGBM/lightgbm_R.h | 5 ++- include/LightGBM/meta.h | 6 ++-- include/LightGBM/metric.h | 8 ++--- include/LightGBM/network.h | 7 ++--- include/LightGBM/objective_function.h | 4 ++- include/LightGBM/prediction_early_stop.h | 6 ++-- include/LightGBM/tree.h | 7 +++-- include/LightGBM/tree_learner.h | 7 +++-- include/LightGBM/utils/array_args.h | 6 ++-- include/LightGBM/utils/common.h | 14 +++++---- include/LightGBM/utils/file_io.h | 5 +-- include/LightGBM/utils/log.h | 5 +-- include/LightGBM/utils/openmp_wrapper.h | 7 +++-- include/LightGBM/utils/pipeline_reader.h | 8 ++--- include/LightGBM/utils/random.h | 3 +- include/LightGBM/utils/text_reader.h | 7 ++--- include/LightGBM/utils/threading.h | 2 +- src/application/application.cpp | 22 ++++++------- src/application/predictor.hpp | 16 +++++----- src/boosting/boosting.cpp | 3 +- src/boosting/dart.hpp | 10 +++--- src/boosting/gbdt.cpp | 15 +++------ src/boosting/gbdt.h | 15 +++++---- src/boosting/gbdt_model_text.cpp | 10 +++--- src/boosting/gbdt_prediction.cpp | 6 ++-- src/boosting/goss.hpp | 16 +++++----- src/boosting/prediction_early_stop.cpp | 5 +-- src/boosting/rf.hpp | 11 ++++--- src/boosting/score_updater.hpp | 6 ++-- src/c_api.cpp | 31 +++++++++---------- src/io/bin.cpp | 15 ++++----- src/io/config.cpp | 6 +--- src/io/dataset.cpp | 11 +++---- src/io/dataset_loader.cpp | 8 ++--- src/io/dense_bin.hpp | 4 +-- src/io/dense_nbits_bin.hpp | 4 +-- src/io/file_io.cpp | 2 ++ src/io/json11.cpp | 5 +-- src/io/metadata.cpp | 3 +- src/io/ordered_sparse_bin.hpp | 8 ++--- src/io/parser.cpp | 3 +- src/io/parser.hpp | 5 ++- src/io/sparse_bin.hpp | 10 +++--- src/io/tree.cpp | 11 ++----- src/lightgbm_R.cpp | 12 +++---- src/main.cpp | 3 +- src/metric/binary_metric.hpp | 6 ++-- src/metric/dcg_calculator.cpp | 4 +-- src/metric/map_metric.hpp | 5 +-- src/metric/metric.cpp | 5 +-- src/metric/multiclass_metric.hpp | 3 +- src/metric/rank_metric.hpp | 2 +- src/metric/regression_metric.hpp | 4 ++- src/metric/xentropy_metric.hpp | 8 ++--- src/network/linker_topo.cpp | 3 +- src/network/linkers.h | 9 +++--- src/network/linkers_mpi.cpp | 1 + src/network/linkers_socket.cpp | 13 ++++---- src/network/network.cpp | 6 ++-- src/network/socket_wrapper.hpp | 3 +- src/objective/binary_objective.hpp | 5 ++- src/objective/multiclass_objective.hpp | 5 ++- src/objective/objective_function.cpp | 5 +-- src/objective/rank_objective.hpp | 10 +++--- src/objective/regression_objective.hpp | 7 +++-- src/objective/xentropy_objective.hpp | 8 +++-- .../data_parallel_tree_learner.cpp | 5 ++- src/treelearner/data_partition.hpp | 5 ++- src/treelearner/feature_histogram.hpp | 12 ++++--- .../feature_parallel_tree_learner.cpp | 5 ++- src/treelearner/gpu_tree_learner.cpp | 10 +++--- src/treelearner/gpu_tree_learner.h | 24 +++++++------- src/treelearner/leaf_splits.hpp | 6 ++-- src/treelearner/parallel_tree_learner.h | 8 ++--- src/treelearner/serial_tree_learner.cpp | 4 +-- src/treelearner/serial_tree_learner.h | 23 +++++++------- src/treelearner/split_info.hpp | 3 +- src/treelearner/tree_learner.cpp | 2 +- .../voting_parallel_tree_learner.cpp | 4 +-- 88 files changed, 341 insertions(+), 330 deletions(-) diff --git a/include/LightGBM/application.h b/include/LightGBM/application.h index 800426b4d5e..0abb546302f 100644 --- a/include/LightGBM/application.h +++ b/include/LightGBM/application.h @@ -1,11 +1,11 @@ #ifndef LIGHTGBM_APPLICATION_H_ #define LIGHTGBM_APPLICATION_H_ -#include #include +#include -#include #include +#include namespace LightGBM { diff --git a/include/LightGBM/bin.h b/include/LightGBM/bin.h index d80a657029b..b863d383181 100644 --- a/include/LightGBM/bin.h +++ b/include/LightGBM/bin.h @@ -2,15 +2,15 @@ #define LIGHTGBM_BIN_H_ #include - #include #include - -#include +#include +#include #include -#include #include +#include +#include namespace LightGBM { diff --git a/include/LightGBM/boosting.h b/include/LightGBM/boosting.h index 9e2115684cf..f9dcbfec980 100644 --- a/include/LightGBM/boosting.h +++ b/include/LightGBM/boosting.h @@ -1,12 +1,13 @@ #ifndef LIGHTGBM_BOOSTING_H_ #define LIGHTGBM_BOOSTING_H_ -#include #include +#include -#include #include #include +#include +#include namespace LightGBM { diff --git a/include/LightGBM/c_api.h b/include/LightGBM/c_api.h index 53939b2a921..c1bb191a99e 100644 --- a/include/LightGBM/c_api.h +++ b/include/LightGBM/c_api.h @@ -1,6 +1,8 @@ #ifndef LIGHTGBM_C_API_H_ #define LIGHTGBM_C_API_H_ +#include + #include #include @@ -12,8 +14,6 @@ * The reason is because they are called frequently, the type-conversion on them maybe time cost. */ -#include - typedef void* DatasetHandle; typedef void* BoosterHandle; diff --git a/include/LightGBM/config.h b/include/LightGBM/config.h index d080113fdd5..d837f389454 100644 --- a/include/LightGBM/config.h +++ b/include/LightGBM/config.h @@ -1,20 +1,18 @@ /// desc and descl2 fields must be written in reStructuredText format - #ifndef LIGHTGBM_CONFIG_H_ #define LIGHTGBM_CONFIG_H_ +#include +#include #include #include -#include -#include - -#include #include -#include -#include #include #include +#include +#include +#include namespace LightGBM { diff --git a/include/LightGBM/dataset.h b/include/LightGBM/dataset.h index c75fe8d3ac3..6154bce840d 100644 --- a/include/LightGBM/dataset.h +++ b/include/LightGBM/dataset.h @@ -1,20 +1,20 @@ #ifndef LIGHTGBM_DATASET_H_ #define LIGHTGBM_DATASET_H_ -#include -#include -#include - -#include #include #include +#include +#include +#include +#include -#include -#include -#include #include -#include +#include +#include #include +#include +#include +#include namespace LightGBM { diff --git a/include/LightGBM/dataset_loader.h b/include/LightGBM/dataset_loader.h index 032cd8e6614..1deb18c47a4 100644 --- a/include/LightGBM/dataset_loader.h +++ b/include/LightGBM/dataset_loader.h @@ -3,6 +3,10 @@ #include +#include +#include +#include + namespace LightGBM { class DatasetLoader { diff --git a/include/LightGBM/feature_group.h b/include/LightGBM/feature_group.h index 888d8629c1f..cade7103422 100644 --- a/include/LightGBM/feature_group.h +++ b/include/LightGBM/feature_group.h @@ -1,10 +1,9 @@ #ifndef LIGHTGBM_FEATURE_GROUP_H_ #define LIGHTGBM_FEATURE_GROUP_H_ -#include - -#include #include +#include +#include #include #include diff --git a/include/LightGBM/json11.hpp b/include/LightGBM/json11.hpp index c052a1ff37a..a271b19af08 100644 --- a/include/LightGBM/json11.hpp +++ b/include/LightGBM/json11.hpp @@ -51,10 +51,11 @@ #pragma once #include -#include +#include #include #include -#include +#include +#include #ifdef _MSC_VER #if _MSC_VER <= 1800 // VS 2013 diff --git a/include/LightGBM/lightgbm_R.h b/include/LightGBM/lightgbm_R.h index 9fc2b6664e9..9a2c1e029b3 100644 --- a/include/LightGBM/lightgbm_R.h +++ b/include/LightGBM/lightgbm_R.h @@ -1,11 +1,10 @@ #ifndef LIGHTGBM_R_H_ #define LIGHTGBM_R_H_ -#include "R_object_helper.h" - -#include #include +#include +#include /*! * \brief get string message of the last error diff --git a/include/LightGBM/meta.h b/include/LightGBM/meta.h index 01f0af6b048..d578a6e9477 100644 --- a/include/LightGBM/meta.h +++ b/include/LightGBM/meta.h @@ -1,12 +1,12 @@ #ifndef LIGHTGBM_META_H_ #define LIGHTGBM_META_H_ -#include - #include -#include +#include #include #include +#include +#include namespace LightGBM { diff --git a/include/LightGBM/metric.h b/include/LightGBM/metric.h index 72302525f86..5947f6e413f 100644 --- a/include/LightGBM/metric.h +++ b/include/LightGBM/metric.h @@ -1,14 +1,14 @@ #ifndef LIGHTGBM_METRIC_H_ #define LIGHTGBM_METRIC_H_ -#include -#include - -#include #include #include +#include #include +#include +#include +#include #include namespace LightGBM { diff --git a/include/LightGBM/network.h b/include/LightGBM/network.h index 8045a7b8780..ee5732fd293 100644 --- a/include/LightGBM/network.h +++ b/include/LightGBM/network.h @@ -1,14 +1,13 @@ #ifndef LIGHTGBM_NETWORK_H_ #define LIGHTGBM_NETWORK_H_ -#include - -#include #include +#include +#include #include -#include #include +#include namespace LightGBM { diff --git a/include/LightGBM/objective_function.h b/include/LightGBM/objective_function.h index a2cb6d96a83..b5858f772b0 100644 --- a/include/LightGBM/objective_function.h +++ b/include/LightGBM/objective_function.h @@ -1,9 +1,11 @@ #ifndef LIGHTGBM_OBJECTIVE_FUNCTION_H_ #define LIGHTGBM_OBJECTIVE_FUNCTION_H_ -#include #include #include +#include + +#include #include namespace LightGBM { diff --git a/include/LightGBM/prediction_early_stop.h b/include/LightGBM/prediction_early_stop.h index 953df37954b..59248e063d2 100644 --- a/include/LightGBM/prediction_early_stop.h +++ b/include/LightGBM/prediction_early_stop.h @@ -1,11 +1,11 @@ #ifndef LIGHTGBM_PREDICTION_EARLY_STOP_H_ #define LIGHTGBM_PREDICTION_EARLY_STOP_H_ -#include -#include - #include +#include +#include + namespace LightGBM { struct PredictionEarlyStopInstance { diff --git a/include/LightGBM/tree.h b/include/LightGBM/tree.h index 91f25186b1b..7407dbe1cb3 100644 --- a/include/LightGBM/tree.h +++ b/include/LightGBM/tree.h @@ -1,13 +1,14 @@ #ifndef LIGHTGBM_TREE_H_ #define LIGHTGBM_TREE_H_ -#include #include +#include #include -#include -#include #include +#include +#include +#include namespace LightGBM { diff --git a/include/LightGBM/tree_learner.h b/include/LightGBM/tree_learner.h index d679851f958..1419d05f97a 100644 --- a/include/LightGBM/tree_learner.h +++ b/include/LightGBM/tree_learner.h @@ -1,13 +1,14 @@ #ifndef LIGHTGBM_TREE_LEARNER_H_ #define LIGHTGBM_TREE_LEARNER_H_ - -#include #include -#include +#include +#include #include +#include + using namespace json11; namespace LightGBM { diff --git a/include/LightGBM/utils/array_args.h b/include/LightGBM/utils/array_args.h index ef8db97c056..31215e085d1 100644 --- a/include/LightGBM/utils/array_args.h +++ b/include/LightGBM/utils/array_args.h @@ -1,10 +1,12 @@ #ifndef LIGHTGBM_UTILS_ARRAY_AGRS_H_ #define LIGHTGBM_UTILS_ARRAY_AGRS_H_ -#include -#include #include +#include +#include +#include + namespace LightGBM { /*! diff --git a/include/LightGBM/utils/common.h b/include/LightGBM/utils/common.h index 356348094b8..e6f98eafa11 100644 --- a/include/LightGBM/utils/common.h +++ b/include/LightGBM/utils/common.h @@ -4,18 +4,20 @@ #include #include -#include +#include #include -#include -#include -#include #include #include +#include +#include #include -#include +#include #include +#include +#include #include -#include +#include +#include #ifdef _MSC_VER #include "intrin.h" diff --git a/include/LightGBM/utils/file_io.h b/include/LightGBM/utils/file_io.h index 63e6c413cc1..854f8cd5e4c 100644 --- a/include/LightGBM/utils/file_io.h +++ b/include/LightGBM/utils/file_io.h @@ -1,11 +1,12 @@ #ifndef LIGHTGBM_UTILS_FILE_IO_H_ #define LIGHTGBM_UTILS_FILE_IO_H_ -#include -#include +#include #include #include #include +#include +#include namespace LightGBM { diff --git a/include/LightGBM/utils/log.h b/include/LightGBM/utils/log.h index 26706ac6e5f..42f46a9ce43 100644 --- a/include/LightGBM/utils/log.h +++ b/include/LightGBM/utils/log.h @@ -1,12 +1,13 @@ #ifndef LIGHTGBM_UTILS_LOG_H_ #define LIGHTGBM_UTILS_LOG_H_ -#include +#include +#include #include #include -#include #include #include +#include #include namespace LightGBM { diff --git a/include/LightGBM/utils/openmp_wrapper.h b/include/LightGBM/utils/openmp_wrapper.h index 23b1e0f5b0c..c4bb6bf289a 100644 --- a/include/LightGBM/utils/openmp_wrapper.h +++ b/include/LightGBM/utils/openmp_wrapper.h @@ -3,12 +3,13 @@ #ifdef _OPENMP #include +#include + #include -#include +#include #include +#include #include -#include -#include "log.h" class ThreadExceptionHelper { public: diff --git a/include/LightGBM/utils/pipeline_reader.h b/include/LightGBM/utils/pipeline_reader.h index ad69771fbca..7b254cf84a6 100644 --- a/include/LightGBM/utils/pipeline_reader.h +++ b/include/LightGBM/utils/pipeline_reader.h @@ -1,16 +1,16 @@ #ifndef LIGHTGBM_UTILS_PIPELINE_READER_H_ #define LIGHTGBM_UTILS_PIPELINE_READER_H_ +#include #include +#include #include - #include -#include #include -#include +#include +#include #include -#include "file_io.h" namespace LightGBM { diff --git a/include/LightGBM/utils/random.h b/include/LightGBM/utils/random.h index 9d50727dfe4..16e94c8ca11 100644 --- a/include/LightGBM/utils/random.h +++ b/include/LightGBM/utils/random.h @@ -2,10 +2,9 @@ #define LIGHTGBM_UTILS_RANDOM_H_ #include - #include -#include #include +#include namespace LightGBM { diff --git a/include/LightGBM/utils/text_reader.h b/include/LightGBM/utils/text_reader.h index 27336b29e63..3bcc37ba862 100644 --- a/include/LightGBM/utils/text_reader.h +++ b/include/LightGBM/utils/text_reader.h @@ -1,16 +1,15 @@ #ifndef LIGHTGBM_UTILS_TEXT_READER_H_ #define LIGHTGBM_UTILS_TEXT_READER_H_ -#include #include +#include #include +#include #include +#include #include - #include -#include -#include namespace LightGBM { diff --git a/include/LightGBM/utils/threading.h b/include/LightGBM/utils/threading.h index 0f3b8e57973..3dd765488b2 100644 --- a/include/LightGBM/utils/threading.h +++ b/include/LightGBM/utils/threading.h @@ -3,8 +3,8 @@ #include -#include #include +#include namespace LightGBM { diff --git a/src/application/application.cpp b/src/application/application.cpp index 873a80920d2..5b33d773ba6 100644 --- a/src/application/application.cpp +++ b/src/application/application.cpp @@ -1,29 +1,25 @@ #include -#include -#include - -#include +#include #include #include -#include +#include +#include #include #include -#include - -#include "predictor.hpp" - +#include #include +#include +#include +#include #include #include - -#include #include #include -#include #include -#include + +#include "predictor.hpp" namespace LightGBM { diff --git a/src/application/predictor.hpp b/src/application/predictor.hpp index 518542ce308..92dd6def563 100644 --- a/src/application/predictor.hpp +++ b/src/application/predictor.hpp @@ -1,21 +1,21 @@ #ifndef LIGHTGBM_PREDICTOR_HPP_ #define LIGHTGBM_PREDICTOR_HPP_ -#include #include -#include #include - +#include #include +#include -#include -#include +#include #include -#include -#include +#include #include -#include +#include #include +#include +#include +#include namespace LightGBM { diff --git a/src/boosting/boosting.cpp b/src/boosting/boosting.cpp index 6d04f70388b..5ce5d388d92 100644 --- a/src/boosting/boosting.cpp +++ b/src/boosting/boosting.cpp @@ -1,6 +1,7 @@ #include -#include "gbdt.h" + #include "dart.hpp" +#include "gbdt.h" #include "goss.hpp" #include "rf.hpp" diff --git a/src/boosting/dart.hpp b/src/boosting/dart.hpp index 500d02fa7e6..0d6015a02fb 100644 --- a/src/boosting/dart.hpp +++ b/src/boosting/dart.hpp @@ -2,13 +2,15 @@ #define LIGHTGBM_BOOSTING_DART_H_ #include -#include "score_updater.hpp" -#include "gbdt.h" -#include -#include #include +#include +#include #include +#include + +#include "gbdt.h" +#include "score_updater.hpp" namespace LightGBM { /*! diff --git a/src/boosting/gbdt.cpp b/src/boosting/gbdt.cpp index b5a3e9a9733..ac25fc8b23b 100644 --- a/src/boosting/gbdt.cpp +++ b/src/boosting/gbdt.cpp @@ -1,20 +1,15 @@ #include "gbdt.h" -#include - -#include -#include #include -#include #include +#include +#include +#include +#include +#include #include - #include -#include -#include -#include -#include namespace LightGBM { diff --git a/src/boosting/gbdt.h b/src/boosting/gbdt.h index 4c744c54e6b..eed73ae5025 100644 --- a/src/boosting/gbdt.h +++ b/src/boosting/gbdt.h @@ -4,17 +4,20 @@ #include #include #include -#include - -#include "score_updater.hpp" -#include -#include #include +#include +#include #include +#include #include #include -#include +#include +#include +#include + +#include +#include "score_updater.hpp" using namespace json11; diff --git a/src/boosting/gbdt_model_text.cpp b/src/boosting/gbdt_model_text.cpp index 93a37e5fda4..6c118c61f82 100644 --- a/src/boosting/gbdt_model_text.cpp +++ b/src/boosting/gbdt_model_text.cpp @@ -1,13 +1,13 @@ -#include "gbdt.h" - -#include -#include #include +#include +#include -#include #include +#include #include +#include "gbdt.h" + namespace LightGBM { const std::string kModelVersion = "v2"; diff --git a/src/boosting/gbdt_prediction.cpp b/src/boosting/gbdt_prediction.cpp index 6488d249d12..7a34d5b028e 100644 --- a/src/boosting/gbdt_prediction.cpp +++ b/src/boosting/gbdt_prediction.cpp @@ -1,8 +1,8 @@ -#include "gbdt.h" - -#include #include #include +#include + +#include "gbdt.h" namespace LightGBM { diff --git a/src/boosting/goss.hpp b/src/boosting/goss.hpp index 6a310afaf29..2fa66630622 100644 --- a/src/boosting/goss.hpp +++ b/src/boosting/goss.hpp @@ -1,20 +1,20 @@ #ifndef LIGHTGBM_BOOSTING_GOSS_H_ #define LIGHTGBM_BOOSTING_GOSS_H_ +#include #include #include #include -#include - -#include "score_updater.hpp" -#include "gbdt.h" -#include -#include #include -#include -#include #include +#include +#include +#include +#include + +#include "gbdt.h" +#include "score_updater.hpp" namespace LightGBM { diff --git a/src/boosting/prediction_early_stop.cpp b/src/boosting/prediction_early_stop.cpp index 618dcb98f39..fb86ec44f8b 100644 --- a/src/boosting/prediction_early_stop.cpp +++ b/src/boosting/prediction_early_stop.cpp @@ -1,10 +1,11 @@ #include + #include +#include #include -#include #include -#include +#include namespace { diff --git a/src/boosting/rf.hpp b/src/boosting/rf.hpp index 2366d85dae2..335cffc6b75 100644 --- a/src/boosting/rf.hpp +++ b/src/boosting/rf.hpp @@ -3,13 +3,16 @@ #include #include -#include "score_updater.hpp" -#include "gbdt.h" -#include -#include #include +#include #include +#include +#include +#include + +#include "gbdt.h" +#include "score_updater.hpp" namespace LightGBM { /*! diff --git a/src/boosting/score_updater.hpp b/src/boosting/score_updater.hpp index 4c0ad708c29..fc7c8023ee6 100644 --- a/src/boosting/score_updater.hpp +++ b/src/boosting/score_updater.hpp @@ -1,14 +1,14 @@ #ifndef LIGHTGBM_BOOSTING_SCORE_UPDATER_HPP_ #define LIGHTGBM_BOOSTING_SCORE_UPDATER_HPP_ - -#include -#include #include +#include #include #include +#include #include +#include namespace LightGBM { /*! diff --git a/src/c_api.cpp b/src/c_api.cpp index 563a98d5766..d9fc2a92ccd 100644 --- a/src/c_api.cpp +++ b/src/c_api.cpp @@ -1,29 +1,28 @@ #include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include #include -#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include -#include -#include #include -#include +#include +#include #include -#include #include -#include +#include +#include -#include "./application/predictor.hpp" +#include "application/predictor.hpp" namespace LightGBM { diff --git a/src/io/bin.cpp b/src/io/bin.cpp index 3f078b2b6f0..e599db2e678 100644 --- a/src/io/bin.cpp +++ b/src/io/bin.cpp @@ -3,18 +3,15 @@ #include #include -#include "dense_bin.hpp" -#include "dense_nbits_bin.hpp" -#include "sparse_bin.hpp" -#include "ordered_sparse_bin.hpp" - +#include #include -#include #include +#include -#include -#include -#include +#include "dense_bin.hpp" +#include "dense_nbits_bin.hpp" +#include "ordered_sparse_bin.hpp" +#include "sparse_bin.hpp" namespace LightGBM { diff --git a/src/io/config.cpp b/src/io/config.cpp index 7ecf3b31c30..36891e28430 100644 --- a/src/io/config.cpp +++ b/src/io/config.cpp @@ -1,13 +1,9 @@ #include #include -#include #include +#include -#include -#include -#include -#include #include namespace LightGBM { diff --git a/src/io/dataset.cpp b/src/io/dataset.cpp index 7eeee54a181..e705f02652c 100644 --- a/src/io/dataset.cpp +++ b/src/io/dataset.cpp @@ -1,18 +1,15 @@ #include + #include +#include #include #include -#include +#include #include #include -#include -#include -#include -#include -#include -#include #include +#include namespace LightGBM { diff --git a/src/io/dataset_loader.cpp b/src/io/dataset_loader.cpp index 3bb9a4c0e52..2c908d1da80 100644 --- a/src/io/dataset_loader.cpp +++ b/src/io/dataset_loader.cpp @@ -1,11 +1,9 @@ #include -#include -#include -#include - #include - +#include +#include +#include namespace LightGBM { diff --git a/src/io/dense_bin.hpp b/src/io/dense_bin.hpp index c074cf68bed..ec522e07f6f 100644 --- a/src/io/dense_bin.hpp +++ b/src/io/dense_bin.hpp @@ -3,9 +3,9 @@ #include -#include -#include #include +#include +#include namespace LightGBM { diff --git a/src/io/dense_nbits_bin.hpp b/src/io/dense_nbits_bin.hpp index 245d569f1c9..b035989cfaa 100644 --- a/src/io/dense_nbits_bin.hpp +++ b/src/io/dense_nbits_bin.hpp @@ -3,9 +3,9 @@ #include -#include -#include #include +#include +#include namespace LightGBM { diff --git a/src/io/file_io.cpp b/src/io/file_io.cpp index 82811ba99fd..caab343b194 100644 --- a/src/io/file_io.cpp +++ b/src/io/file_io.cpp @@ -1,9 +1,11 @@ #include + #include #include #include #include + #ifdef USE_HDFS #include #endif diff --git a/src/io/json11.cpp b/src/io/json11.cpp index d6a43565f83..7ed07947b30 100644 --- a/src/io/json11.cpp +++ b/src/io/json11.cpp @@ -20,11 +20,12 @@ */ #include + +#include #include #include -#include #include -#include +#include namespace json11 { diff --git a/src/io/metadata.cpp b/src/io/metadata.cpp index 628abd46404..0fc7d238769 100644 --- a/src/io/metadata.cpp +++ b/src/io/metadata.cpp @@ -1,9 +1,8 @@ #include - #include -#include #include +#include namespace LightGBM { diff --git a/src/io/ordered_sparse_bin.hpp b/src/io/ordered_sparse_bin.hpp index b069da8884b..c95319cb5b3 100644 --- a/src/io/ordered_sparse_bin.hpp +++ b/src/io/ordered_sparse_bin.hpp @@ -3,12 +3,12 @@ #include -#include +#include #include - -#include +#include #include -#include +#include +#include #include "sparse_bin.hpp" diff --git a/src/io/parser.cpp b/src/io/parser.cpp index 8c1aa4161bb..645968567a5 100644 --- a/src/io/parser.cpp +++ b/src/io/parser.cpp @@ -1,8 +1,9 @@ #include "parser.hpp" -#include +#include #include #include +#include #include namespace LightGBM { diff --git a/src/io/parser.hpp b/src/io/parser.hpp index 20a5a3b51ad..433c13968ac 100644 --- a/src/io/parser.hpp +++ b/src/io/parser.hpp @@ -1,14 +1,13 @@ #ifndef LIGHTGBM_IO_PARSER_HPP_ #define LIGHTGBM_IO_PARSER_HPP_ -#include +#include #include #include - #include -#include #include +#include namespace LightGBM { diff --git a/src/io/sparse_bin.hpp b/src/io/sparse_bin.hpp index fe4981ee189..75cacc5d845 100644 --- a/src/io/sparse_bin.hpp +++ b/src/io/sparse_bin.hpp @@ -1,15 +1,15 @@ #ifndef LIGHTGBM_IO_SPARSE_BIN_HPP_ #define LIGHTGBM_IO_SPARSE_BIN_HPP_ -#include - #include - +#include #include -#include -#include #include +#include +#include +#include +#include #include namespace LightGBM { diff --git a/src/io/tree.cpp b/src/io/tree.cpp index 5ab1c88af0c..85fd1a4d82d 100644 --- a/src/io/tree.cpp +++ b/src/io/tree.cpp @@ -1,17 +1,12 @@ #include -#include -#include - #include +#include +#include -#include -#include #include -#include -#include -#include #include +#include namespace LightGBM { diff --git a/src/lightgbm_R.cpp b/src/lightgbm_R.cpp index 22f59dad42d..a9f7e8cf9c5 100644 --- a/src/lightgbm_R.cpp +++ b/src/lightgbm_R.cpp @@ -1,19 +1,17 @@ #include +#include #include #include #include -#include -#include #include -#include -#include #include -#include -#include +#include #include - +#include +#include +#include #define COL_MAJOR (0) diff --git a/src/main.cpp b/src/main.cpp index 7ec69536338..aa37cf57b07 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,7 @@ -#include #include +#include + int main(int argc, char** argv) { try { LightGBM::Application app(argc, argv); diff --git a/src/metric/binary_metric.hpp b/src/metric/binary_metric.hpp index 1758bd6fb45..c985f1f0378 100644 --- a/src/metric/binary_metric.hpp +++ b/src/metric/binary_metric.hpp @@ -2,13 +2,13 @@ #define LIGHTGBM_METRIC_BINARY_METRIC_HPP_ #include - -#include #include +#include +#include #include -#include #include +#include namespace LightGBM { diff --git a/src/metric/dcg_calculator.cpp b/src/metric/dcg_calculator.cpp index af620efcddd..a940391b142 100644 --- a/src/metric/dcg_calculator.cpp +++ b/src/metric/dcg_calculator.cpp @@ -1,11 +1,9 @@ #include - #include +#include #include - #include -#include namespace LightGBM { diff --git a/src/metric/map_metric.hpp b/src/metric/map_metric.hpp index 4143c56708d..ab5119cd01f 100644 --- a/src/metric/map_metric.hpp +++ b/src/metric/map_metric.hpp @@ -1,12 +1,13 @@ #ifndef LIGHTGBM_METRIC_MAP_METRIC_HPP_ #define LIGHTGBM_METRIC_MAP_METRIC_HPP_ -#include +#include #include #include - #include +#include +#include #include #include diff --git a/src/metric/metric.cpp b/src/metric/metric.cpp index 52463e4d8d1..36cd6129a51 100644 --- a/src/metric/metric.cpp +++ b/src/metric/metric.cpp @@ -1,9 +1,10 @@ #include -#include "regression_metric.hpp" + #include "binary_metric.hpp" -#include "rank_metric.hpp" #include "map_metric.hpp" #include "multiclass_metric.hpp" +#include "rank_metric.hpp" +#include "regression_metric.hpp" #include "xentropy_metric.hpp" namespace LightGBM { diff --git a/src/metric/multiclass_metric.hpp b/src/metric/multiclass_metric.hpp index 3c661feb4ae..bccc0a5c829 100644 --- a/src/metric/multiclass_metric.hpp +++ b/src/metric/multiclass_metric.hpp @@ -2,10 +2,11 @@ #define LIGHTGBM_METRIC_MULTICLASS_METRIC_HPP_ #include - #include +#include #include +#include namespace LightGBM { /*! diff --git a/src/metric/rank_metric.hpp b/src/metric/rank_metric.hpp index b807131c7e4..75273d04774 100644 --- a/src/metric/rank_metric.hpp +++ b/src/metric/rank_metric.hpp @@ -2,11 +2,11 @@ #define LIGHTGBM_METRIC_RANK_METRIC_HPP_ #include - #include #include #include +#include #include #include diff --git a/src/metric/regression_metric.hpp b/src/metric/regression_metric.hpp index 27025d434b8..935e5ba9809 100644 --- a/src/metric/regression_metric.hpp +++ b/src/metric/regression_metric.hpp @@ -2,10 +2,12 @@ #define LIGHTGBM_METRIC_REGRESSION_METRIC_HPP_ #include - #include +#include +#include #include +#include namespace LightGBM { /*! diff --git a/src/metric/xentropy_metric.hpp b/src/metric/xentropy_metric.hpp index 843b69accce..617008d0d51 100644 --- a/src/metric/xentropy_metric.hpp +++ b/src/metric/xentropy_metric.hpp @@ -1,15 +1,15 @@ #ifndef LIGHTGBM_METRIC_XENTROPY_METRIC_HPP_ #define LIGHTGBM_METRIC_XENTROPY_METRIC_HPP_ -#include #include - -#include +#include #include +#include +#include #include -#include #include +#include /* * Implements three related metrics: diff --git a/src/network/linker_topo.cpp b/src/network/linker_topo.cpp index ec6de68810d..d7eeb375f7e 100644 --- a/src/network/linker_topo.cpp +++ b/src/network/linker_topo.cpp @@ -1,11 +1,10 @@ #include - #include #include #include -#include #include +#include namespace LightGBM { diff --git a/src/network/linkers.h b/src/network/linkers.h index c01db9300cc..c4f6fa7cec5 100644 --- a/src/network/linkers.h +++ b/src/network/linkers.h @@ -1,18 +1,17 @@ #ifndef LIGHTGBM_NETWORK_LINKERS_H_ #define LIGHTGBM_NETWORK_LINKERS_H_ -#include -#include #include +#include +#include - +#include #include #include #include +#include #include #include -#include -#include #ifdef USE_SOCKET #include "socket_wrapper.hpp" diff --git a/src/network/linkers_mpi.cpp b/src/network/linkers_mpi.cpp index 097e55d89cb..fbd50ad3744 100644 --- a/src/network/linkers_mpi.cpp +++ b/src/network/linkers_mpi.cpp @@ -1,4 +1,5 @@ #ifdef USE_MPI + #include "linkers.h" namespace LightGBM { diff --git a/src/network/linkers_socket.cpp b/src/network/linkers_socket.cpp index b18eb49686e..448a53b0541 100644 --- a/src/network/linkers_socket.cpp +++ b/src/network/linkers_socket.cpp @@ -1,19 +1,18 @@ #ifdef USE_SOCKET -#include "linkers.h" +#include #include #include -#include - +#include +#include #include - +#include #include #include #include -#include -#include -#include + +#include "linkers.h" namespace LightGBM { diff --git a/src/network/network.cpp b/src/network/network.cpp index 4f1ebaa8e20..6c9a9bd43ad 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -2,10 +2,10 @@ #include -#include "linkers.h" - -#include #include +#include + +#include "linkers.h" namespace LightGBM { diff --git a/src/network/socket_wrapper.hpp b/src/network/socket_wrapper.hpp index f17eb2041b3..a9824c3f5e1 100644 --- a/src/network/socket_wrapper.hpp +++ b/src/network/socket_wrapper.hpp @@ -28,10 +28,9 @@ #include +#include #include - #include -#include #ifdef _MSC_VER #pragma comment(lib, "Ws2_32.lib") diff --git a/src/objective/binary_objective.hpp b/src/objective/binary_objective.hpp index aa209e0d266..0521ed919a8 100644 --- a/src/objective/binary_objective.hpp +++ b/src/objective/binary_objective.hpp @@ -3,8 +3,11 @@ #include -#include +#include +#include #include +#include +#include namespace LightGBM { /*! diff --git a/src/objective/multiclass_objective.hpp b/src/objective/multiclass_objective.hpp index 7c34e679878..13f68a7a02a 100644 --- a/src/objective/multiclass_objective.hpp +++ b/src/objective/multiclass_objective.hpp @@ -3,8 +3,11 @@ #include -#include +#include +#include #include +#include +#include #include #include "binary_objective.hpp" diff --git a/src/objective/objective_function.cpp b/src/objective/objective_function.cpp index 145b8f43adf..a5486fb7350 100644 --- a/src/objective/objective_function.cpp +++ b/src/objective/objective_function.cpp @@ -1,8 +1,9 @@ #include -#include "regression_objective.hpp" + #include "binary_objective.hpp" -#include "rank_objective.hpp" #include "multiclass_objective.hpp" +#include "rank_objective.hpp" +#include "regression_objective.hpp" #include "xentropy_objective.hpp" namespace LightGBM { diff --git a/src/objective/rank_objective.hpp b/src/objective/rank_objective.hpp index b926ac2deee..49968e5cbf8 100644 --- a/src/objective/rank_objective.hpp +++ b/src/objective/rank_objective.hpp @@ -1,16 +1,16 @@ #ifndef LIGHTGBM_OBJECTIVE_RANK_OBJECTIVE_HPP_ #define LIGHTGBM_OBJECTIVE_RANK_OBJECTIVE_HPP_ -#include #include +#include +#include +#include +#include +#include #include #include -#include - #include -#include -#include namespace LightGBM { /*! diff --git a/src/objective/regression_objective.hpp b/src/objective/regression_objective.hpp index e95c6aeb40b..982a24b0e0c 100644 --- a/src/objective/regression_objective.hpp +++ b/src/objective/regression_objective.hpp @@ -1,11 +1,14 @@ #ifndef LIGHTGBM_OBJECTIVE_REGRESSION_OBJECTIVE_HPP_ #define LIGHTGBM_OBJECTIVE_REGRESSION_OBJECTIVE_HPP_ -#include #include - +#include #include +#include +#include +#include + namespace LightGBM { #define PercentileFun(T, data_reader, cnt_data, alpha) {\ diff --git a/src/objective/xentropy_objective.hpp b/src/objective/xentropy_objective.hpp index 0e88fe24334..9a21a56bf78 100644 --- a/src/objective/xentropy_objective.hpp +++ b/src/objective/xentropy_objective.hpp @@ -1,13 +1,15 @@ #ifndef LIGHTGBM_OBJECTIVE_XENTROPY_OBJECTIVE_HPP_ #define LIGHTGBM_OBJECTIVE_XENTROPY_OBJECTIVE_HPP_ -#include #include - +#include #include -#include +#include +#include #include +#include +#include /* * Implements gradients and hessians for the following point losses. diff --git a/src/treelearner/data_parallel_tree_learner.cpp b/src/treelearner/data_parallel_tree_learner.cpp index 1b1d4d080eb..5b6ba5f54d7 100644 --- a/src/treelearner/data_parallel_tree_learner.cpp +++ b/src/treelearner/data_parallel_tree_learner.cpp @@ -1,10 +1,9 @@ -#include "parallel_tree_learner.h" - #include - #include #include +#include "parallel_tree_learner.h" + namespace LightGBM { template diff --git a/src/treelearner/data_partition.hpp b/src/treelearner/data_partition.hpp index d7956247a53..16931a0509c 100644 --- a/src/treelearner/data_partition.hpp +++ b/src/treelearner/data_partition.hpp @@ -1,13 +1,12 @@ #ifndef LIGHTGBM_TREELEARNER_DATA_PARTITION_HPP_ #define LIGHTGBM_TREELEARNER_DATA_PARTITION_HPP_ -#include #include - +#include #include +#include #include - #include namespace LightGBM { diff --git a/src/treelearner/feature_histogram.hpp b/src/treelearner/feature_histogram.hpp index 60a78aab043..767291783b6 100644 --- a/src/treelearner/feature_histogram.hpp +++ b/src/treelearner/feature_histogram.hpp @@ -1,13 +1,17 @@ #ifndef LIGHTGBM_TREELEARNER_FEATURE_HISTOGRAM_HPP_ #define LIGHTGBM_TREELEARNER_FEATURE_HISTOGRAM_HPP_ -#include "split_info.hpp" - -#include #include +#include -#include +#include #include +#include +#include +#include +#include + +#include "split_info.hpp" namespace LightGBM { diff --git a/src/treelearner/feature_parallel_tree_learner.cpp b/src/treelearner/feature_parallel_tree_learner.cpp index bdfcb5c157a..eb29d0d4926 100644 --- a/src/treelearner/feature_parallel_tree_learner.cpp +++ b/src/treelearner/feature_parallel_tree_learner.cpp @@ -1,9 +1,8 @@ -#include "parallel_tree_learner.h" - #include - #include +#include "parallel_tree_learner.h" + namespace LightGBM { diff --git a/src/treelearner/gpu_tree_learner.cpp b/src/treelearner/gpu_tree_learner.cpp index 8fb6196e930..9bb7dd94218 100644 --- a/src/treelearner/gpu_tree_learner.cpp +++ b/src/treelearner/gpu_tree_learner.cpp @@ -1,15 +1,15 @@ #ifdef USE_GPU + #include "gpu_tree_learner.h" -#include "../io/dense_bin.hpp" -#include "../io/dense_nbits_bin.hpp" -#include -#include #include +#include +#include #include -#include +#include "../io/dense_bin.hpp" +#include "../io/dense_nbits_bin.hpp" #define GPU_DEBUG 0 diff --git a/src/treelearner/gpu_tree_learner.h b/src/treelearner/gpu_tree_learner.h index 26761f5e9fa..0ced99db4ab 100644 --- a/src/treelearner/gpu_tree_learner.h +++ b/src/treelearner/gpu_tree_learner.h @@ -1,22 +1,24 @@ #ifndef LIGHTGBM_TREELEARNER_GPU_TREE_LEARNER_H_ #define LIGHTGBM_TREELEARNER_GPU_TREE_LEARNER_H_ -#include -#include #include -#include #include -#include "feature_histogram.hpp" -#include "serial_tree_learner.h" -#include "data_partition.hpp" -#include "split_info.hpp" -#include "leaf_splits.hpp" +#include +#include +#include -#include -#include -#include +#include #include +#include #include +#include +#include + +#include "data_partition.hpp" +#include "feature_histogram.hpp" +#include "leaf_splits.hpp" +#include "serial_tree_learner.h" +#include "split_info.hpp" #ifdef USE_GPU diff --git a/src/treelearner/leaf_splits.hpp b/src/treelearner/leaf_splits.hpp index 24863a34186..f919a46490c 100644 --- a/src/treelearner/leaf_splits.hpp +++ b/src/treelearner/leaf_splits.hpp @@ -1,13 +1,13 @@ #ifndef LIGHTGBM_TREELEARNER_LEAF_SPLITS_HPP_ #define LIGHTGBM_TREELEARNER_LEAF_SPLITS_HPP_ -#include - #include -#include "data_partition.hpp" +#include #include +#include "data_partition.hpp" + namespace LightGBM { /*! diff --git a/src/treelearner/parallel_tree_learner.h b/src/treelearner/parallel_tree_learner.h index e9a96b1a806..a232c0a14e0 100644 --- a/src/treelearner/parallel_tree_learner.h +++ b/src/treelearner/parallel_tree_learner.h @@ -1,15 +1,15 @@ #ifndef LIGHTGBM_TREELEARNER_PARALLEL_TREE_LEARNER_H_ #define LIGHTGBM_TREELEARNER_PARALLEL_TREE_LEARNER_H_ -#include "serial_tree_learner.h" -#include "gpu_tree_learner.h" #include - #include #include -#include #include +#include + +#include "gpu_tree_learner.h" +#include "serial_tree_learner.h" namespace LightGBM { diff --git a/src/treelearner/serial_tree_learner.cpp b/src/treelearner/serial_tree_learner.cpp index 65c63ab28a7..c6def8beeb2 100644 --- a/src/treelearner/serial_tree_learner.cpp +++ b/src/treelearner/serial_tree_learner.cpp @@ -2,13 +2,13 @@ #include #include - #include #include #include -#include #include +#include +#include namespace LightGBM { diff --git a/src/treelearner/serial_tree_learner.h b/src/treelearner/serial_tree_learner.h index 90facbb06a3..f8c277b4d63 100644 --- a/src/treelearner/serial_tree_learner.h +++ b/src/treelearner/serial_tree_learner.h @@ -1,23 +1,24 @@ #ifndef LIGHTGBM_TREELEARNER_SERIAL_TREE_LEARNER_H_ #define LIGHTGBM_TREELEARNER_SERIAL_TREE_LEARNER_H_ -#include - -#include -#include #include #include +#include +#include +#include + +#include +#include +#include +#include +#include +#include -#include "feature_histogram.hpp" -#include "split_info.hpp" #include "data_partition.hpp" +#include "feature_histogram.hpp" #include "leaf_splits.hpp" +#include "split_info.hpp" -#include -#include -#include -#include -#include #ifdef USE_GPU // Use 4KBytes aligned allocator for ordered gradients and ordered hessians when GPU is enabled. // This is necessary to pin the two arrays in memory and make transferring faster. diff --git a/src/treelearner/split_info.hpp b/src/treelearner/split_info.hpp index 303f1a126aa..9557275d0d8 100644 --- a/src/treelearner/split_info.hpp +++ b/src/treelearner/split_info.hpp @@ -3,11 +3,12 @@ #include +#include #include #include #include -#include #include +#include namespace LightGBM { diff --git a/src/treelearner/tree_learner.cpp b/src/treelearner/tree_learner.cpp index 5263b137a7d..472fdb6200a 100644 --- a/src/treelearner/tree_learner.cpp +++ b/src/treelearner/tree_learner.cpp @@ -1,8 +1,8 @@ #include -#include "serial_tree_learner.h" #include "gpu_tree_learner.h" #include "parallel_tree_learner.h" +#include "serial_tree_learner.h" namespace LightGBM { diff --git a/src/treelearner/voting_parallel_tree_learner.cpp b/src/treelearner/voting_parallel_tree_learner.cpp index d4f1ef9ced6..b46c793eb55 100644 --- a/src/treelearner/voting_parallel_tree_learner.cpp +++ b/src/treelearner/voting_parallel_tree_learner.cpp @@ -1,11 +1,11 @@ -#include "parallel_tree_learner.h" - #include #include #include #include +#include "parallel_tree_learner.h" + namespace LightGBM { template