From 92f00dd3a6a84315a302e09eead55506369c1104 Mon Sep 17 00:00:00 2001 From: Jeff Donahue Date: Fri, 1 Aug 2014 20:14:42 -0700 Subject: [PATCH] Fix header alphabetization lint errors. --- examples/cifar10/convert_cifar_data.cpp | 10 +++++----- examples/mnist/convert_mnist_data.cpp | 10 +++++----- include/caffe/blob.hpp | 2 +- include/caffe/common_layers.hpp | 4 ++-- include/caffe/data_layers.hpp | 6 +++--- include/caffe/filler.hpp | 4 ++-- include/caffe/loss_layers.hpp | 4 ++-- include/caffe/neuron_layers.hpp | 2 +- include/caffe/test/test_caffe_main.hpp | 2 +- include/caffe/util/io.hpp | 2 +- include/caffe/util/rng.hpp | 8 +++++--- matlab/caffe/matcaffe.cpp | 1 + src/caffe/layer_factory.cpp | 2 +- src/caffe/layers/accuracy_layer.cpp | 4 ++-- src/caffe/layers/concat_layer.cpp | 2 +- src/caffe/layers/concat_layer.cu | 2 +- src/caffe/layers/conv_layer.cpp | 4 ++-- src/caffe/layers/conv_layer.cu | 4 ++-- src/caffe/layers/data_layer.cpp | 4 ++-- src/caffe/layers/data_layer.cu | 8 ++++---- src/caffe/layers/dropout_layer.cpp | 2 +- src/caffe/layers/dropout_layer.cu | 2 +- src/caffe/layers/eltwise_layer.cpp | 2 +- src/caffe/layers/eltwise_layer.cu | 2 +- src/caffe/layers/euclidean_loss_layer.cpp | 4 ++-- src/caffe/layers/euclidean_loss_layer.cu | 4 ++-- src/caffe/layers/flatten_layer.cpp | 2 +- src/caffe/layers/flatten_layer.cu | 2 +- src/caffe/layers/hdf5_data_layer.cpp | 4 ++-- src/caffe/layers/hinge_loss_layer.cpp | 6 +++--- src/caffe/layers/im2col_layer.cpp | 2 +- src/caffe/layers/im2col_layer.cu | 2 +- src/caffe/layers/image_data_layer.cpp | 9 +++------ src/caffe/layers/image_data_layer.cu | 7 ------- src/caffe/layers/infogain_loss_layer.cpp | 6 +++--- src/caffe/layers/inner_product_layer.cpp | 2 +- src/caffe/layers/inner_product_layer.cu | 2 +- src/caffe/layers/loss_layer.cpp | 6 +++--- src/caffe/layers/lrn_layer.cpp | 2 +- src/caffe/layers/lrn_layer.cu | 2 +- src/caffe/layers/multinomial_logistic_loss_layer.cpp | 6 +++--- src/caffe/layers/pooling_layer.cpp | 2 +- src/caffe/layers/pooling_layer.cu | 2 +- src/caffe/layers/power_layer.cpp | 2 +- src/caffe/layers/power_layer.cu | 2 +- src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp | 2 +- src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu | 2 +- src/caffe/layers/slice_layer.cpp | 4 ++-- src/caffe/layers/slice_layer.cu | 2 +- src/caffe/layers/softmax_layer.cpp | 2 +- src/caffe/layers/softmax_layer.cu | 2 +- src/caffe/layers/softmax_loss_layer.cpp | 2 +- src/caffe/layers/softmax_loss_layer.cu | 2 +- src/caffe/layers/split_layer.cpp | 2 +- src/caffe/layers/split_layer.cu | 2 +- src/caffe/layers/window_data_layer.cpp | 6 +++--- src/caffe/layers/window_data_layer.cu | 2 +- src/caffe/net.cpp | 5 +++-- src/caffe/test/test_accuracy_layer.cpp | 3 ++- src/caffe/test/test_argmax_layer.cpp | 2 +- src/caffe/test/test_benchmark.cpp | 4 +++- src/caffe/test/test_blob.cpp | 3 ++- src/caffe/test/test_common.cpp | 2 ++ src/caffe/test/test_concat_layer.cpp | 3 ++- src/caffe/test/test_convolution_layer.cpp | 3 ++- src/caffe/test/test_data_layer.cpp | 5 ++++- src/caffe/test/test_dummy_data_layer.cpp | 4 +++- src/caffe/test/test_eltwise_layer.cpp | 3 ++- src/caffe/test/test_euclidean_loss_layer.cpp | 3 ++- src/caffe/test/test_filler.cpp | 1 + src/caffe/test/test_flatten_layer.cpp | 3 ++- src/caffe/test/test_hdf5_output_layer.cpp | 4 +++- src/caffe/test/test_hdf5data_layer.cpp | 4 +++- src/caffe/test/test_hinge_loss_layer.cpp | 3 ++- src/caffe/test/test_im2col_kernel.cu | 3 ++- src/caffe/test/test_im2col_layer.cpp | 3 ++- src/caffe/test/test_image_data_layer.cpp | 6 ++++-- src/caffe/test/test_infogain_loss_layer.cpp | 3 ++- src/caffe/test/test_inner_product_layer.cpp | 3 ++- src/caffe/test/test_lrn_layer.cpp | 3 ++- src/caffe/test/test_math_functions.cpp | 1 + src/caffe/test/test_maxpool_dropout_layers.cpp | 3 ++- src/caffe/test/test_memory_data_layer.cpp | 1 + src/caffe/test/test_multinomial_logistic_loss_layer.cpp | 3 ++- src/caffe/test/test_net.cpp | 5 ++--- src/caffe/test/test_neuron_layer.cpp | 3 ++- src/caffe/test/test_platform.cpp | 3 ++- src/caffe/test/test_pooling_layer.cpp | 3 ++- src/caffe/test/test_power_layer.cpp | 2 +- src/caffe/test/test_protobuf.cpp | 4 +++- src/caffe/test/test_random_number_generator.cpp | 2 ++ src/caffe/test/test_sgd_solver.cpp | 1 + src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp | 3 ++- src/caffe/test/test_slice_layer.cpp | 3 ++- src/caffe/test/test_softmax_layer.cpp | 3 ++- src/caffe/test/test_softmax_with_loss_layer.cpp | 3 ++- src/caffe/test/test_solver.cpp | 2 +- src/caffe/test/test_split_layer.cpp | 5 +++-- src/caffe/test/test_stochastic_pooling.cpp | 3 ++- src/caffe/test/test_syncedmem.cpp | 1 + src/caffe/test/test_tanh_layer.cpp | 3 ++- src/caffe/test/test_threshold_layer.cpp | 2 +- src/caffe/test/test_upgrade_proto.cpp | 1 + src/caffe/test/test_util_blas.cpp | 1 + src/caffe/util/insert_splits.cpp | 2 +- src/caffe/util/io.cpp | 10 +++++----- src/caffe/util/upgrade_proto.cpp | 6 +++--- tools/dump_network.cpp | 4 ++-- tools/extract_features.cpp | 11 ++++++----- tools/test_net.cpp | 2 +- tools/upgrade_net_proto_binary.cpp | 2 +- tools/upgrade_net_proto_text.cpp | 2 +- 112 files changed, 210 insertions(+), 165 deletions(-) diff --git a/examples/cifar10/convert_cifar_data.cpp b/examples/cifar10/convert_cifar_data.cpp index 8e223b2..d1f3f3e 100644 --- a/examples/cifar10/convert_cifar_data.cpp +++ b/examples/cifar10/convert_cifar_data.cpp @@ -7,14 +7,14 @@ // The CIFAR dataset could be downloaded at // http://www.cs.toronto.edu/~kriz/cifar.html -#include -#include -#include - -#include #include // NOLINT(readability/streams) #include +#include "glog/logging.h" +#include "google/protobuf/text_format.h" +#include "leveldb/db.h" +#include "stdint.h" + #include "caffe/proto/caffe.pb.h" using std::string; diff --git a/examples/mnist/convert_mnist_data.cpp b/examples/mnist/convert_mnist_data.cpp index 593a2d2..c2cf4b3 100644 --- a/examples/mnist/convert_mnist_data.cpp +++ b/examples/mnist/convert_mnist_data.cpp @@ -7,14 +7,14 @@ // The MNIST dataset could be downloaded at // http://yann.lecun.com/exdb/mnist/ -#include -#include -#include - -#include #include // NOLINT(readability/streams) #include +#include "glog/logging.h" +#include "google/protobuf/text_format.h" +#include "leveldb/db.h" +#include "stdint.h" + #include "caffe/proto/caffe.pb.h" uint32_t swap_endian(uint32_t val) { diff --git a/include/caffe/blob.hpp b/include/caffe/blob.hpp index ab7a0f6..2086c51 100644 --- a/include/caffe/blob.hpp +++ b/include/caffe/blob.hpp @@ -4,8 +4,8 @@ #define CAFFE_BLOB_HPP_ #include "caffe/common.hpp" -#include "caffe/syncedmem.hpp" #include "caffe/proto/caffe.pb.h" +#include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/include/caffe/common_layers.hpp b/include/caffe/common_layers.hpp index 5d87245..ed11487 100644 --- a/include/caffe/common_layers.hpp +++ b/include/caffe/common_layers.hpp @@ -9,10 +9,10 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/data_layers.hpp" #include "caffe/layer.hpp" -#include "caffe/neuron_layers.hpp" #include "caffe/loss_layers.hpp" -#include "caffe/data_layers.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/proto/caffe.pb.h" namespace caffe { diff --git a/include/caffe/data_layers.hpp b/include/caffe/data_layers.hpp index 107d780..f868b28 100644 --- a/include/caffe/data_layers.hpp +++ b/include/caffe/data_layers.hpp @@ -7,17 +7,17 @@ #include #include +#include "boost/scoped_ptr.hpp" +#include "hdf5.h" #include "leveldb/db.h" #include "lmdb.h" -#include "hdf5.h" -#include "boost/scoped_ptr.hpp" #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" +#include "caffe/internal_thread.hpp" #include "caffe/layer.hpp" #include "caffe/proto/caffe.pb.h" -#include "caffe/internal_thread.hpp" namespace caffe { diff --git a/include/caffe/filler.hpp b/include/caffe/filler.hpp index 242f11a..beeee01 100644 --- a/include/caffe/filler.hpp +++ b/include/caffe/filler.hpp @@ -9,11 +9,11 @@ #include -#include "caffe/common.hpp" #include "caffe/blob.hpp" +#include "caffe/common.hpp" +#include "caffe/proto/caffe.pb.h" #include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/proto/caffe.pb.h" namespace caffe { diff --git a/include/caffe/loss_layers.hpp b/include/caffe/loss_layers.hpp index fb7f553..73a677b 100644 --- a/include/caffe/loss_layers.hpp +++ b/include/caffe/loss_layers.hpp @@ -7,10 +7,10 @@ #include #include -#include "leveldb/db.h" -#include "pthread.h" #include "boost/scoped_ptr.hpp" #include "hdf5.h" +#include "leveldb/db.h" +#include "pthread.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" diff --git a/include/caffe/neuron_layers.hpp b/include/caffe/neuron_layers.hpp index 8f0588d..4b3f6f4 100644 --- a/include/caffe/neuron_layers.hpp +++ b/include/caffe/neuron_layers.hpp @@ -7,9 +7,9 @@ #include #include -#include "pthread.h" #include "boost/scoped_ptr.hpp" #include "hdf5.h" +#include "pthread.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" diff --git a/include/caffe/test/test_caffe_main.hpp b/include/caffe/test/test_caffe_main.hpp index 9e7b859..759e01a 100644 --- a/include/caffe/test/test_caffe_main.hpp +++ b/include/caffe/test/test_caffe_main.hpp @@ -8,8 +8,8 @@ #include #include -#include #include +#include #include "caffe/common.hpp" diff --git a/include/caffe/util/io.hpp b/include/caffe/util/io.hpp index 631dbe7..4f517ff 100644 --- a/include/caffe/util/io.hpp +++ b/include/caffe/util/io.hpp @@ -8,9 +8,9 @@ #include "google/protobuf/message.h" #include "hdf5.h" #include "hdf5_hl.h" -#include "caffe/proto/caffe.pb.h" #include "caffe/blob.hpp" +#include "caffe/proto/caffe.pb.h" #define HDF5_NUM_DIMS 4 diff --git a/include/caffe/util/rng.hpp b/include/caffe/util/rng.hpp index 2b79ef1..f774d70 100644 --- a/include/caffe/util/rng.hpp +++ b/include/caffe/util/rng.hpp @@ -3,10 +3,12 @@ #ifndef CAFFE_RNG_CPP_HPP_ #define CAFFE_RNG_CPP_HPP_ -#include -#include -#include #include +#include + +#include "boost/random/mersenne_twister.hpp" +#include "boost/random/uniform_int.hpp" + #include "caffe/common.hpp" namespace caffe { diff --git a/matlab/caffe/matcaffe.cpp b/matlab/caffe/matcaffe.cpp index 2aad319..d0e98f8 100644 --- a/matlab/caffe/matcaffe.cpp +++ b/matlab/caffe/matcaffe.cpp @@ -8,6 +8,7 @@ #include #include "mex.h" + #include "caffe/caffe.hpp" #define MEX_ARGS int nlhs, mxArray **plhs, int nrhs, const mxArray **prhs diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp index de96021..1165abc 100644 --- a/src/caffe/layer_factory.cpp +++ b/src/caffe/layer_factory.cpp @@ -6,8 +6,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/proto/caffe.pb.h" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/accuracy_layer.cpp b/src/caffe/layers/accuracy_layer.cpp index 7c91311..f99b01d 100644 --- a/src/caffe/layers/accuracy_layer.cpp +++ b/src/caffe/layers/accuracy_layer.cpp @@ -6,9 +6,9 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/util/io.hpp" +#include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/concat_layer.cpp b/src/caffe/layers/concat_layer.cpp index dd899a5..32203a8 100644 --- a/src/caffe/layers/concat_layer.cpp +++ b/src/caffe/layers/concat_layer.cpp @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/concat_layer.cu b/src/caffe/layers/concat_layer.cu index 2643d74..1a97f02 100644 --- a/src/caffe/layers/concat_layer.cu +++ b/src/caffe/layers/concat_layer.cu @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp index c7949e0..ca63e97 100644 --- a/src/caffe/layers/conv_layer.cpp +++ b/src/caffe/layers/conv_layer.cpp @@ -2,11 +2,11 @@ #include +#include "caffe/filler.hpp" #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/im2col.hpp" -#include "caffe/filler.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/conv_layer.cu b/src/caffe/layers/conv_layer.cu index fc114b0..616a81a 100644 --- a/src/caffe/layers/conv_layer.cu +++ b/src/caffe/layers/conv_layer.cu @@ -2,11 +2,11 @@ #include +#include "caffe/filler.hpp" #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/im2col.hpp" -#include "caffe/filler.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp index ef27c1a..ddc7f77 100644 --- a/src/caffe/layers/data_layer.cpp +++ b/src/caffe/layers/data_layer.cpp @@ -1,17 +1,17 @@ // Copyright 2014 BVLC and contributors. -#include #include +#include #include #include #include "caffe/layer.hpp" +#include "caffe/proto/caffe.pb.h" #include "caffe/util/io.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/util/rng.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/proto/caffe.pb.h" namespace caffe { diff --git a/src/caffe/layers/data_layer.cu b/src/caffe/layers/data_layer.cu index e275e9d..fcbf234 100644 --- a/src/caffe/layers/data_layer.cu +++ b/src/caffe/layers/data_layer.cu @@ -1,12 +1,12 @@ // Copyright 2014 BVLC and contributors. -#include -#include -#include - #include #include +#include "leveldb/db.h" +#include "pthread.h" +#include "stdint.h" + #include "caffe/layer.hpp" #include "caffe/util/io.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/dropout_layer.cpp b/src/caffe/layers/dropout_layer.cpp index 65360d6..605aa15 100644 --- a/src/caffe/layers/dropout_layer.cpp +++ b/src/caffe/layers/dropout_layer.cpp @@ -5,9 +5,9 @@ #include #include "caffe/common.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/layer.hpp" #include "caffe/syncedmem.hpp" +#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/dropout_layer.cu b/src/caffe/layers/dropout_layer.cu index 158456f..8befa4d 100644 --- a/src/caffe/layers/dropout_layer.cu +++ b/src/caffe/layers/dropout_layer.cu @@ -7,8 +7,8 @@ #include "caffe/common.hpp" #include "caffe/layer.hpp" #include "caffe/syncedmem.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/eltwise_layer.cpp b/src/caffe/layers/eltwise_layer.cpp index 44bad93..09ca66f 100644 --- a/src/caffe/layers/eltwise_layer.cpp +++ b/src/caffe/layers/eltwise_layer.cpp @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/eltwise_layer.cu b/src/caffe/layers/eltwise_layer.cu index 99c14fe..d47d24a 100644 --- a/src/caffe/layers/eltwise_layer.cu +++ b/src/caffe/layers/eltwise_layer.cu @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/euclidean_loss_layer.cpp b/src/caffe/layers/euclidean_loss_layer.cpp index 43e9989..2a814f0 100644 --- a/src/caffe/layers/euclidean_loss_layer.cpp +++ b/src/caffe/layers/euclidean_loss_layer.cpp @@ -3,9 +3,9 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/util/io.hpp" +#include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/euclidean_loss_layer.cu b/src/caffe/layers/euclidean_loss_layer.cu index b070ea9..e1358f0 100644 --- a/src/caffe/layers/euclidean_loss_layer.cu +++ b/src/caffe/layers/euclidean_loss_layer.cu @@ -3,9 +3,9 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/util/io.hpp" +#include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/flatten_layer.cpp b/src/caffe/layers/flatten_layer.cpp index 7e106d2..f1fdd32 100644 --- a/src/caffe/layers/flatten_layer.cpp +++ b/src/caffe/layers/flatten_layer.cpp @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/flatten_layer.cu b/src/caffe/layers/flatten_layer.cu index 68add38..60b67f0 100644 --- a/src/caffe/layers/flatten_layer.cu +++ b/src/caffe/layers/flatten_layer.cu @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp index 81cfdc0..38b2b8d 100644 --- a/src/caffe/layers/hdf5_data_layer.cpp +++ b/src/caffe/layers/hdf5_data_layer.cpp @@ -7,13 +7,13 @@ TODO: :: don't forget to update hdf5_daa_layer.cu accordingly - add ability to shuffle filenames if flag is set */ -#include +#include // NOLINT(readability/streams) #include #include -#include // NOLINT(readability/streams) #include "hdf5.h" #include "hdf5_hl.h" +#include "stdint.h" #include "caffe/layer.hpp" #include "caffe/util/io.hpp" diff --git a/src/caffe/layers/hinge_loss_layer.cpp b/src/caffe/layers/hinge_loss_layer.cpp index 91fe153..a7ec061 100644 --- a/src/caffe/layers/hinge_loss_layer.cpp +++ b/src/caffe/layers/hinge_loss_layer.cpp @@ -1,14 +1,14 @@ // Copyright 2014 BVLC and contributors. #include -#include #include +#include #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/util/io.hpp" +#include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/im2col_layer.cpp b/src/caffe/layers/im2col_layer.cpp index fabce0a..fb3dad4 100644 --- a/src/caffe/layers/im2col_layer.cpp +++ b/src/caffe/layers/im2col_layer.cpp @@ -2,10 +2,10 @@ #include +#include "caffe/common.hpp" #include "caffe/layer.hpp" #include "caffe/util/im2col.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/common.hpp" namespace caffe { diff --git a/src/caffe/layers/im2col_layer.cu b/src/caffe/layers/im2col_layer.cu index 8443974..c980254 100644 --- a/src/caffe/layers/im2col_layer.cu +++ b/src/caffe/layers/im2col_layer.cu @@ -2,10 +2,10 @@ #include +#include "caffe/common.hpp" #include "caffe/layer.hpp" #include "caffe/util/im2col.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/common.hpp" namespace caffe { diff --git a/src/caffe/layers/image_data_layer.cpp b/src/caffe/layers/image_data_layer.cpp index a0f91af..a10f02c 100644 --- a/src/caffe/layers/image_data_layer.cpp +++ b/src/caffe/layers/image_data_layer.cpp @@ -1,13 +1,10 @@ // Copyright 2014 BVLC and contributors. -#include -#include - -#include -#include -#include // NOLINT(readability/streams) #include // NOLINT(readability/streams) +#include // NOLINT(readability/streams) +#include #include +#include #include "caffe/layer.hpp" #include "caffe/util/io.hpp" diff --git a/src/caffe/layers/image_data_layer.cu b/src/caffe/layers/image_data_layer.cu index fc7e13b..8a449d0 100644 --- a/src/caffe/layers/image_data_layer.cu +++ b/src/caffe/layers/image_data_layer.cu @@ -1,13 +1,6 @@ // Copyright 2014 BVLC and contributors. -#include -#include -#include - -#include #include -#include // NOLINT(readability/streams) -#include // NOLINT(readability/streams) #include "caffe/blob.hpp" #include "caffe/common.hpp" diff --git a/src/caffe/layers/infogain_loss_layer.cpp b/src/caffe/layers/infogain_loss_layer.cpp index 4b02f4e..c972c03 100644 --- a/src/caffe/layers/infogain_loss_layer.cpp +++ b/src/caffe/layers/infogain_loss_layer.cpp @@ -1,14 +1,14 @@ // Copyright 2014 BVLC and contributors. #include -#include #include +#include #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/util/io.hpp" +#include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/inner_product_layer.cpp b/src/caffe/layers/inner_product_layer.cpp index 5505d08..6493d0b 100644 --- a/src/caffe/layers/inner_product_layer.cpp +++ b/src/caffe/layers/inner_product_layer.cpp @@ -6,8 +6,8 @@ #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/inner_product_layer.cu b/src/caffe/layers/inner_product_layer.cu index 513e4eb..4b670d6 100644 --- a/src/caffe/layers/inner_product_layer.cu +++ b/src/caffe/layers/inner_product_layer.cu @@ -6,8 +6,8 @@ #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/loss_layer.cpp b/src/caffe/layers/loss_layer.cpp index 92eb06f..656e85a 100644 --- a/src/caffe/layers/loss_layer.cpp +++ b/src/caffe/layers/loss_layer.cpp @@ -1,14 +1,14 @@ // Copyright 2014 BVLC and contributors. #include -#include #include +#include #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/util/io.hpp" +#include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/lrn_layer.cpp b/src/caffe/layers/lrn_layer.cpp index 0e2df2f..50ad646 100644 --- a/src/caffe/layers/lrn_layer.cpp +++ b/src/caffe/layers/lrn_layer.cpp @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/lrn_layer.cu b/src/caffe/layers/lrn_layer.cu index 237a42b..7a19350 100644 --- a/src/caffe/layers/lrn_layer.cu +++ b/src/caffe/layers/lrn_layer.cu @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/multinomial_logistic_loss_layer.cpp b/src/caffe/layers/multinomial_logistic_loss_layer.cpp index beea747..e5eafd6 100644 --- a/src/caffe/layers/multinomial_logistic_loss_layer.cpp +++ b/src/caffe/layers/multinomial_logistic_loss_layer.cpp @@ -1,14 +1,14 @@ // Copyright 2014 BVLC and contributors. #include -#include #include +#include #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/util/io.hpp" +#include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/pooling_layer.cpp b/src/caffe/layers/pooling_layer.cpp index 9415a15..75a74da 100644 --- a/src/caffe/layers/pooling_layer.cpp +++ b/src/caffe/layers/pooling_layer.cpp @@ -6,9 +6,9 @@ #include "caffe/common.hpp" #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/pooling_layer.cu b/src/caffe/layers/pooling_layer.cu index efa1aaa..6f3a720 100644 --- a/src/caffe/layers/pooling_layer.cu +++ b/src/caffe/layers/pooling_layer.cu @@ -5,8 +5,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/power_layer.cpp b/src/caffe/layers/power_layer.cpp index 55ace20..86cb3d7 100644 --- a/src/caffe/layers/power_layer.cpp +++ b/src/caffe/layers/power_layer.cpp @@ -4,8 +4,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/power_layer.cu b/src/caffe/layers/power_layer.cu index 0aa0027..db88fee 100644 --- a/src/caffe/layers/power_layer.cu +++ b/src/caffe/layers/power_layer.cu @@ -4,8 +4,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp index 31522dd..2bf931d 100644 --- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp @@ -5,8 +5,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu index 1d1f8cd..698ec1d 100644 --- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu +++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu @@ -5,8 +5,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/slice_layer.cpp b/src/caffe/layers/slice_layer.cpp index e8231e3..fc86a2d 100644 --- a/src/caffe/layers/slice_layer.cpp +++ b/src/caffe/layers/slice_layer.cpp @@ -1,11 +1,11 @@ // Copyright 2014 BVLC and contributors. -#include #include +#include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/slice_layer.cu b/src/caffe/layers/slice_layer.cu index 3ea8d57..7070214 100644 --- a/src/caffe/layers/slice_layer.cu +++ b/src/caffe/layers/slice_layer.cu @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_layer.cpp b/src/caffe/layers/softmax_layer.cpp index 0de1403..6a98b32 100644 --- a/src/caffe/layers/softmax_layer.cpp +++ b/src/caffe/layers/softmax_layer.cpp @@ -4,8 +4,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_layer.cu b/src/caffe/layers/softmax_layer.cu index d471ba5..6d65fbc 100644 --- a/src/caffe/layers/softmax_layer.cu +++ b/src/caffe/layers/softmax_layer.cu @@ -7,8 +7,8 @@ #include "thrust/device_vector.h" #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_loss_layer.cpp b/src/caffe/layers/softmax_loss_layer.cpp index 4e957ce..43e8fca 100644 --- a/src/caffe/layers/softmax_loss_layer.cpp +++ b/src/caffe/layers/softmax_loss_layer.cpp @@ -5,8 +5,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_loss_layer.cu b/src/caffe/layers/softmax_loss_layer.cu index ae7060d..f55b8c7 100644 --- a/src/caffe/layers/softmax_loss_layer.cu +++ b/src/caffe/layers/softmax_loss_layer.cu @@ -5,8 +5,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/split_layer.cpp b/src/caffe/layers/split_layer.cpp index 6bae4ef..d13b8d1 100644 --- a/src/caffe/layers/split_layer.cpp +++ b/src/caffe/layers/split_layer.cpp @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/split_layer.cu b/src/caffe/layers/split_layer.cu index 4c921d3..a89c5d6 100644 --- a/src/caffe/layers/split_layer.cu +++ b/src/caffe/layers/split_layer.cu @@ -3,8 +3,8 @@ #include #include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" +#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/window_data_layer.cpp b/src/caffe/layers/window_data_layer.cpp index fe7f61c..cbd2696 100644 --- a/src/caffe/layers/window_data_layer.cpp +++ b/src/caffe/layers/window_data_layer.cpp @@ -5,11 +5,11 @@ #include #include -#include -#include -#include #include // NOLINT(readability/streams) +#include +#include #include +#include #include "opencv2/core/core.hpp" #include "opencv2/highgui/highgui.hpp" diff --git a/src/caffe/layers/window_data_layer.cu b/src/caffe/layers/window_data_layer.cu index d95e5b2..5efcc3f 100644 --- a/src/caffe/layers/window_data_layer.cu +++ b/src/caffe/layers/window_data_layer.cu @@ -2,8 +2,8 @@ // // Based on data_layer.cpp by Yangqing Jia. -#include #include +#include #include #include diff --git a/src/caffe/net.cpp b/src/caffe/net.cpp index b80bbba..6fab0e3 100644 --- a/src/caffe/net.cpp +++ b/src/caffe/net.cpp @@ -7,14 +7,15 @@ #include #include "caffe/common.hpp" -#include "caffe/proto/caffe.pb.h" #include "caffe/layer.hpp" #include "caffe/net.hpp" -#include "caffe/util/io.hpp" +#include "caffe/proto/caffe.pb.h" #include "caffe/util/insert_splits.hpp" +#include "caffe/util/io.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/util/upgrade_proto.hpp" +#include "caffe/test/test_caffe_main.hpp" namespace caffe { diff --git a/src/caffe/test/test_accuracy_layer.cpp b/src/caffe/test/test_accuracy_layer.cpp index 5023a80..95217df 100644 --- a/src/caffe/test/test_accuracy_layer.cpp +++ b/src/caffe/test/test_accuracy_layer.cpp @@ -1,11 +1,12 @@ // Copyright 2014 BVLC and contributors. +#include #include #include -#include #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" diff --git a/src/caffe/test/test_argmax_layer.cpp b/src/caffe/test/test_argmax_layer.cpp index 51d68c4..3f55eda 100644 --- a/src/caffe/test/test_argmax_layer.cpp +++ b/src/caffe/test/test_argmax_layer.cpp @@ -4,11 +4,11 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_benchmark.cpp b/src/caffe/test/test_benchmark.cpp index fe0cc82..e6d9ebf 100644 --- a/src/caffe/test/test_benchmark.cpp +++ b/src/caffe/test/test_benchmark.cpp @@ -1,10 +1,12 @@ // Copyright 2014 BVLC and contributors. #include // for usleep -#include + +#include "gtest/gtest.h" #include "caffe/common.hpp" #include "caffe/util/benchmark.hpp" + #include "caffe/test/test_caffe_main.hpp" namespace caffe { diff --git a/src/caffe/test/test_blob.cpp b/src/caffe/test/test_blob.cpp index aec88f3..89f4a16 100644 --- a/src/caffe/test/test_blob.cpp +++ b/src/caffe/test/test_blob.cpp @@ -3,8 +3,9 @@ #include #include "gtest/gtest.h" -#include "caffe/common.hpp" + #include "caffe/blob.hpp" +#include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_common.cpp b/src/caffe/test/test_common.cpp index a8e2eb1..455f5d8 100644 --- a/src/caffe/test/test_common.cpp +++ b/src/caffe/test/test_common.cpp @@ -3,9 +3,11 @@ #include #include "gtest/gtest.h" + #include "caffe/common.hpp" #include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" + #include "caffe/test/test_caffe_main.hpp" namespace caffe { diff --git a/src/caffe/test/test_concat_layer.cpp b/src/caffe/test/test_concat_layer.cpp index 4cb28b1..b07c572 100644 --- a/src/caffe/test/test_concat_layer.cpp +++ b/src/caffe/test/test_concat_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_convolution_layer.cpp b/src/caffe/test/test_convolution_layer.cpp index f3cfb68..41951cf 100644 --- a/src/caffe/test/test_convolution_layer.cpp +++ b/src/caffe/test/test_convolution_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_data_layer.cpp b/src/caffe/test/test_data_layer.cpp index ed7337c..be478b2 100644 --- a/src/caffe/test/test_data_layer.cpp +++ b/src/caffe/test/test_data_layer.cpp @@ -4,12 +4,15 @@ #include #include "leveldb/db.h" + #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/proto/caffe.pb.h" +#include "caffe/vision_layers.hpp" + #include "caffe/test/test_caffe_main.hpp" using std::string; diff --git a/src/caffe/test/test_dummy_data_layer.cpp b/src/caffe/test/test_dummy_data_layer.cpp index 5b5f202..aa6cc55 100644 --- a/src/caffe/test/test_dummy_data_layer.cpp +++ b/src/caffe/test/test_dummy_data_layer.cpp @@ -4,10 +4,12 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/proto/caffe.pb.h" +#include "caffe/vision_layers.hpp" + #include "caffe/test/test_caffe_main.hpp" using std::string; diff --git a/src/caffe/test/test_eltwise_layer.cpp b/src/caffe/test/test_eltwise_layer.cpp index 53bff96..fe3269b 100644 --- a/src/caffe/test/test_eltwise_layer.cpp +++ b/src/caffe/test/test_eltwise_layer.cpp @@ -3,13 +3,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_euclidean_loss_layer.cpp b/src/caffe/test/test_euclidean_loss_layer.cpp index dd27670..6dd631e 100644 --- a/src/caffe/test/test_euclidean_loss_layer.cpp +++ b/src/caffe/test/test_euclidean_loss_layer.cpp @@ -6,13 +6,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_filler.cpp b/src/caffe/test/test_filler.cpp index 1b145f2..d0d750f 100644 --- a/src/caffe/test/test_filler.cpp +++ b/src/caffe/test/test_filler.cpp @@ -3,6 +3,7 @@ #include #include "gtest/gtest.h" + #include "caffe/filler.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_flatten_layer.cpp b/src/caffe/test/test_flatten_layer.cpp index bea099b..928db84 100644 --- a/src/caffe/test/test_flatten_layer.cpp +++ b/src/caffe/test/test_flatten_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_hdf5_output_layer.cpp b/src/caffe/test/test_hdf5_output_layer.cpp index ec48fc4..a36a8cb 100644 --- a/src/caffe/test/test_hdf5_output_layer.cpp +++ b/src/caffe/test/test_hdf5_output_layer.cpp @@ -4,11 +4,13 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/proto/caffe.pb.h" #include "caffe/util/io.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/proto/caffe.pb.h" + #include "caffe/test/test_caffe_main.hpp" using std::string; diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp index f3d7c8c..1f3bf9f 100644 --- a/src/caffe/test/test_hdf5data_layer.cpp +++ b/src/caffe/test/test_hdf5data_layer.cpp @@ -6,11 +6,13 @@ #include "leveldb/db.h" #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/proto/caffe.pb.h" +#include "caffe/vision_layers.hpp" + #include "caffe/test/test_caffe_main.hpp" using std::string; diff --git a/src/caffe/test/test_hinge_loss_layer.cpp b/src/caffe/test/test_hinge_loss_layer.cpp index 84374e9..c6be1d7 100644 --- a/src/caffe/test/test_hinge_loss_layer.cpp +++ b/src/caffe/test/test_hinge_loss_layer.cpp @@ -6,13 +6,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_im2col_kernel.cu b/src/caffe/test/test_im2col_kernel.cu index 37d1a15..89008ac 100644 --- a/src/caffe/test/test_im2col_kernel.cu +++ b/src/caffe/test/test_im2col_kernel.cu @@ -4,11 +4,12 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/util/im2col.hpp" +#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_im2col_layer.cpp b/src/caffe/test/test_im2col_layer.cpp index aaee3d8..6884b05 100644 --- a/src/caffe/test/test_im2col_layer.cpp +++ b/src/caffe/test/test_im2col_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_image_data_layer.cpp b/src/caffe/test/test_image_data_layer.cpp index ae9a2db..bbeedb8 100644 --- a/src/caffe/test/test_image_data_layer.cpp +++ b/src/caffe/test/test_image_data_layer.cpp @@ -1,17 +1,19 @@ // Copyright 2014 BVLC and contributors. -#include // NOLINT(readability/streams) #include // NOLINT(readability/streams) +#include // NOLINT(readability/streams) #include #include #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/proto/caffe.pb.h" +#include "caffe/vision_layers.hpp" + #include "caffe/test/test_caffe_main.hpp" using std::map; diff --git a/src/caffe/test/test_infogain_loss_layer.cpp b/src/caffe/test/test_infogain_loss_layer.cpp index 99bad26..7b37050 100644 --- a/src/caffe/test/test_infogain_loss_layer.cpp +++ b/src/caffe/test/test_infogain_loss_layer.cpp @@ -6,13 +6,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/loss_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_inner_product_layer.cpp b/src/caffe/test/test_inner_product_layer.cpp index de194f2..31d87af 100644 --- a/src/caffe/test/test_inner_product_layer.cpp +++ b/src/caffe/test/test_inner_product_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_lrn_layer.cpp b/src/caffe/test/test_lrn_layer.cpp index 5bd5533..fbb03df 100644 --- a/src/caffe/test/test_lrn_layer.cpp +++ b/src/caffe/test/test_lrn_layer.cpp @@ -5,13 +5,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" using std::min; using std::max; diff --git a/src/caffe/test/test_math_functions.cpp b/src/caffe/test/test_math_functions.cpp index 502b77e..c89ca02 100644 --- a/src/caffe/test/test_math_functions.cpp +++ b/src/caffe/test/test_math_functions.cpp @@ -7,6 +7,7 @@ #include // for rand_r #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" diff --git a/src/caffe/test/test_maxpool_dropout_layers.cpp b/src/caffe/test/test_maxpool_dropout_layers.cpp index 733bbf4..e939d0c 100644 --- a/src/caffe/test/test_maxpool_dropout_layers.cpp +++ b/src/caffe/test/test_maxpool_dropout_layers.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_memory_data_layer.cpp b/src/caffe/test/test_memory_data_layer.cpp index c9d5889..60e75eb 100644 --- a/src/caffe/test/test_memory_data_layer.cpp +++ b/src/caffe/test/test_memory_data_layer.cpp @@ -4,6 +4,7 @@ #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" + #include "caffe/test/test_caffe_main.hpp" namespace caffe { diff --git a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp index ec53d40..9b6bb06 100644 --- a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp +++ b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp @@ -6,13 +6,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_net.cpp b/src/caffe/test/test_net.cpp index a0a3879..6787ba9 100644 --- a/src/caffe/test/test_net.cpp +++ b/src/caffe/test/test_net.cpp @@ -7,14 +7,13 @@ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" + #include "caffe/common.hpp" #include "caffe/net.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" - -using std::ostringstream; +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_neuron_layer.cpp b/src/caffe/test/test_neuron_layer.cpp index b3a536a..59c9b3d 100644 --- a/src/caffe/test/test_neuron_layer.cpp +++ b/src/caffe/test/test_neuron_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_platform.cpp b/src/caffe/test/test_platform.cpp index e1c4daf..a4f4b42 100644 --- a/src/caffe/test/test_platform.cpp +++ b/src/caffe/test/test_platform.cpp @@ -2,11 +2,12 @@ #ifndef CPU_ONLY -#include #include +#include #include "glog/logging.h" #include "gtest/gtest.h" + #include "caffe/test/test_caffe_main.hpp" namespace caffe { diff --git a/src/caffe/test/test_pooling_layer.cpp b/src/caffe/test/test_pooling_layer.cpp index b9cec54..4636dd7 100644 --- a/src/caffe/test/test_pooling_layer.cpp +++ b/src/caffe/test/test_pooling_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_power_layer.cpp b/src/caffe/test/test_power_layer.cpp index 44fcbd9..e35d539 100644 --- a/src/caffe/test/test_power_layer.cpp +++ b/src/caffe/test/test_power_layer.cpp @@ -9,9 +9,9 @@ #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_protobuf.cpp b/src/caffe/test/test_protobuf.cpp index 182af2e..da1a0d3 100644 --- a/src/caffe/test/test_protobuf.cpp +++ b/src/caffe/test/test_protobuf.cpp @@ -6,9 +6,11 @@ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" -#include "caffe/test/test_caffe_main.hpp" + #include "caffe/proto/caffe.pb.h" +#include "caffe/test/test_caffe_main.hpp" + namespace caffe { class ProtoTest : public ::testing::Test {}; diff --git a/src/caffe/test/test_random_number_generator.cpp b/src/caffe/test/test_random_number_generator.cpp index abe21c2..8e39191 100644 --- a/src/caffe/test/test_random_number_generator.cpp +++ b/src/caffe/test/test_random_number_generator.cpp @@ -4,9 +4,11 @@ #include #include "gtest/gtest.h" + #include "caffe/common.hpp" #include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" + #include "caffe/test/test_caffe_main.hpp" namespace caffe { diff --git a/src/caffe/test/test_sgd_solver.cpp b/src/caffe/test/test_sgd_solver.cpp index a28ed7b..14dcac2 100644 --- a/src/caffe/test/test_sgd_solver.cpp +++ b/src/caffe/test/test_sgd_solver.cpp @@ -8,6 +8,7 @@ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" + #include "caffe/common.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/solver.hpp" diff --git a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp index a5388db..7205ce9 100644 --- a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp @@ -6,13 +6,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_slice_layer.cpp b/src/caffe/test/test_slice_layer.cpp index 59f6a8d..e61f3e4 100644 --- a/src/caffe/test/test_slice_layer.cpp +++ b/src/caffe/test/test_slice_layer.cpp @@ -4,13 +4,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_softmax_layer.cpp b/src/caffe/test/test_softmax_layer.cpp index fa899f9..a305c64 100644 --- a/src/caffe/test/test_softmax_layer.cpp +++ b/src/caffe/test/test_softmax_layer.cpp @@ -5,13 +5,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_softmax_with_loss_layer.cpp b/src/caffe/test/test_softmax_with_loss_layer.cpp index 6f45c38..2994a91 100644 --- a/src/caffe/test/test_softmax_with_loss_layer.cpp +++ b/src/caffe/test/test_softmax_with_loss_layer.cpp @@ -6,13 +6,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_solver.cpp b/src/caffe/test/test_solver.cpp index feefb51..133d01c 100644 --- a/src/caffe/test/test_solver.cpp +++ b/src/caffe/test/test_solver.cpp @@ -5,8 +5,8 @@ #include #include "google/protobuf/text_format.h" - #include "gtest/gtest.h" + #include "caffe/common.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/solver.hpp" diff --git a/src/caffe/test/test_split_layer.cpp b/src/caffe/test/test_split_layer.cpp index bbee6d2..a4e5857 100644 --- a/src/caffe/test/test_split_layer.cpp +++ b/src/caffe/test/test_split_layer.cpp @@ -6,14 +6,15 @@ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/util/insert_splits.hpp" +#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_stochastic_pooling.cpp b/src/caffe/test/test_stochastic_pooling.cpp index 66e9b2d..600b909 100644 --- a/src/caffe/test/test_stochastic_pooling.cpp +++ b/src/caffe/test/test_stochastic_pooling.cpp @@ -5,13 +5,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" using std::min; diff --git a/src/caffe/test/test_syncedmem.cpp b/src/caffe/test/test_syncedmem.cpp index f07682a..5ccc480 100644 --- a/src/caffe/test/test_syncedmem.cpp +++ b/src/caffe/test/test_syncedmem.cpp @@ -4,6 +4,7 @@ #include #include "gtest/gtest.h" + #include "caffe/common.hpp" #include "caffe/syncedmem.hpp" #include "caffe/util/device_alternate.hpp" diff --git a/src/caffe/test/test_tanh_layer.cpp b/src/caffe/test/test_tanh_layer.cpp index 7fc443f..1dac5a5 100644 --- a/src/caffe/test/test_tanh_layer.cpp +++ b/src/caffe/test/test_tanh_layer.cpp @@ -6,13 +6,14 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" +#include "caffe/test/test_gradient_check_util.hpp" namespace caffe { diff --git a/src/caffe/test/test_threshold_layer.cpp b/src/caffe/test/test_threshold_layer.cpp index 7006dd1..b06d697 100644 --- a/src/caffe/test/test_threshold_layer.cpp +++ b/src/caffe/test/test_threshold_layer.cpp @@ -3,11 +3,11 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" #include "caffe/vision_layers.hpp" -#include "caffe/test/test_gradient_check_util.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_upgrade_proto.cpp b/src/caffe/test/test_upgrade_proto.cpp index 72ee838..a16b835 100644 --- a/src/caffe/test/test_upgrade_proto.cpp +++ b/src/caffe/test/test_upgrade_proto.cpp @@ -6,6 +6,7 @@ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/util/upgrade_proto.hpp" diff --git a/src/caffe/test/test_util_blas.cpp b/src/caffe/test/test_util_blas.cpp index d74f9f0..841edef 100644 --- a/src/caffe/test/test_util_blas.cpp +++ b/src/caffe/test/test_util_blas.cpp @@ -5,6 +5,7 @@ #include #include "gtest/gtest.h" + #include "caffe/blob.hpp" #include "caffe/util/device_alternate.hpp" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/util/insert_splits.cpp b/src/caffe/util/insert_splits.cpp index 4de5468..b88b320 100644 --- a/src/caffe/util/insert_splits.cpp +++ b/src/caffe/util/insert_splits.cpp @@ -1,8 +1,8 @@ // Copyright 2014 BVLC and contributors. #include -#include #include +#include #include #include "caffe/common.hpp" diff --git a/src/caffe/util/io.cpp b/src/caffe/util/io.cpp index 4f20047..575ea3d 100644 --- a/src/caffe/util/io.cpp +++ b/src/caffe/util/io.cpp @@ -1,23 +1,23 @@ // Copyright 2014 BVLC and contributors. -#include #include -#include -#include #include +#include +#include #include #include #include #include +#include #include +#include // NOLINT(readability/streams) #include #include -#include // NOLINT(readability/streams) #include "caffe/common.hpp" -#include "caffe/util/io.hpp" #include "caffe/proto/caffe.pb.h" +#include "caffe/util/io.hpp" namespace caffe { diff --git a/src/caffe/util/upgrade_proto.cpp b/src/caffe/util/upgrade_proto.cpp index e1a48f1..a6e9c40 100644 --- a/src/caffe/util/upgrade_proto.cpp +++ b/src/caffe/util/upgrade_proto.cpp @@ -1,16 +1,16 @@ // Copyright 2014 BVLC and contributors. -#include -#include #include +#include +#include #include #include #include "caffe/common.hpp" +#include "caffe/proto/caffe.pb.h" #include "caffe/util/io.hpp" #include "caffe/util/upgrade_proto.hpp" -#include "caffe/proto/caffe.pb.h" namespace caffe { diff --git a/tools/dump_network.cpp b/tools/dump_network.cpp index c5aac60..8984016 100644 --- a/tools/dump_network.cpp +++ b/tools/dump_network.cpp @@ -18,11 +18,11 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/net.hpp" #include "caffe/filler.hpp" +#include "caffe/net.hpp" #include "caffe/proto/caffe.pb.h" -#include "caffe/util/io.hpp" #include "caffe/solver.hpp" +#include "caffe/util/io.hpp" using namespace caffe; // NOLINT(build/namespaces) diff --git a/tools/extract_features.cpp b/tools/extract_features.cpp index 22b0e61..06e07fe 100644 --- a/tools/extract_features.cpp +++ b/tools/extract_features.cpp @@ -1,19 +1,20 @@ // Copyright 2014 BVLC and contributors. #include // for snprintf -#include -#include -#include -#include #include #include +#include "boost/algorithm/string.hpp" +#include "google/protobuf/text_format.h" +#include "leveldb/db.h" +#include "leveldb/write_batch.h" + #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/net.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/io.hpp" +#include "caffe/vision_layers.hpp" using namespace caffe; // NOLINT(build/namespaces) diff --git a/tools/test_net.cpp b/tools/test_net.cpp index 9d37536..b6f827e 100644 --- a/tools/test_net.cpp +++ b/tools/test_net.cpp @@ -6,8 +6,8 @@ // Usage: // test_net net_proto pretrained_net_proto iterations [CPU/GPU] -#include #include +#include #include #include "caffe/caffe.hpp" diff --git a/tools/upgrade_net_proto_binary.cpp b/tools/upgrade_net_proto_binary.cpp index 928fc52..ed703f0 100644 --- a/tools/upgrade_net_proto_binary.cpp +++ b/tools/upgrade_net_proto_binary.cpp @@ -5,8 +5,8 @@ // upgrade_net_proto_binary v0_net_proto_file_in net_proto_file_out #include -#include // NOLINT(readability/streams) #include // NOLINT(readability/streams) +#include // NOLINT(readability/streams) #include "caffe/caffe.hpp" #include "caffe/util/io.hpp" diff --git a/tools/upgrade_net_proto_text.cpp b/tools/upgrade_net_proto_text.cpp index 8a77f75..d05d1ac 100644 --- a/tools/upgrade_net_proto_text.cpp +++ b/tools/upgrade_net_proto_text.cpp @@ -5,8 +5,8 @@ // upgrade_net_proto_text v0_net_proto_file_in net_proto_file_out #include -#include // NOLINT(readability/streams) #include // NOLINT(readability/streams) +#include // NOLINT(readability/streams) #include "caffe/caffe.hpp" #include "caffe/util/io.hpp" -- 2.7.4