cleanup imports

leovandriel · Sep 26, 2017 · 64ed5da · 64ed5da
1 parent 972b00d
commit 64ed5da
Show file tree

Hide file tree

Showing 46 changed files with 90 additions and 99 deletions.
diff --git a/include/caffe2/operator/affine_scale_op.h b/include/caffe2/operator/affine_scale_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_AFFINE_SCALE_OP_H
 #define OPERATOR_AFFINE_SCALE_OP_H
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/operator/back_mean_op.h b/include/caffe2/operator/back_mean_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_BACK_MEAN_OP_H
 #define OPERATOR_BACK_MEAN_OP_H
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/operator/cout_op.h b/include/caffe2/operator/cout_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_COUT_OP_H
 #define OPERATOR_COUT_OP_H
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 
@@ -19,7 +19,7 @@ class CoutOp final : public Operator<Context> {
   bool RunOnDevice() override;
 
  protected:
-  std::vector<string> titles;
+  std::vector<std::string> titles;
 };
 
 }  // namespace caffe2

diff --git a/include/caffe2/operator/diagonal_op.h b/include/caffe2/operator/diagonal_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_DIAGONAL_OP_H
 #define OPERATOR_DIAGONAL_OP_H
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/operator/mean_stdev_op.h b/include/caffe2/operator/mean_stdev_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_MEAN_STDEV_OP_H
 #define OPERATOR_MEAN_STDEV_OP_H
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/operator/show_worst_op.h b/include/caffe2/operator/show_worst_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_SHOW_WORST_OP
 #define OPERATOR_SHOW_WORST_OP
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/operator/time_plot_op.h b/include/caffe2/operator/time_plot_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_TIME_PLOT_OP
 #define OPERATOR_TIME_PLOT_OP
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/operator/zero_one_op.h b/include/caffe2/operator/zero_one_op.h
@@ -1,7 +1,7 @@
 #ifndef OPERATOR_ZERO_ONE_OP_H
 #define OPERATOR_ZERO_ONE_OP_H
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/util/blob.h b/include/caffe2/util/blob.h
@@ -1,8 +1,8 @@
 #ifndef UTIL_BLOB_H
 #define UTIL_BLOB_H
 
-#include "caffe2/core/blob.h"
-#include "caffe2/core/tensor.h"
+#include <caffe2/core/blob.h>
+#include <caffe2/core/tensor.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/util/cmd.h b/include/caffe2/util/cmd.h
@@ -2,7 +2,7 @@
 #define CMD_H
 
 #ifdef WITH_CUDA
-#include "caffe2/core/context_gpu.h"
+#include <caffe2/core/context_gpu.h>
 #endif
 
 CAFFE2_DEFINE_string(optimizer, "adam",

diff --git a/include/caffe2/util/misc.h b/include/caffe2/util/misc.h
@@ -1,9 +1,9 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include "caffe2/core/db.h"
-#include "caffe2/core/init.h"
-#include "caffe2/core/net.h"
+#include <caffe2/core/db.h>
+#include <caffe2/core/init.h>
+#include <caffe2/core/net.h>
 
 #include "caffe2/util/blob.h"
 #include "caffe2/util/model.h"

diff --git a/include/caffe2/util/model.h b/include/caffe2/util/model.h
@@ -1,7 +1,7 @@
 #ifndef UTIL_MODEL_H
 #define UTIL_MODEL_H
 
-#include "caffe2/core/net.h"
+#include <caffe2/core/net.h>
 #include "caffe2/util/net.h"
 
 namespace caffe2 {

diff --git a/include/caffe2/util/net.h b/include/caffe2/util/net.h
@@ -1,7 +1,7 @@
 #ifndef UTIL_NET_H
 #define UTIL_NET_H
 
-#include "caffe2/core/operator.h"
+#include <caffe2/core/operator.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/util/tensor.h b/include/caffe2/util/tensor.h
@@ -1,7 +1,7 @@
 #ifndef UTIL_TENSOR_H
 #define UTIL_TENSOR_H
 
-#include "caffe2/core/tensor.h"
+#include <caffe2/core/tensor.h>
 
 namespace caffe2 {
 

diff --git a/include/caffe2/util/window.h b/include/caffe2/util/window.h
@@ -1,7 +1,7 @@
 #ifndef UTIL_WINDOW_H
 #define UTIL_WINDOW_H
 
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 #include <map>
 

diff --git a/include/caffe2/zoo/alexnet.h b/include/caffe2/zoo/alexnet.h
@@ -68,7 +68,7 @@ class AlexNetModel : public ModelUtil {
     predict.SetName("AlexNet");
     auto input = "data";
   std:
-    string layer = input;
+    std::string layer = input;
     predict.AddInput(layer);
     layer = AddConvPool("1", layer, 3, 96, 4, 0, 11, false)->output(0);
     layer = AddConvPool("2", layer, 48, 256, 1, 2, 5, true)->output(0);

diff --git a/include/caffe2/zoo/googlenet.h b/include/caffe2/zoo/googlenet.h
@@ -123,7 +123,7 @@ class GoogleNetModel : public ModelUtil {
     predict.SetName("GoogleNet");
     auto input = "data";
   std:
-    string layer = input;
+    std::string layer = input;
     predict.AddInput(layer);
     layer = AddFirst("1", layer, 3, 64)->output(0);
     layer = AddSecond("2", layer, 64, 192)->output(0);

diff --git a/include/caffe2/zoo/vgg.h b/include/caffe2/zoo/vgg.h
@@ -48,7 +48,7 @@ class VGGModel : public ModelUtil {
     predict.SetName("VGG" + std::to_string(type));
     auto input = "data";
   std:
-    string layer = input;
+    std::string layer = input;
     predict.AddInput(layer);
 
     layer = AddConvOps(layer, "conv1_1", 3, 64, 1, 1, 3)->output(0);

diff --git a/src/caffe2/binaries/diff.cc b/src/caffe2/binaries/diff.cc
@@ -1,9 +1,9 @@
-#include "caffe2/core/init.h"
-#include "caffe2/core/net.h"
+#include <caffe2/core/init.h>
+#include <caffe2/core/net.h>
 #include "caffe2/zoo/keeper.h"
 
-#include "google/protobuf/io/zero_copy_stream_impl.h"
-#include "google/protobuf/text_format.h"
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/text_format.h>
 
 CAFFE2_DEFINE_string(model, "googlenet", "Name of model.");
 CAFFE2_DEFINE_bool(short, false, "use short format.");

diff --git a/src/caffe2/binaries/dream.cc b/src/caffe2/binaries/dream.cc
@@ -1,12 +1,12 @@
-#include "caffe2/core/init.h"
-#include "caffe2/core/net.h"
+#include <caffe2/core/init.h>
+#include <caffe2/core/net.h>
 #include "caffe2/util/blob.h"
 #include "caffe2/util/tensor.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/zoo/keeper.h"
 
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
 
 #include "caffe2/util/misc.h"
 #include "res/imagenet_classes.h"

diff --git a/src/caffe2/binaries/imagenet.cc b/src/caffe2/binaries/imagenet.cc
@@ -1,13 +1,10 @@
-#include "caffe2/core/init.h"
-#include "caffe2/core/net.h"
+#include <caffe2/core/init.h>
+#include <caffe2/core/net.h>
 #include "caffe2/util/blob.h"
 #include "caffe2/util/tensor.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/zoo/keeper.h"
 
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-
 #include "caffe2/util/cmd.h"
 #include "res/imagenet_classes.h"
 

diff --git a/src/caffe2/binaries/intro.cc b/src/caffe2/binaries/intro.cc
@@ -1,6 +1,6 @@
-#include "caffe2/core/init.h"
-#include "caffe2/core/operator.h"
-#include "caffe2/core/operator_gradient.h"
+#include <caffe2/core/init.h>
+#include <caffe2/core/operator.h>
+#include <caffe2/core/operator_gradient.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/binaries/mnist.cc b/src/caffe2/binaries/mnist.cc
@@ -1,11 +1,11 @@
-#include "caffe2/core/init.h"
+#include <caffe2/core/init.h>
 #include "caffe2/util/model.h"
 #include "caffe2/util/net.h"
 
 #include "caffe2/util/window.h"
 
 #ifdef WITH_CUDA
-#include "caffe2/core/context_gpu.h"
+#include <caffe2/core/context_gpu.h>
 #endif
 
 CAFFE2_DEFINE_string(train_db, "res/mnist-train-nchw-leveldb",

diff --git a/src/caffe2/binaries/plot.cc b/src/caffe2/binaries/plot.cc
@@ -1,5 +1,5 @@
 #include "caffe2/util/plot.h"
-#include "caffe2/core/init.h"
+#include <caffe2/core/init.h>
 #include "caffe2/util/window.h"
 
 namespace caffe2 {

diff --git a/src/caffe2/binaries/pretrained.cc b/src/caffe2/binaries/pretrained.cc
@@ -1,9 +1,9 @@
-#include "caffe2/core/init.h"
-#include "caffe2/core/predictor.h"
+#include <caffe2/core/init.h>
+#include <caffe2/core/predictor.h>
 #include "caffe2/utils/proto_utils.h"
 
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
 
 #include "res/imagenet_classes.h"
 

diff --git a/src/caffe2/binaries/retrain.cc b/src/caffe2/binaries/retrain.cc
@@ -1,8 +1,8 @@
 #include "caffe2/util/misc.h"
 
-#include "caffe2/core/db.h"
-#include "caffe2/core/init.h"
-#include "caffe2/core/operator_gradient.h"
+#include <caffe2/core/db.h>
+#include <caffe2/core/init.h>
+#include <caffe2/core/operator_gradient.h>
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/zoo/keeper.h"
 

diff --git a/src/caffe2/binaries/rnn.cc b/src/caffe2/binaries/rnn.cc
@@ -1,4 +1,4 @@
-#include "caffe2/core/init.h"
+#include <caffe2/core/init.h>
 #include "caffe2/util/blob.h"
 #include "caffe2/util/net.h"
 

diff --git a/src/caffe2/binaries/toy.cc b/src/caffe2/binaries/toy.cc
@@ -1,6 +1,6 @@
-#include "caffe2/core/init.h"
-#include "caffe2/core/operator.h"
-#include "caffe2/core/operator_gradient.h"
+#include <caffe2/core/init.h>
+#include <caffe2/core/operator.h>
+#include <caffe2/core/operator_gradient.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/binaries/train.cc b/src/caffe2/binaries/train.cc
@@ -1,8 +1,8 @@
 #include "caffe2/util/misc.h"
 
-#include "caffe2/core/db.h"
-#include "caffe2/core/init.h"
-#include "caffe2/core/operator_gradient.h"
+#include <caffe2/core/db.h>
+#include <caffe2/core/init.h>
+#include <caffe2/core/operator_gradient.h>
 #include "caffe2/util/plot.h"
 #include "caffe2/util/window.h"
 #include "caffe2/utils/proto_utils.h"

diff --git a/src/caffe2/operator/affine_scale_op.cc b/src/caffe2/operator/affine_scale_op.cc
@@ -1,4 +1,4 @@
-#include "caffe2/operator/affine_scale_op.h"
+#include <caffe2/operator/affine_scale_op.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/affine_scale_op.cu b/src/caffe2/operator/affine_scale_op.cu
@@ -1,5 +1,5 @@
-#include "caffe2/operator/affine_scale_op.h"
-#include "caffe2/core/context_gpu.h"
+#include <caffe2/operator/affine_scale_op.h>
+#include <caffe2/core/context_gpu.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/back_mean_op.cc b/src/caffe2/operator/back_mean_op.cc
@@ -1,4 +1,4 @@
-#include "caffe2/operator/back_mean_op.h"
+#include <caffe2/operator/back_mean_op.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/back_mean_op.cu b/src/caffe2/operator/back_mean_op.cu
@@ -1,5 +1,5 @@
-#include "caffe2/operator/back_mean_op.h"
-#include "caffe2/core/context_gpu.h"
+#include <caffe2/operator/back_mean_op.h>
+#include <caffe2/core/context_gpu.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/cout_op.cc b/src/caffe2/operator/cout_op.cc
@@ -1,9 +1,9 @@
-#include "caffe2/operator/cout_op.h"
+#include <caffe2/operator/cout_op.h>
 
 #include "caffe2/util/tensor.h"
 
 #ifdef WITH_CUDA
-#include "caffe2/core/context_gpu.h"
+#include <caffe2/core/context_gpu.h>
 #endif
 
 namespace caffe2 {

diff --git a/src/caffe2/operator/diagonal_op.cc b/src/caffe2/operator/diagonal_op.cc
@@ -1,4 +1,4 @@
-#include "caffe2/operator/diagonal_op.h"
+#include <caffe2/operator/diagonal_op.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/diagonal_op.cu b/src/caffe2/operator/diagonal_op.cu
@@ -1,5 +1,5 @@
-#include "caffe2/operator/diagonal_op.h"
-#include "caffe2/core/context_gpu.h"
+#include <caffe2/operator/diagonal_op.h>
+#include <caffe2/core/context_gpu.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/mean_stdev_op.cc b/src/caffe2/operator/mean_stdev_op.cc
@@ -1,4 +1,4 @@
-#include "caffe2/operator/mean_stdev_op.h"
+#include <caffe2/operator/mean_stdev_op.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/mean_stdev_op.cu b/src/caffe2/operator/mean_stdev_op.cu
@@ -1,5 +1,5 @@
-#include "caffe2/operator/mean_stdev_op.h"
-#include "caffe2/core/context_gpu.h"
+#include <caffe2/operator/mean_stdev_op.h>
+#include <caffe2/core/context_gpu.h>
 
 namespace caffe2 {
 

diff --git a/src/caffe2/operator/show_worst_op.cc b/src/caffe2/operator/show_worst_op.cc
@@ -1,16 +1,13 @@
-#include "caffe2/operator/show_worst_op.h"
+#include <caffe2/operator/show_worst_op.h>
 
 #include "caffe2/util/tensor.h"
 
 #ifdef WITH_CUDA
-#include "caffe2/core/common_cudnn.h"
-#include "caffe2/core/context_gpu.h"
-#include "caffe2/core/types.h"
+#include <caffe2/core/common_cudnn.h>
+#include <caffe2/core/context_gpu.h>
+#include <caffe2/core/types.h>
 #endif
 
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-
 namespace caffe2 {
 
 void show_worst(const TensorCPU &X, const TensorCPU &label,