add header alphabetization to lint checks

Makefile

@@ -295,7 +295,7 @@ SUPERCLEAN_EXTS := .so .a .o .bin .testbin .pb.cc .pb.h _pb2.py .cuo
 ##############################
 # Define build targets
 ##############################
-.PHONY: all test clean linecount lint tools examples $(DIST_ALIASES) \
+.PHONY: all test clean linecount lint lintclean tools examples $(DIST_ALIASES) \
 	py mat py$(PROJECT) mat$(PROJECT) proto runtest \
 	superclean supercleanlist supercleanfiles warn everything
 
@@ -308,6 +308,9 @@ linecount:
 
 lint: $(EMPTY_LINT_REPORT)
 
+lintclean:
+	@ $(RM) -r $(LINT_OUTPUT_DIR) $(EMPTY_LINT_REPORT) $(NONEMPTY_LINT_REPORT)
+
 $(EMPTY_LINT_REPORT): $(LINT_OUTPUTS) | $(BUILD_DIR)
 	@ cat $(LINT_OUTPUTS) > $@
 	@ if [ -s "$@" ]; then \

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 <google/protobuf/text_format.h>
-#include <glog/logging.h>
-#include <leveldb/db.h>
-
-#include <stdint.h>
 #include <fstream>  // NOLINT(readability/streams)
 #include <string>
 
+#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;

examples/mnist/convert_mnist_data.cpp

@@ -7,14 +7,14 @@
 // The MNIST dataset could be downloaded at
 //    http://yann.lecun.com/exdb/mnist/
 
-#include <google/protobuf/text_format.h>
-#include <glog/logging.h>
-#include <leveldb/db.h>
-
-#include <stdint.h>
 #include <fstream>  // NOLINT(readability/streams)
 #include <string>
 
+#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) {

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 {

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 {

include/caffe/data_layers.hpp

@@ -7,17 +7,17 @@
 #include <utility>
 #include <vector>
 
+#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 {
 

include/caffe/filler.hpp

@@ -9,11 +9,11 @@
 
 #include <string>
 
-#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 {
 

include/caffe/loss_layers.hpp

@@ -7,10 +7,10 @@
 #include <utility>
 #include <vector>
 
-#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"

include/caffe/neuron_layers.hpp

@@ -7,9 +7,9 @@
 #include <utility>
 #include <vector>
 
-#include "pthread.h"
 #include "boost/scoped_ptr.hpp"
 #include "hdf5.h"
+#include "pthread.h"
 
 #include "caffe/blob.hpp"
 #include "caffe/common.hpp"

include/caffe/test/test_caffe_main.hpp

@@ -8,8 +8,8 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 
 #include "caffe/common.hpp"
 

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
 

include/caffe/util/rng.hpp

@@ -3,10 +3,12 @@
 #ifndef CAFFE_RNG_CPP_HPP_
 #define CAFFE_RNG_CPP_HPP_
 
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int.hpp>
-#include <iterator>
 #include <algorithm>
+#include <iterator>
+
+#include "boost/random/mersenne_twister.hpp"
+#include "boost/random/uniform_int.hpp"
+
 #include "caffe/common.hpp"
 
 namespace caffe {

matlab/caffe/matcaffe.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "mex.h"
+
 #include "caffe/caffe.hpp"
 
 #define MEX_ARGS int nlhs, mxArray **plhs, int nrhs, const mxArray **prhs

scripts/cpp_lint.py

@@ -210,7 +210,6 @@
 # off by default (i.e., categories that must be enabled by the --filter= flags).
 # All entries here should start with a '-' or '+', as in the --filter= flag.
 _DEFAULT_FILTERS = [
-  '-build/include_alpha',
   '-build/include_dir',
   '-readability/todo',
   ]

src/caffe/layer_factory.cpp

@@ -6,8 +6,8 @@
 #include <string>
 
 #include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
 #include "caffe/proto/caffe.pb.h"
+#include "caffe/vision_layers.hpp"
 
 namespace caffe {
 

src/caffe/layers/accuracy_layer.cpp

@@ -6,9 +6,9 @@
 #include <vector>
 
 #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 {
 

src/caffe/layers/concat_layer.cpp

@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
 #include "caffe/util/math_functions.hpp"
+#include "caffe/vision_layers.hpp"
 
 namespace caffe {
 

src/caffe/layers/concat_layer.cu

@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
 #include "caffe/util/math_functions.hpp"
+#include "caffe/vision_layers.hpp"
 
 namespace caffe {
 

src/caffe/layers/conv_layer.cpp

@@ -2,11 +2,11 @@
 
 #include <vector>
 
+#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 {
 

src/caffe/layers/conv_layer.cu

@@ -2,11 +2,11 @@
 
 #include <vector>
 
+#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 {
 

src/caffe/layers/data_layer.cpp

@@ -1,17 +1,17 @@
 // Copyright 2014 BVLC and contributors.
 
-#include <stdint.h>
 #include <leveldb/db.h>
+#include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #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 {
 

src/caffe/layers/data_layer.cu

@@ -1,12 +1,12 @@
 // Copyright 2014 BVLC and contributors.
 
-#include <stdint.h>
-#include <leveldb/db.h>
-#include <pthread.h>
-
 #include <string>
 #include <vector>
 
+#include "leveldb/db.h"
+#include "pthread.h"
+#include "stdint.h"
+
 #include "caffe/layer.hpp"
 #include "caffe/util/io.hpp"
 #include "caffe/vision_layers.hpp"

src/caffe/layers/dropout_layer.cpp

@@ -5,9 +5,9 @@
 #include <vector>
 
 #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 {

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 {
 

src/caffe/layers/eltwise_layer.cpp

@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
 #include "caffe/util/math_functions.hpp"
+#include "caffe/vision_layers.hpp"
 
 namespace caffe {
 

src/caffe/layers/eltwise_layer.cu

@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
 #include "caffe/util/math_functions.hpp"
+#include "caffe/vision_layers.hpp"
 
 namespace caffe {
 

src/caffe/layers/euclidean_loss_layer.cpp

@@ -3,9 +3,9 @@
 #include <vector>
 
 #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 {
 

src/caffe/layers/euclidean_loss_layer.cu

@@ -3,9 +3,9 @@
 #include <vector>
 
 #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 {
 

src/caffe/layers/flatten_layer.cpp

@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
 #include "caffe/util/math_functions.hpp"
+#include "caffe/vision_layers.hpp"
 
 namespace caffe {
 

src/caffe/layers/flatten_layer.cu

@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "caffe/layer.hpp"
-#include "caffe/vision_layers.hpp"
 #include "caffe/util/math_functions.hpp"
+#include "caffe/vision_layers.hpp"
 
 namespace caffe {