From 9db4b20c868341abe2a9fe52b652f7d9447ed406 Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Tue, 9 Jun 2020 00:43:06 -0700 Subject: [PATCH] Revert "[CI] Reorder #include to comply with cpplint 1.5.0 (#622)" (#624) This reverts commit 88abbf9857f9a1ec45a189e9b2bb87bdc196c013. --- include/dmlc/filesystem.h | 4 ++-- include/dmlc/logging.h | 6 +++--- include/dmlc/lua.h | 12 ++++++------ include/dmlc/thread_group.h | 6 +++--- src/data.cc | 4 ++-- src/data/csv_parser.h | 10 +++++----- src/data/disk_row_iter.h | 4 ++-- src/data/libfm_parser.h | 6 +++--- src/data/libsvm_parser.h | 6 +++--- src/data/parser.h | 2 +- src/data/row_block.h | 8 ++++---- src/data/text_parser.h | 8 ++++---- src/io.cc | 2 +- src/io/azure_filesys.h | 2 +- src/io/cached_input_split.h | 4 ++-- src/io/filesys.cc | 2 +- src/io/hdfs_filesys.cc | 2 +- src/io/hdfs_filesys.h | 6 +++--- src/io/indexed_recordio_split.cc | 4 ++-- src/io/indexed_recordio_split.h | 8 ++++---- src/io/input_split_base.cc | 2 +- src/io/input_split_base.h | 8 ++++---- src/io/line_split.cc | 2 +- src/io/line_split.h | 2 +- src/io/local_filesys.cc | 6 +++--- src/io/local_filesys.h | 2 +- src/io/recordio_split.cc | 2 +- src/io/recordio_split.h | 6 +++--- src/io/s3_filesys.cc | 18 ++++++++---------- src/io/s3_filesys.h | 2 +- src/io/single_file_split.h | 8 ++++---- src/io/single_threaded_input_split.h | 2 +- src/io/threaded_input_split.h | 2 +- src/io/uri_spec.h | 2 +- src/recordio.cc | 2 +- 35 files changed, 85 insertions(+), 87 deletions(-) diff --git a/include/dmlc/filesystem.h b/include/dmlc/filesystem.h index d53194072b..64d1073041 100644 --- a/include/dmlc/filesystem.h +++ b/include/dmlc/filesystem.h @@ -7,12 +7,12 @@ #ifndef DMLC_FILESYSTEM_H_ #define DMLC_FILESYSTEM_H_ +#include +#include #include #include #include #include -#include -#include /* platform specific headers */ #ifdef _WIN32 diff --git a/include/dmlc/logging.h b/include/dmlc/logging.h index a791ac4145..3ff42ae3b1 100644 --- a/include/dmlc/logging.h +++ b/include/dmlc/logging.h @@ -7,17 +7,17 @@ */ #ifndef DMLC_LOGGING_H_ #define DMLC_LOGGING_H_ -#include +#include +#include #include #include #include #include -#include -#include #include "./base.h" #if DMLC_LOG_STACK_TRACE #include +#include #include DMLC_EXECINFO_H #endif diff --git a/include/dmlc/lua.h b/include/dmlc/lua.h index 32a549e0b2..13aa7b73d2 100644 --- a/include/dmlc/lua.h +++ b/include/dmlc/lua.h @@ -29,6 +29,12 @@ #ifndef DMLC_LUA_H_ #define DMLC_LUA_H_ +extern "C" { +#include +#include +#include +} + #include #include #include @@ -40,12 +46,6 @@ #include #include -extern "C" { -#include -#include -#include -} - #include "./base.h" #include "./logging.h" #include "./thread_local.h" diff --git a/include/dmlc/thread_group.h b/include/dmlc/thread_group.h index 2cca804b59..ced3ae0acd 100644 --- a/include/dmlc/thread_group.h +++ b/include/dmlc/thread_group.h @@ -6,6 +6,9 @@ #ifndef DMLC_THREAD_GROUP_H_ #define DMLC_THREAD_GROUP_H_ +#include +#include +#include #include #include #include @@ -14,9 +17,6 @@ #include #include #include -#include -#include -#include #if defined(DMLC_USE_CXX14) || __cplusplus > 201103L /* C++14 */ #include #endif diff --git a/src/data.cc b/src/data.cc index c18f1c4130..ed619cbad9 100644 --- a/src/data.cc +++ b/src/data.cc @@ -1,11 +1,11 @@ // Copyright by Contributors -#include -#include #include #include #include #include #include +#include +#include #include "io/uri_spec.h" #include "data/parser.h" #include "data/basic_row_iter.h" diff --git a/src/data/csv_parser.h b/src/data/csv_parser.h index 78934344b0..9b945a657f 100644 --- a/src/data/csv_parser.h +++ b/src/data/csv_parser.h @@ -7,14 +7,14 @@ #ifndef DMLC_DATA_CSV_PARSER_H_ #define DMLC_DATA_CSV_PARSER_H_ -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include #include "./row_block.h" #include "./text_parser.h" diff --git a/src/data/disk_row_iter.h b/src/data/disk_row_iter.h index f41d128009..718d62a62f 100644 --- a/src/data/disk_row_iter.h +++ b/src/data/disk_row_iter.h @@ -8,13 +8,13 @@ #ifndef DMLC_DATA_DISK_ROW_ITER_H_ #define DMLC_DATA_DISK_ROW_ITER_H_ -#include -#include #include #include #include #include #include +#include +#include #include "./row_block.h" #include "./libsvm_parser.h" diff --git a/src/data/libfm_parser.h b/src/data/libfm_parser.h index 1939106dd0..a897bd5511 100644 --- a/src/data/libfm_parser.h +++ b/src/data/libfm_parser.h @@ -7,14 +7,14 @@ #ifndef DMLC_DATA_LIBFM_PARSER_H_ #define DMLC_DATA_LIBFM_PARSER_H_ +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include "./row_block.h" #include "./text_parser.h" diff --git a/src/data/libsvm_parser.h b/src/data/libsvm_parser.h index 57cb4b22af..cc9d3ed267 100644 --- a/src/data/libsvm_parser.h +++ b/src/data/libsvm_parser.h @@ -7,14 +7,14 @@ #ifndef DMLC_DATA_LIBSVM_PARSER_H_ #define DMLC_DATA_LIBSVM_PARSER_H_ +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include "./row_block.h" #include "./text_parser.h" diff --git a/src/data/parser.h b/src/data/parser.h index 5a9b94bbd5..1701c24619 100644 --- a/src/data/parser.h +++ b/src/data/parser.h @@ -7,10 +7,10 @@ #ifndef DMLC_DATA_PARSER_H_ #define DMLC_DATA_PARSER_H_ -#include #include #include #include +#include #include "./row_block.h" namespace dmlc { diff --git a/src/data/row_block.h b/src/data/row_block.h index 4bea0090b7..7e0e32828c 100644 --- a/src/data/row_block.h +++ b/src/data/row_block.h @@ -8,13 +8,13 @@ #ifndef DMLC_DATA_ROW_BLOCK_H_ #define DMLC_DATA_ROW_BLOCK_H_ -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include namespace dmlc { namespace data { diff --git a/src/data/text_parser.h b/src/data/text_parser.h index a3b482f559..97524b7f37 100644 --- a/src/data/text_parser.h +++ b/src/data/text_parser.h @@ -7,14 +7,14 @@ #ifndef DMLC_DATA_TEXT_PARSER_H_ #define DMLC_DATA_TEXT_PARSER_H_ -#include +#include +#include +#include #include #include #include #include -#include -#include -#include +#include #include "./row_block.h" #include "./parser.h" diff --git a/src/io.cc b/src/io.cc index 3f11683418..732f304abd 100644 --- a/src/io.cc +++ b/src/io.cc @@ -1,9 +1,9 @@ // Copyright by Contributors -#include #include #include #include +#include #include "io/uri_spec.h" #include "io/line_split.h" #include "io/recordio_split.h" diff --git a/src/io/azure_filesys.h b/src/io/azure_filesys.h index beff9d2d40..8f22d8930f 100644 --- a/src/io/azure_filesys.h +++ b/src/io/azure_filesys.h @@ -7,9 +7,9 @@ #ifndef DMLC_IO_AZURE_FILESYS_H_ #define DMLC_IO_AZURE_FILESYS_H_ +#include #include #include -#include namespace dmlc { namespace io { diff --git a/src/io/cached_input_split.h b/src/io/cached_input_split.h index e245b7a05a..2a264ef637 100644 --- a/src/io/cached_input_split.h +++ b/src/io/cached_input_split.h @@ -9,13 +9,13 @@ #ifndef DMLC_IO_CACHED_INPUT_SPLIT_H_ #define DMLC_IO_CACHED_INPUT_SPLIT_H_ -#include -#include #include // this code depends on c++11 #if DMLC_ENABLE_STD_THREAD #include +#include +#include #include "./input_split_base.h" namespace dmlc { diff --git a/src/io/filesys.cc b/src/io/filesys.cc index bc8c9b1263..086bc8d898 100644 --- a/src/io/filesys.cc +++ b/src/io/filesys.cc @@ -1,7 +1,7 @@ // Copyright by Contributors -#include #include +#include namespace dmlc { namespace io { diff --git a/src/io/hdfs_filesys.cc b/src/io/hdfs_filesys.cc index 5cd9bf8397..6d22750731 100644 --- a/src/io/hdfs_filesys.cc +++ b/src/io/hdfs_filesys.cc @@ -1,7 +1,7 @@ // Copyright by Contributors +#include #include #include -#include #include "./hdfs_filesys.h" namespace dmlc { diff --git a/src/io/hdfs_filesys.h b/src/io/hdfs_filesys.h index 77d7661adf..ef057b0d19 100644 --- a/src/io/hdfs_filesys.h +++ b/src/io/hdfs_filesys.h @@ -6,14 +6,14 @@ */ #ifndef DMLC_IO_HDFS_FILESYS_H_ #define DMLC_IO_HDFS_FILESYS_H_ -#include -#include - extern "C" { #include } #include +#include +#include + namespace dmlc { namespace io { /*! \brief HDFS file system */ diff --git a/src/io/indexed_recordio_split.cc b/src/io/indexed_recordio_split.cc index 0896c85ca5..8a32ad8648 100644 --- a/src/io/indexed_recordio_split.cc +++ b/src/io/indexed_recordio_split.cc @@ -1,9 +1,9 @@ // Copyright by Contributors -#include -#include #include #include #include +#include +#include #include "./indexed_recordio_split.h" namespace dmlc { diff --git a/src/io/indexed_recordio_split.h b/src/io/indexed_recordio_split.h index 3e0a8b29a9..8c34ed7940 100644 --- a/src/io/indexed_recordio_split.h +++ b/src/io/indexed_recordio_split.h @@ -6,14 +6,14 @@ #ifndef DMLC_IO_INDEXED_RECORDIO_SPLIT_H_ #define DMLC_IO_INDEXED_RECORDIO_SPLIT_H_ +#include +#include #include +#include #include +#include #include #include -#include -#include -#include -#include #include "./input_split_base.h" namespace dmlc { diff --git a/src/io/input_split_base.cc b/src/io/input_split_base.cc index 1f3b281ad3..a82663340f 100644 --- a/src/io/input_split_base.cc +++ b/src/io/input_split_base.cc @@ -1,7 +1,7 @@ // Copyright by Contributors -#include #include #include +#include #include "./line_split.h" #if DMLC_USE_REGEX diff --git a/src/io/input_split_base.h b/src/io/input_split_base.h index aad1dd6e15..366278864d 100644 --- a/src/io/input_split_base.h +++ b/src/io/input_split_base.h @@ -7,13 +7,13 @@ #ifndef DMLC_IO_INPUT_SPLIT_BASE_H_ #define DMLC_IO_INPUT_SPLIT_BASE_H_ +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include namespace dmlc { namespace io { diff --git a/src/io/line_split.cc b/src/io/line_split.cc index df61f2efe2..3096a135f7 100644 --- a/src/io/line_split.cc +++ b/src/io/line_split.cc @@ -1,7 +1,7 @@ // Copyright by Contributors -#include #include #include +#include #include "./line_split.h" namespace dmlc { diff --git a/src/io/line_split.h b/src/io/line_split.h index 45cf1ee17b..d0d525e130 100644 --- a/src/io/line_split.h +++ b/src/io/line_split.h @@ -7,11 +7,11 @@ #ifndef DMLC_IO_LINE_SPLIT_H_ #define DMLC_IO_LINE_SPLIT_H_ +#include #include #include #include #include -#include #include "./input_split_base.h" namespace dmlc { diff --git a/src/io/local_filesys.cc b/src/io/local_filesys.cc index ce35058a78..ec738e3a63 100644 --- a/src/io/local_filesys.cc +++ b/src/io/local_filesys.cc @@ -1,11 +1,11 @@ // Copyright by Contributors -extern "C" { +#include +#include #include +extern "C" { #include } -#include -#include #ifndef _WIN32 extern "C" { #include diff --git a/src/io/local_filesys.h b/src/io/local_filesys.h index d3a7f14f4a..a1b5f5cf87 100644 --- a/src/io/local_filesys.h +++ b/src/io/local_filesys.h @@ -7,8 +7,8 @@ #ifndef DMLC_IO_LOCAL_FILESYS_H_ #define DMLC_IO_LOCAL_FILESYS_H_ -#include #include +#include namespace dmlc { namespace io { diff --git a/src/io/recordio_split.cc b/src/io/recordio_split.cc index 10ee9cd96f..78c5408cee 100644 --- a/src/io/recordio_split.cc +++ b/src/io/recordio_split.cc @@ -1,7 +1,7 @@ // Copyright by Contributors -#include #include #include +#include #include "./recordio_split.h" namespace dmlc { diff --git a/src/io/recordio_split.h b/src/io/recordio_split.h index 6d180a93f0..63386b8c07 100644 --- a/src/io/recordio_split.h +++ b/src/io/recordio_split.h @@ -7,12 +7,12 @@ #ifndef DMLC_IO_RECORDIO_SPLIT_H_ #define DMLC_IO_RECORDIO_SPLIT_H_ +#include +#include #include -#include #include +#include #include -#include -#include #include "./input_split_base.h" namespace dmlc { diff --git a/src/io/s3_filesys.cc b/src/io/s3_filesys.cc index 0c01cdffbf..778613092f 100644 --- a/src/io/s3_filesys.cc +++ b/src/io/s3_filesys.cc @@ -1,16 +1,6 @@ // Copyright by Contributors extern "C" { #include -} -#include -#include -#include -#include -#include -#include -#include -#include -extern "C" { #include #include #include @@ -18,6 +8,14 @@ extern "C" { } #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "./s3_filesys.h" diff --git a/src/io/s3_filesys.h b/src/io/s3_filesys.h index 736043a32a..3cf6640e6b 100644 --- a/src/io/s3_filesys.h +++ b/src/io/s3_filesys.h @@ -7,9 +7,9 @@ #ifndef DMLC_IO_S3_FILESYS_H_ #define DMLC_IO_S3_FILESYS_H_ +#include #include #include -#include namespace dmlc { namespace io { diff --git a/src/io/single_file_split.h b/src/io/single_file_split.h index a423670ad3..b786a747f6 100644 --- a/src/io/single_file_split.h +++ b/src/io/single_file_split.h @@ -7,13 +7,13 @@ #ifndef DMLC_IO_SINGLE_FILE_SPLIT_H_ #define DMLC_IO_SINGLE_FILE_SPLIT_H_ -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include #ifdef _WIN32 #define stat_struct __stat64 diff --git a/src/io/single_threaded_input_split.h b/src/io/single_threaded_input_split.h index 0cc7d52201..05dd471777 100644 --- a/src/io/single_threaded_input_split.h +++ b/src/io/single_threaded_input_split.h @@ -2,9 +2,9 @@ #ifndef DMLC_IO_SINGLE_THREADED_INPUT_SPLIT_H_ #define DMLC_IO_SINGLE_THREADED_INPUT_SPLIT_H_ -#include #include #include +#include #include "./input_split_base.h" namespace dmlc { diff --git a/src/io/threaded_input_split.h b/src/io/threaded_input_split.h index 6a66548c5b..0dc2beb620 100644 --- a/src/io/threaded_input_split.h +++ b/src/io/threaded_input_split.h @@ -7,11 +7,11 @@ #ifndef DMLC_IO_THREADED_INPUT_SPLIT_H_ #define DMLC_IO_THREADED_INPUT_SPLIT_H_ -#include #include // this code depends on c++11 #if DMLC_ENABLE_STD_THREAD #include +#include #include "./input_split_base.h" namespace dmlc { diff --git a/src/io/uri_spec.h b/src/io/uri_spec.h index 0711365828..c9c4b38495 100644 --- a/src/io/uri_spec.h +++ b/src/io/uri_spec.h @@ -9,12 +9,12 @@ #ifndef DMLC_IO_URI_SPEC_H_ #define DMLC_IO_URI_SPEC_H_ +#include #include #include #include #include #include -#include namespace dmlc { namespace io { diff --git a/src/recordio.cc b/src/recordio.cc index ebc86bafa9..1bd712399b 100644 --- a/src/recordio.cc +++ b/src/recordio.cc @@ -1,9 +1,9 @@ // Copyright by Contributors -#include #include #include #include +#include namespace dmlc {