diff options
| author | Kang Kim <kkhoot@gmail.com> | 2015-10-19 00:58:55 +0900 |
|---|---|---|
| committer | Kang Kim <kkhoot@gmail.com> | 2015-10-21 00:32:48 +0900 |
| commit | 80d045263f26c41a1e886906a30d649a5c812038 (patch) | |
| tree | 9cf004bf93564c293aa83ddba520c0ebf218b418 | |
| parent | 93212e61aa9382762954a01c62f9f0a96d9ff00d (diff) | |
| download | caffeonacl-80d045263f26c41a1e886906a30d649a5c812038.tar.gz caffeonacl-80d045263f26c41a1e886906a30d649a5c812038.tar.bz2 caffeonacl-80d045263f26c41a1e886906a30d649a5c812038.zip | |
Clean redundant/unnecessary headers
163 files changed, 86 insertions, 392 deletions
diff --git a/include/caffe/blob.hpp b/include/caffe/blob.hpp index fea5117e..af360ac2 100644 --- a/include/caffe/blob.hpp +++ b/include/caffe/blob.hpp @@ -8,7 +8,6 @@ #include "caffe/common.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/syncedmem.hpp" -#include "caffe/util/math_functions.hpp" const int kMaxBlobAxes = 32; diff --git a/include/caffe/common_layers.hpp b/include/caffe/common_layers.hpp index 21a27d75..95358d4c 100644 --- a/include/caffe/common_layers.hpp +++ b/include/caffe/common_layers.hpp @@ -1,16 +1,11 @@ #ifndef CAFFE_COMMON_LAYERS_HPP_ #define CAFFE_COMMON_LAYERS_HPP_ -#include <string> #include <utility> #include <vector> #include "caffe/blob.hpp" -#include "caffe/common.hpp" -#include "caffe/data_layers.hpp" #include "caffe/layer.hpp" -#include "caffe/loss_layers.hpp" -#include "caffe/neuron_layers.hpp" #include "caffe/proto/caffe.pb.h" namespace caffe { diff --git a/include/caffe/filler.hpp b/include/caffe/filler.hpp index 888f4a4b..dad9ad46 100644 --- a/include/caffe/filler.hpp +++ b/include/caffe/filler.hpp @@ -8,7 +8,6 @@ #include <string> #include "caffe/blob.hpp" -#include "caffe/common.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" diff --git a/include/caffe/layer.hpp b/include/caffe/layer.hpp index a0d1d4ec..10f353f9 100644 --- a/include/caffe/layer.hpp +++ b/include/caffe/layer.hpp @@ -9,7 +9,7 @@ #include "caffe/common.hpp" #include "caffe/layer_factory.hpp" #include "caffe/proto/caffe.pb.h" -#include "caffe/util/device_alternate.hpp" +#include "caffe/util/math_functions.hpp" /** Forward declare boost::thread instead of including boost/thread.hpp diff --git a/include/caffe/loss_layers.hpp b/include/caffe/loss_layers.hpp index 8d41af34..d08ad9b6 100644 --- a/include/caffe/loss_layers.hpp +++ b/include/caffe/loss_layers.hpp @@ -6,7 +6,6 @@ #include <vector> #include "caffe/blob.hpp" -#include "caffe/common.hpp" #include "caffe/layer.hpp" #include "caffe/neuron_layers.hpp" #include "caffe/proto/caffe.pb.h" diff --git a/include/caffe/syncedmem.hpp b/include/caffe/syncedmem.hpp index 3d92a0ea..38ee4664 100644 --- a/include/caffe/syncedmem.hpp +++ b/include/caffe/syncedmem.hpp @@ -4,7 +4,6 @@ #include <cstdlib> #include "caffe/common.hpp" -#include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/include/caffe/util/blocking_queue.hpp b/include/caffe/util/blocking_queue.hpp index 955e12cc..d3de2e59 100644 --- a/include/caffe/util/blocking_queue.hpp +++ b/include/caffe/util/blocking_queue.hpp @@ -4,8 +4,6 @@ #include <queue> #include <string> -#include "caffe/common.hpp" - namespace caffe { template<typename T> diff --git a/include/caffe/util/io.hpp b/include/caffe/util/io.hpp index 6070b4c7..d6cfa442 100644 --- a/include/caffe/util/io.hpp +++ b/include/caffe/util/io.hpp @@ -6,7 +6,6 @@ #include "google/protobuf/message.h" -#include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/proto/caffe.pb.h" diff --git a/src/caffe/layers/absval_layer.cpp b/src/caffe/layers/absval_layer.cpp index 5ce28c9e..7e552352 100644 --- a/src/caffe/layers/absval_layer.cpp +++ b/src/caffe/layers/absval_layer.cpp @@ -1,6 +1,5 @@ #include <vector> -#include "caffe/layer.hpp" #include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/layers/absval_layer.cu b/src/caffe/layers/absval_layer.cu index bb310e1a..b5a6c25a 100644 --- a/src/caffe/layers/absval_layer.cu +++ b/src/caffe/layers/absval_layer.cu @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/accuracy_layer.cpp b/src/caffe/layers/accuracy_layer.cpp index e2d8d9f8..ae2df1f1 100644 --- a/src/caffe/layers/accuracy_layer.cpp +++ b/src/caffe/layers/accuracy_layer.cpp @@ -1,12 +1,9 @@ -#include <algorithm> #include <functional> #include <utility> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/argmax_layer.cpp b/src/caffe/layers/argmax_layer.cpp index 0c0a932d..44df8d4e 100644 --- a/src/caffe/layers/argmax_layer.cpp +++ b/src/caffe/layers/argmax_layer.cpp @@ -3,8 +3,7 @@ #include <utility> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/common_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/base_conv_layer.cpp b/src/caffe/layers/base_conv_layer.cpp index c6b47550..316cb0fd 100644 --- a/src/caffe/layers/base_conv_layer.cpp +++ b/src/caffe/layers/base_conv_layer.cpp @@ -2,7 +2,6 @@ #include <vector> #include "caffe/filler.hpp" -#include "caffe/layer.hpp" #include "caffe/util/im2col.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/base_data_layer.cpp b/src/caffe/layers/base_data_layer.cpp index b90bd4e0..d77f91c9 100644 --- a/src/caffe/layers/base_data_layer.cpp +++ b/src/caffe/layers/base_data_layer.cpp @@ -1,10 +1,7 @@ #include <boost/thread.hpp> -#include <string> #include <vector> #include "caffe/data_layers.hpp" -#include "caffe/net.hpp" -#include "caffe/util/io.hpp" namespace caffe { diff --git a/src/caffe/layers/batch_reindex_layer.cpp b/src/caffe/layers/batch_reindex_layer.cpp index 3bf757c7..3d3ce32c 100644 --- a/src/caffe/layers/batch_reindex_layer.cpp +++ b/src/caffe/layers/batch_reindex_layer.cpp @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/batch_reindex_layer.cu b/src/caffe/layers/batch_reindex_layer.cu index c418cab9..0b5ccf09 100644 --- a/src/caffe/layers/batch_reindex_layer.cu +++ b/src/caffe/layers/batch_reindex_layer.cu @@ -2,9 +2,8 @@ #include <utility> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/bnll_layer.cpp b/src/caffe/layers/bnll_layer.cpp index 9ba0ea9a..1e422a54 100644 --- a/src/caffe/layers/bnll_layer.cpp +++ b/src/caffe/layers/bnll_layer.cpp @@ -1,8 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/bnll_layer.cu b/src/caffe/layers/bnll_layer.cu index d963d068..3e328ef7 100644 --- a/src/caffe/layers/bnll_layer.cu +++ b/src/caffe/layers/bnll_layer.cu @@ -1,8 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/concat_layer.cpp b/src/caffe/layers/concat_layer.cpp index 86b500de..14cbfb11 100644 --- a/src/caffe/layers/concat_layer.cpp +++ b/src/caffe/layers/concat_layer.cpp @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_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 617701e2..e1e9449e 100644 --- a/src/caffe/layers/concat_layer.cu +++ b/src/caffe/layers/concat_layer.cu @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/contrastive_loss_layer.cpp b/src/caffe/layers/contrastive_loss_layer.cpp index 25e16781..74002087 100644 --- a/src/caffe/layers/contrastive_loss_layer.cpp +++ b/src/caffe/layers/contrastive_loss_layer.cpp @@ -1,9 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" #include "caffe/loss_layers.hpp" -#include "caffe/util/io.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/contrastive_loss_layer.cu b/src/caffe/layers/contrastive_loss_layer.cu index 93123931..ee278407 100644 --- a/src/caffe/layers/contrastive_loss_layer.cu +++ b/src/caffe/layers/contrastive_loss_layer.cu @@ -1,10 +1,8 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" +#include "caffe/loss_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 fb50bb09..efd69d45 100644 --- a/src/caffe/layers/conv_layer.cpp +++ b/src/caffe/layers/conv_layer.cpp @@ -1,9 +1,5 @@ #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.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 b429d2b4..a534b356 100644 --- a/src/caffe/layers/conv_layer.cu +++ b/src/caffe/layers/conv_layer.cu @@ -1,9 +1,5 @@ #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_conv_layer.cpp b/src/caffe/layers/cudnn_conv_layer.cpp index d7b1e0d6..8b61249a 100644 --- a/src/caffe/layers/cudnn_conv_layer.cpp +++ b/src/caffe/layers/cudnn_conv_layer.cpp @@ -2,10 +2,6 @@ #include <algorithm> #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_conv_layer.cu b/src/caffe/layers/cudnn_conv_layer.cu index e88e4dd3..63b6ab9c 100644 --- a/src/caffe/layers/cudnn_conv_layer.cu +++ b/src/caffe/layers/cudnn_conv_layer.cu @@ -1,10 +1,6 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lcn_layer.cpp b/src/caffe/layers/cudnn_lcn_layer.cpp index 866d810b..4c700786 100644 --- a/src/caffe/layers/cudnn_lcn_layer.cpp +++ b/src/caffe/layers/cudnn_lcn_layer.cpp @@ -1,10 +1,6 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lcn_layer.cu b/src/caffe/layers/cudnn_lcn_layer.cu index c07ade72..e79c7458 100644 --- a/src/caffe/layers/cudnn_lcn_layer.cu +++ b/src/caffe/layers/cudnn_lcn_layer.cu @@ -1,10 +1,6 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lrn_layer.cpp b/src/caffe/layers/cudnn_lrn_layer.cpp index 6e992149..a03db3bd 100644 --- a/src/caffe/layers/cudnn_lrn_layer.cpp +++ b/src/caffe/layers/cudnn_lrn_layer.cpp @@ -1,10 +1,6 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lrn_layer.cu b/src/caffe/layers/cudnn_lrn_layer.cu index f9923033..327e44b4 100644 --- a/src/caffe/layers/cudnn_lrn_layer.cu +++ b/src/caffe/layers/cudnn_lrn_layer.cu @@ -1,10 +1,6 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_pooling_layer.cpp b/src/caffe/layers/cudnn_pooling_layer.cpp index c92c4e47..5f995d45 100644 --- a/src/caffe/layers/cudnn_pooling_layer.cpp +++ b/src/caffe/layers/cudnn_pooling_layer.cpp @@ -1,10 +1,6 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_pooling_layer.cu b/src/caffe/layers/cudnn_pooling_layer.cu index a952b855..9aa39ed8 100644 --- a/src/caffe/layers/cudnn_pooling_layer.cu +++ b/src/caffe/layers/cudnn_pooling_layer.cu @@ -1,10 +1,6 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_relu_layer.cpp b/src/caffe/layers/cudnn_relu_layer.cpp index 759d8398..e6b6d5a9 100644 --- a/src/caffe/layers/cudnn_relu_layer.cpp +++ b/src/caffe/layers/cudnn_relu_layer.cpp @@ -1,8 +1,6 @@ #ifdef USE_CUDNN -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_relu_layer.cu b/src/caffe/layers/cudnn_relu_layer.cu index 21d14857..2a53a49b 100644 --- a/src/caffe/layers/cudnn_relu_layer.cu +++ b/src/caffe/layers/cudnn_relu_layer.cu @@ -1,8 +1,6 @@ #ifdef USE_CUDNN -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_sigmoid_layer.cpp b/src/caffe/layers/cudnn_sigmoid_layer.cpp index 32637873..4b489fa5 100644 --- a/src/caffe/layers/cudnn_sigmoid_layer.cpp +++ b/src/caffe/layers/cudnn_sigmoid_layer.cpp @@ -1,8 +1,6 @@ #ifdef USE_CUDNN -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_sigmoid_layer.cu b/src/caffe/layers/cudnn_sigmoid_layer.cu index 7a06cf72..9de5c742 100644 --- a/src/caffe/layers/cudnn_sigmoid_layer.cu +++ b/src/caffe/layers/cudnn_sigmoid_layer.cu @@ -1,8 +1,6 @@ #ifdef USE_CUDNN -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_softmax_layer.cpp b/src/caffe/layers/cudnn_softmax_layer.cpp index 77a3225a..f5cd0450 100644 --- a/src/caffe/layers/cudnn_softmax_layer.cpp +++ b/src/caffe/layers/cudnn_softmax_layer.cpp @@ -1,12 +1,8 @@ #ifdef USE_CUDNN -#include <algorithm> -#include <cfloat> #include <vector> #include "thrust/device_vector.h" -#include "caffe/layer.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_softmax_layer.cu b/src/caffe/layers/cudnn_softmax_layer.cu index a9e2fcef..c270202f 100644 --- a/src/caffe/layers/cudnn_softmax_layer.cu +++ b/src/caffe/layers/cudnn_softmax_layer.cu @@ -1,12 +1,8 @@ #ifdef USE_CUDNN -#include <algorithm> -#include <cfloat> #include <vector> #include "thrust/device_vector.h" -#include "caffe/layer.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_tanh_layer.cpp b/src/caffe/layers/cudnn_tanh_layer.cpp index 376faad3..46296818 100644 --- a/src/caffe/layers/cudnn_tanh_layer.cpp +++ b/src/caffe/layers/cudnn_tanh_layer.cpp @@ -1,9 +1,7 @@ #ifdef USE_CUDNN -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_tanh_layer.cu b/src/caffe/layers/cudnn_tanh_layer.cu index d287f6fe..84f784b3 100644 --- a/src/caffe/layers/cudnn_tanh_layer.cu +++ b/src/caffe/layers/cudnn_tanh_layer.cu @@ -1,9 +1,7 @@ #ifdef USE_CUDNN -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp index 71f8cb09..49ac858e 100644 --- a/src/caffe/layers/data_layer.cpp +++ b/src/caffe/layers/data_layer.cpp @@ -3,15 +3,11 @@ #endif // USE_OPENCV #include <stdint.h> -#include <string> #include <vector> -#include "caffe/common.hpp" #include "caffe/data_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/benchmark.hpp" -#include "caffe/util/io.hpp" namespace caffe { diff --git a/src/caffe/layers/deconv_layer.cpp b/src/caffe/layers/deconv_layer.cpp index 91aabb31..5038b638 100644 --- a/src/caffe/layers/deconv_layer.cpp +++ b/src/caffe/layers/deconv_layer.cpp @@ -1,9 +1,5 @@ #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/deconv_layer.cu b/src/caffe/layers/deconv_layer.cu index 5dbdcc31..0e8e2ede 100644 --- a/src/caffe/layers/deconv_layer.cu +++ b/src/caffe/layers/deconv_layer.cu @@ -1,9 +1,5 @@ #include <vector> -#include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/im2col.hpp" -#include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/dropout_layer.cpp b/src/caffe/layers/dropout_layer.cpp index ec1256fd..eb7a8a9a 100644 --- a/src/caffe/layers/dropout_layer.cpp +++ b/src/caffe/layers/dropout_layer.cpp @@ -2,11 +2,8 @@ #include <vector> -#include "caffe/common.hpp" -#include "caffe/layer.hpp" -#include "caffe/syncedmem.hpp" +#include "caffe/neuron_layers.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 f9ea04f4..028fc026 100644 --- a/src/caffe/layers/dropout_layer.cu +++ b/src/caffe/layers/dropout_layer.cu @@ -1,12 +1,7 @@ -#include <algorithm> -#include <limits> #include <vector> -#include "caffe/common.hpp" -#include "caffe/layer.hpp" -#include "caffe/syncedmem.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/dummy_data_layer.cpp b/src/caffe/layers/dummy_data_layer.cpp index 6b0d6174..ab0478c8 100644 --- a/src/caffe/layers/dummy_data_layer.cpp +++ b/src/caffe/layers/dummy_data_layer.cpp @@ -1,8 +1,7 @@ #include <vector> +#include "caffe/data_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/layer.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 a8070073..7924fbee 100644 --- a/src/caffe/layers/eltwise_layer.cpp +++ b/src/caffe/layers/eltwise_layer.cpp @@ -1,9 +1,8 @@ #include <cfloat> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_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 2247870d..01404209 100644 --- a/src/caffe/layers/eltwise_layer.cu +++ b/src/caffe/layers/eltwise_layer.cu @@ -1,9 +1,8 @@ #include <cfloat> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/embed_layer.cpp b/src/caffe/layers/embed_layer.cpp index be6b2cd2..52704a06 100644 --- a/src/caffe/layers/embed_layer.cpp +++ b/src/caffe/layers/embed_layer.cpp @@ -1,10 +1,7 @@ #include <vector> -#include "caffe/blob.hpp" -#include "caffe/common.hpp" #include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/embed_layer.cu b/src/caffe/layers/embed_layer.cu index 62a4db81..cd4b40f5 100644 --- a/src/caffe/layers/embed_layer.cu +++ b/src/caffe/layers/embed_layer.cu @@ -1,10 +1,7 @@ #include <vector> -#include "caffe/blob.hpp" -#include "caffe/common.hpp" #include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/layer.hpp" #include "caffe/util/gpu_util.cuh" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/layers/euclidean_loss_layer.cpp b/src/caffe/layers/euclidean_loss_layer.cpp index 80efa31b..7338953d 100644 --- a/src/caffe/layers/euclidean_loss_layer.cpp +++ b/src/caffe/layers/euclidean_loss_layer.cpp @@ -1,9 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" +#include "caffe/loss_layers.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 5b1de3ad..1aa79bd5 100644 --- a/src/caffe/layers/euclidean_loss_layer.cu +++ b/src/caffe/layers/euclidean_loss_layer.cu @@ -1,9 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/exp_layer.cpp b/src/caffe/layers/exp_layer.cpp index c7e7c60c..f85692d6 100644 --- a/src/caffe/layers/exp_layer.cpp +++ b/src/caffe/layers/exp_layer.cpp @@ -1,9 +1,7 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/exp_layer.cu b/src/caffe/layers/exp_layer.cu index 2d75d8dd..9e24bbee 100644 --- a/src/caffe/layers/exp_layer.cu +++ b/src/caffe/layers/exp_layer.cu @@ -1,9 +1,7 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/filter_layer.cpp b/src/caffe/layers/filter_layer.cpp index be1db32d..e8b62a5d 100644 --- a/src/caffe/layers/filter_layer.cpp +++ b/src/caffe/layers/filter_layer.cpp @@ -1,9 +1,7 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/filter_layer.cu b/src/caffe/layers/filter_layer.cu index cf929eee..746e91c9 100644 --- a/src/caffe/layers/filter_layer.cu +++ b/src/caffe/layers/filter_layer.cu @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.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 f7e5c9c2..d831fb5c 100644 --- a/src/caffe/layers/flatten_layer.cpp +++ b/src/caffe/layers/flatten_layer.cpp @@ -1,8 +1,6 @@ #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/common_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp index 8ced5103..c765fa02 100644 --- a/src/caffe/layers/hdf5_data_layer.cpp +++ b/src/caffe/layers/hdf5_data_layer.cpp @@ -15,7 +15,6 @@ TODO: #include "stdint.h" #include "caffe/data_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/hdf5.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu index 5e3e4ced..6ac499c6 100644 --- a/src/caffe/layers/hdf5_data_layer.cu +++ b/src/caffe/layers/hdf5_data_layer.cu @@ -4,15 +4,12 @@ TODO: */ #include <stdint.h> -#include <string> #include <vector> #include "hdf5.h" #include "hdf5_hl.h" #include "caffe/data_layers.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_output_layer.cpp b/src/caffe/layers/hdf5_output_layer.cpp index 56788c21..dbde65da 100644 --- a/src/caffe/layers/hdf5_output_layer.cpp +++ b/src/caffe/layers/hdf5_output_layer.cpp @@ -3,11 +3,8 @@ #include "hdf5.h" #include "hdf5_hl.h" -#include "caffe/blob.hpp" -#include "caffe/common.hpp" -#include "caffe/layer.hpp" +#include "caffe/data_layers.hpp" #include "caffe/util/hdf5.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_output_layer.cu b/src/caffe/layers/hdf5_output_layer.cu index eb6d0e47..ca8f2616 100644 --- a/src/caffe/layers/hdf5_output_layer.cu +++ b/src/caffe/layers/hdf5_output_layer.cu @@ -3,10 +3,7 @@ #include "hdf5.h" #include "hdf5_hl.h" -#include "caffe/blob.hpp" -#include "caffe/common.hpp" -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/data_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/hinge_loss_layer.cpp b/src/caffe/layers/hinge_loss_layer.cpp index a2fb2a18..a88c8775 100644 --- a/src/caffe/layers/hinge_loss_layer.cpp +++ b/src/caffe/layers/hinge_loss_layer.cpp @@ -1,12 +1,8 @@ #include <algorithm> -#include <cfloat> -#include <cmath> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" +#include "caffe/loss_layers.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 595c9dbb..f3b0f710 100644 --- a/src/caffe/layers/im2col_layer.cpp +++ b/src/caffe/layers/im2col_layer.cpp @@ -1,7 +1,5 @@ #include <vector> -#include "caffe/common.hpp" -#include "caffe/layer.hpp" #include "caffe/util/im2col.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/im2col_layer.cu b/src/caffe/layers/im2col_layer.cu index cd507623..4633628b 100644 --- a/src/caffe/layers/im2col_layer.cu +++ b/src/caffe/layers/im2col_layer.cu @@ -1,7 +1,5 @@ #include <vector> -#include "caffe/common.hpp" -#include "caffe/layer.hpp" #include "caffe/util/im2col.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/image_data_layer.cpp b/src/caffe/layers/image_data_layer.cpp index 3d2190f8..9a7df5a7 100644 --- a/src/caffe/layers/image_data_layer.cpp +++ b/src/caffe/layers/image_data_layer.cpp @@ -8,7 +8,6 @@ #include <vector> #include "caffe/data_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/benchmark.hpp" #include "caffe/util/io.hpp" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/layers/infogain_loss_layer.cpp b/src/caffe/layers/infogain_loss_layer.cpp index a1e0b40d..88bd8aaf 100644 --- a/src/caffe/layers/infogain_loss_layer.cpp +++ b/src/caffe/layers/infogain_loss_layer.cpp @@ -1,12 +1,9 @@ #include <algorithm> -#include <cfloat> #include <cmath> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/loss_layers.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 83c3235e..274744ea 100644 --- a/src/caffe/layers/inner_product_layer.cpp +++ b/src/caffe/layers/inner_product_layer.cpp @@ -1,11 +1,8 @@ #include <vector> -#include "caffe/blob.hpp" -#include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/layer.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 c0ebd2c4..e91e94fc 100644 --- a/src/caffe/layers/inner_product_layer.cu +++ b/src/caffe/layers/inner_product_layer.cu @@ -1,11 +1,8 @@ #include <vector> -#include "caffe/blob.hpp" -#include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/log_layer.cpp b/src/caffe/layers/log_layer.cpp index 55a227f6..a1876b9d 100644 --- a/src/caffe/layers/log_layer.cpp +++ b/src/caffe/layers/log_layer.cpp @@ -1,7 +1,5 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" #include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/layers/log_layer.cu b/src/caffe/layers/log_layer.cu index 847c86cd..055b713b 100644 --- a/src/caffe/layers/log_layer.cu +++ b/src/caffe/layers/log_layer.cu @@ -1,7 +1,5 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" #include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/layers/loss_layer.cpp b/src/caffe/layers/loss_layer.cpp index 3496a5c2..c10466db 100644 --- a/src/caffe/layers/loss_layer.cpp +++ b/src/caffe/layers/loss_layer.cpp @@ -1,12 +1,6 @@ -#include <algorithm> -#include <cfloat> -#include <cmath> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" -#include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/loss_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/lrn_layer.cpp b/src/caffe/layers/lrn_layer.cpp index d18a04ef..cc561811 100644 --- a/src/caffe/layers/lrn_layer.cpp +++ b/src/caffe/layers/lrn_layer.cpp @@ -1,6 +1,5 @@ #include <vector> -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/lrn_layer.cu b/src/caffe/layers/lrn_layer.cu index 001b3c34..4523d410 100644 --- a/src/caffe/layers/lrn_layer.cu +++ b/src/caffe/layers/lrn_layer.cu @@ -1,6 +1,5 @@ #include <vector> -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/memory_data_layer.cpp b/src/caffe/layers/memory_data_layer.cpp index 2370aa04..13a3d9f6 100644 --- a/src/caffe/layers/memory_data_layer.cpp +++ b/src/caffe/layers/memory_data_layer.cpp @@ -5,8 +5,6 @@ #include <vector> #include "caffe/data_layers.hpp" -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" namespace caffe { diff --git a/src/caffe/layers/multinomial_logistic_loss_layer.cpp b/src/caffe/layers/multinomial_logistic_loss_layer.cpp index 4267a594..59745923 100644 --- a/src/caffe/layers/multinomial_logistic_loss_layer.cpp +++ b/src/caffe/layers/multinomial_logistic_loss_layer.cpp @@ -1,12 +1,9 @@ #include <algorithm> -#include <cfloat> #include <cmath> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/util/io.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/mvn_layer.cpp b/src/caffe/layers/mvn_layer.cpp index 61c2141e..0e730144 100644 --- a/src/caffe/layers/mvn_layer.cpp +++ b/src/caffe/layers/mvn_layer.cpp @@ -1,8 +1,6 @@ -#include <algorithm> #include <vector> #include "caffe/common_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/mvn_layer.cu b/src/caffe/layers/mvn_layer.cu index 5cbb112d..b7e3b3ce 100644 --- a/src/caffe/layers/mvn_layer.cu +++ b/src/caffe/layers/mvn_layer.cu @@ -1,8 +1,6 @@ -#include <algorithm> #include <vector> #include "caffe/common_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/neuron_layer.cpp b/src/caffe/layers/neuron_layer.cpp index ba67b438..1dcb2c06 100644 --- a/src/caffe/layers/neuron_layer.cpp +++ b/src/caffe/layers/neuron_layer.cpp @@ -1,7 +1,6 @@ #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/pooling_layer.cpp b/src/caffe/layers/pooling_layer.cpp index c8d41499..3a7de42c 100644 --- a/src/caffe/layers/pooling_layer.cpp +++ b/src/caffe/layers/pooling_layer.cpp @@ -2,9 +2,6 @@ #include <cfloat> #include <vector> -#include "caffe/common.hpp" -#include "caffe/layer.hpp" -#include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/pooling_layer.cu b/src/caffe/layers/pooling_layer.cu index ca4b13f7..5e94ce2b 100644 --- a/src/caffe/layers/pooling_layer.cu +++ b/src/caffe/layers/pooling_layer.cu @@ -2,7 +2,6 @@ #include <cfloat> #include <vector> -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" #include "caffe/vision_layers.hpp" diff --git a/src/caffe/layers/power_layer.cpp b/src/caffe/layers/power_layer.cpp index 4fe34c49..6304fadd 100644 --- a/src/caffe/layers/power_layer.cpp +++ b/src/caffe/layers/power_layer.cpp @@ -1,9 +1,7 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/neuron_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 90d94405..680faad4 100644 --- a/src/caffe/layers/power_layer.cu +++ b/src/caffe/layers/power_layer.cu @@ -1,9 +1,7 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/prelu_layer.cpp b/src/caffe/layers/prelu_layer.cpp index 81831755..b5a294e1 100644 --- a/src/caffe/layers/prelu_layer.cpp +++ b/src/caffe/layers/prelu_layer.cpp @@ -2,8 +2,7 @@ #include <vector> #include "caffe/filler.hpp" -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/prelu_layer.cu b/src/caffe/layers/prelu_layer.cu index 1225334f..992cd885 100644 --- a/src/caffe/layers/prelu_layer.cu +++ b/src/caffe/layers/prelu_layer.cu @@ -1,8 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/reduction_layer.cpp b/src/caffe/layers/reduction_layer.cpp index 8ae6329e..6b7925e3 100644 --- a/src/caffe/layers/reduction_layer.cpp +++ b/src/caffe/layers/reduction_layer.cpp @@ -1,10 +1,7 @@ -#include <algorithm> -#include <cfloat> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/reduction_layer.cu b/src/caffe/layers/reduction_layer.cu index 2dbd3bc9..a9a8c8d9 100644 --- a/src/caffe/layers/reduction_layer.cu +++ b/src/caffe/layers/reduction_layer.cu @@ -1,9 +1,7 @@ -#include <cfloat> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/relu_layer.cpp b/src/caffe/layers/relu_layer.cpp index cc00319a..93d09026 100644 --- a/src/caffe/layers/relu_layer.cpp +++ b/src/caffe/layers/relu_layer.cpp @@ -1,8 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/relu_layer.cu b/src/caffe/layers/relu_layer.cu index b8924c85..c18ab61f 100644 --- a/src/caffe/layers/relu_layer.cu +++ b/src/caffe/layers/relu_layer.cu @@ -1,8 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/reshape_layer.cpp b/src/caffe/layers/reshape_layer.cpp index ffe970f2..8659049b 100644 --- a/src/caffe/layers/reshape_layer.cpp +++ b/src/caffe/layers/reshape_layer.cpp @@ -1,7 +1,6 @@ #include <vector> #include "caffe/common_layers.hpp" -#include "caffe/layer.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 cc236fe1..98588637 100644 --- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp @@ -1,10 +1,7 @@ -#include <algorithm> -#include <cfloat> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/loss_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 547fa80c..48dbec41 100644 --- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu +++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu @@ -1,10 +1,7 @@ -#include <algorithm> -#include <cfloat> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/sigmoid_layer.cpp b/src/caffe/layers/sigmoid_layer.cpp index 48c38490..d4a3f877 100644 --- a/src/caffe/layers/sigmoid_layer.cpp +++ b/src/caffe/layers/sigmoid_layer.cpp @@ -1,9 +1,7 @@ -#include <algorithm> #include <cmath> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/sigmoid_layer.cu b/src/caffe/layers/sigmoid_layer.cu index e1af0657..5730636e 100644 --- a/src/caffe/layers/sigmoid_layer.cu +++ b/src/caffe/layers/sigmoid_layer.cu @@ -1,9 +1,7 @@ -#include <algorithm> #include <cmath> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/silence_layer.cpp b/src/caffe/layers/silence_layer.cpp index 7e70ab43..3974f5d4 100644 --- a/src/caffe/layers/silence_layer.cpp +++ b/src/caffe/layers/silence_layer.cpp @@ -1,7 +1,6 @@ #include <vector> #include "caffe/common_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/silence_layer.cu b/src/caffe/layers/silence_layer.cu index 34faef22..c49ecb23 100644 --- a/src/caffe/layers/silence_layer.cu +++ b/src/caffe/layers/silence_layer.cu @@ -1,7 +1,6 @@ #include <vector> #include "caffe/common_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/slice_layer.cpp b/src/caffe/layers/slice_layer.cpp index 0a059ae8..f368a249 100644 --- a/src/caffe/layers/slice_layer.cpp +++ b/src/caffe/layers/slice_layer.cpp @@ -1,9 +1,8 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_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 e8dc6cd9..d555f7d0 100644 --- a/src/caffe/layers/slice_layer.cu +++ b/src/caffe/layers/slice_layer.cu @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_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 04712c9e..8ae7d49c 100644 --- a/src/caffe/layers/softmax_layer.cpp +++ b/src/caffe/layers/softmax_layer.cpp @@ -1,9 +1,8 @@ #include <algorithm> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_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 1f9c3a41..a620fcc8 100644 --- a/src/caffe/layers/softmax_layer.cu +++ b/src/caffe/layers/softmax_layer.cu @@ -4,9 +4,8 @@ #include "thrust/device_vector.h" -#include "caffe/layer.hpp" +#include "caffe/common_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 ba312f67..dee50ac6 100644 --- a/src/caffe/layers/softmax_loss_layer.cpp +++ b/src/caffe/layers/softmax_loss_layer.cpp @@ -2,10 +2,8 @@ #include <cfloat> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/layer_factory.hpp" +#include "caffe/loss_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 7e0f3da4..42e91fa9 100644 --- a/src/caffe/layers/softmax_loss_layer.cu +++ b/src/caffe/layers/softmax_loss_layer.cu @@ -2,9 +2,8 @@ #include <cfloat> #include <vector> -#include "caffe/layer.hpp" +#include "caffe/loss_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 272cb59c..5333e578 100644 --- a/src/caffe/layers/split_layer.cpp +++ b/src/caffe/layers/split_layer.cpp @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_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 a4f5df26..73d04c98 100644 --- a/src/caffe/layers/split_layer.cu +++ b/src/caffe/layers/split_layer.cu @@ -1,8 +1,7 @@ #include <vector> -#include "caffe/layer.hpp" +#include "caffe/common_layers.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/spp_layer.cpp b/src/caffe/layers/spp_layer.cpp index d7622910..2ef4ac7a 100644 --- a/src/caffe/layers/spp_layer.cpp +++ b/src/caffe/layers/spp_layer.cpp @@ -1,11 +1,6 @@ #include <algorithm> -#include <cfloat> #include <vector> -#include "caffe/common.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/tanh_layer.cpp b/src/caffe/layers/tanh_layer.cpp index ee5ed773..9d1cac76 100644 --- a/src/caffe/layers/tanh_layer.cpp +++ b/src/caffe/layers/tanh_layer.cpp @@ -1,11 +1,9 @@ // TanH neuron activation function layer. // Adapted from ReLU layer code written by Yangqing Jia -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/tanh_layer.cu b/src/caffe/layers/tanh_layer.cu index ccd6e63e..d87bccec 100644 --- a/src/caffe/layers/tanh_layer.cu +++ b/src/caffe/layers/tanh_layer.cu @@ -1,11 +1,9 @@ // TanH neuron activation function layer. // Adapted from ReLU layer code written by Yangqing Jia -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/threshold_layer.cpp b/src/caffe/layers/threshold_layer.cpp index 2365e7b9..d6514736 100644 --- a/src/caffe/layers/threshold_layer.cpp +++ b/src/caffe/layers/threshold_layer.cpp @@ -1,7 +1,6 @@ #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/threshold_layer.cu b/src/caffe/layers/threshold_layer.cu index bfa7f159..1cd62d99 100644 --- a/src/caffe/layers/threshold_layer.cu +++ b/src/caffe/layers/threshold_layer.cu @@ -1,8 +1,6 @@ -#include <algorithm> #include <vector> -#include "caffe/layer.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/tile_layer.cpp b/src/caffe/layers/tile_layer.cpp index f55008cc..581546c4 100644 --- a/src/caffe/layers/tile_layer.cpp +++ b/src/caffe/layers/tile_layer.cpp @@ -1,7 +1,6 @@ #include <vector> #include "caffe/common_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/tile_layer.cu b/src/caffe/layers/tile_layer.cu index 7fd3bc47..fdf96090 100644 --- a/src/caffe/layers/tile_layer.cu +++ b/src/caffe/layers/tile_layer.cu @@ -1,7 +1,6 @@ #include <vector> #include "caffe/common_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/window_data_layer.cpp b/src/caffe/layers/window_data_layer.cpp index f8db61c9..3f937bc9 100644 --- a/src/caffe/layers/window_data_layer.cpp +++ b/src/caffe/layers/window_data_layer.cpp @@ -12,9 +12,7 @@ #include "opencv2/highgui/highgui.hpp" #include "opencv2/imgproc/imgproc.hpp" -#include "caffe/common.hpp" #include "caffe/data_layers.hpp" -#include "caffe/layer.hpp" #include "caffe/util/benchmark.hpp" #include "caffe/util/io.hpp" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/parallel.cpp b/src/caffe/parallel.cpp index a6d154e1..9abc92b6 100644 --- a/src/caffe/parallel.cpp +++ b/src/caffe/parallel.cpp @@ -7,7 +7,6 @@ #include <sys/mman.h> #include <sys/stat.h> -#include <cstdlib> #include <sstream> #include <string> #include <vector> diff --git a/src/caffe/syncedmem.cpp b/src/caffe/syncedmem.cpp index 632bf1f1..ec4665ec 100644 --- a/src/caffe/syncedmem.cpp +++ b/src/caffe/syncedmem.cpp @@ -1,5 +1,3 @@ -#include <cstring> - #include "caffe/common.hpp" #include "caffe/syncedmem.hpp" #include "caffe/util/math_functions.hpp" diff --git a/src/caffe/test/test_accuracy_layer.cpp b/src/caffe/test/test_accuracy_layer.cpp index ef0e57a3..5960a666 100644 --- a/src/caffe/test/test_accuracy_layer.cpp +++ b/src/caffe/test/test_accuracy_layer.cpp @@ -1,6 +1,4 @@ #include <cfloat> -#include <cmath> -#include <cstring> #include <vector> #include "gtest/gtest.h" @@ -8,8 +6,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/util/rng.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_argmax_layer.cpp b/src/caffe/test/test_argmax_layer.cpp index bbf19099..f3f2094e 100644 --- a/src/caffe/test/test_argmax_layer.cpp +++ b/src/caffe/test/test_argmax_layer.cpp @@ -5,8 +5,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_batch_reindex_layer.cpp b/src/caffe/test/test_batch_reindex_layer.cpp index 985db343..17e47f05 100644 --- a/src/caffe/test/test_batch_reindex_layer.cpp +++ b/src/caffe/test/test_batch_reindex_layer.cpp @@ -1,12 +1,11 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_blob.cpp b/src/caffe/test/test_blob.cpp index 7da6423b..a9d7d519 100644 --- a/src/caffe/test/test_blob.cpp +++ b/src/caffe/test/test_blob.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_common.cpp b/src/caffe/test/test_common.cpp index b3a61b0f..58ae5c60 100644 --- a/src/caffe/test/test_common.cpp +++ b/src/caffe/test/test_common.cpp @@ -1,5 +1,3 @@ -#include <cstring> - #include "gtest/gtest.h" #include "caffe/common.hpp" diff --git a/src/caffe/test/test_concat_layer.cpp b/src/caffe/test/test_concat_layer.cpp index ccd97eb1..8ba51f4f 100644 --- a/src/caffe/test/test_concat_layer.cpp +++ b/src/caffe/test/test_concat_layer.cpp @@ -1,12 +1,11 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_contrastive_loss_layer.cpp b/src/caffe/test/test_contrastive_loss_layer.cpp index 1e9447cb..592997e4 100644 --- a/src/caffe/test/test_contrastive_loss_layer.cpp +++ b/src/caffe/test/test_contrastive_loss_layer.cpp @@ -1,7 +1,5 @@ #include <algorithm> #include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "gtest/gtest.h" @@ -9,7 +7,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_convolution_layer.cpp b/src/caffe/test/test_convolution_layer.cpp index 9df979a2..b4747357 100644 --- a/src/caffe/test/test_convolution_layer.cpp +++ b/src/caffe/test/test_convolution_layer.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_deconvolution_layer.cpp b/src/caffe/test/test_deconvolution_layer.cpp index 770e7b27..b473dbb9 100644 --- a/src/caffe/test/test_deconvolution_layer.cpp +++ b/src/caffe/test/test_deconvolution_layer.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_eltwise_layer.cpp b/src/caffe/test/test_eltwise_layer.cpp index 8031f6e9..3b56c5ca 100644 --- a/src/caffe/test/test_eltwise_layer.cpp +++ b/src/caffe/test/test_eltwise_layer.cpp @@ -5,8 +5,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_embed_layer.cpp b/src/caffe/test/test_embed_layer.cpp index 7a4fb980..0f4caf15 100644 --- a/src/caffe/test/test_embed_layer.cpp +++ b/src/caffe/test/test_embed_layer.cpp @@ -1,12 +1,11 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_euclidean_loss_layer.cpp b/src/caffe/test/test_euclidean_loss_layer.cpp index 1949742b..9dc14de4 100644 --- a/src/caffe/test/test_euclidean_loss_layer.cpp +++ b/src/caffe/test/test_euclidean_loss_layer.cpp @@ -1,6 +1,4 @@ #include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "gtest/gtest.h" @@ -8,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_filler.cpp b/src/caffe/test/test_filler.cpp index 728b8dc5..26e9b217 100644 --- a/src/caffe/test/test_filler.cpp +++ b/src/caffe/test/test_filler.cpp @@ -1,5 +1,3 @@ -#include <cstring> - #include "gtest/gtest.h" #include "caffe/filler.hpp" diff --git a/src/caffe/test/test_filter_layer.cpp b/src/caffe/test/test_filter_layer.cpp index c641b6ef..a2d0c293 100644 --- a/src/caffe/test/test_filter_layer.cpp +++ b/src/caffe/test/test_filter_layer.cpp @@ -1,13 +1,11 @@ -#include <cstring> -#include <limits> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_flatten_layer.cpp b/src/caffe/test/test_flatten_layer.cpp index 7b6757cb..5d1caac2 100644 --- a/src/caffe/test/test_flatten_layer.cpp +++ b/src/caffe/test/test_flatten_layer.cpp @@ -1,12 +1,11 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_hdf5_output_layer.cpp b/src/caffe/test/test_hdf5_output_layer.cpp index b56277b5..adc27df4 100644 --- a/src/caffe/test/test_hdf5_output_layer.cpp +++ b/src/caffe/test/test_hdf5_output_layer.cpp @@ -5,10 +5,10 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/data_layers.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/hdf5.hpp" #include "caffe/util/io.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp index c9b027f8..7169e7bf 100644 --- a/src/caffe/test/test_hdf5data_layer.cpp +++ b/src/caffe/test/test_hdf5data_layer.cpp @@ -5,9 +5,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/filler.hpp" +#include "caffe/data_layers.hpp" #include "caffe/proto/caffe.pb.h" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_hinge_loss_layer.cpp b/src/caffe/test/test_hinge_loss_layer.cpp index b6a99022..dfdd01d0 100644 --- a/src/caffe/test/test_hinge_loss_layer.cpp +++ b/src/caffe/test/test_hinge_loss_layer.cpp @@ -1,6 +1,4 @@ #include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "gtest/gtest.h" @@ -8,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_im2col_kernel.cu b/src/caffe/test/test_im2col_kernel.cu index f0b75fcc..bafcacf7 100644 --- a/src/caffe/test/test_im2col_kernel.cu +++ b/src/caffe/test/test_im2col_kernel.cu @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_im2col_layer.cpp b/src/caffe/test/test_im2col_layer.cpp index 293aa262..ec055b20 100644 --- a/src/caffe/test/test_im2col_layer.cpp +++ b/src/caffe/test/test_im2col_layer.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_image_data_layer.cpp b/src/caffe/test/test_image_data_layer.cpp index 481fcef7..77690245 100644 --- a/src/caffe/test/test_image_data_layer.cpp +++ b/src/caffe/test/test_image_data_layer.cpp @@ -7,10 +7,10 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/data_layers.hpp" #include "caffe/filler.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/io.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_infogain_loss_layer.cpp b/src/caffe/test/test_infogain_loss_layer.cpp index 7ec2f807..b2a6754f 100644 --- a/src/caffe/test/test_infogain_loss_layer.cpp +++ b/src/caffe/test/test_infogain_loss_layer.cpp @@ -1,6 +1,3 @@ -#include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_inner_product_layer.cpp b/src/caffe/test/test_inner_product_layer.cpp index fbf0c851..1ad2c97e 100644 --- a/src/caffe/test/test_inner_product_layer.cpp +++ b/src/caffe/test/test_inner_product_layer.cpp @@ -1,12 +1,11 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_lrn_layer.cpp b/src/caffe/test/test_lrn_layer.cpp index 78cf2d9d..bd1c4fe8 100644 --- a/src/caffe/test/test_lrn_layer.cpp +++ b/src/caffe/test/test_lrn_layer.cpp @@ -1,5 +1,4 @@ #include <algorithm> -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_math_functions.cpp b/src/caffe/test/test_math_functions.cpp index a095b544..fbee3f9c 100644 --- a/src/caffe/test/test_math_functions.cpp +++ b/src/caffe/test/test_math_functions.cpp @@ -1,8 +1,6 @@ #include <stdint.h> // for uint32_t & uint64_t #include <time.h> -#include <climits> #include <cmath> // for std::fabs -#include <cstdlib> // for rand_r #include "gtest/gtest.h" diff --git a/src/caffe/test/test_maxpool_dropout_layers.cpp b/src/caffe/test/test_maxpool_dropout_layers.cpp index 611d9790..8fc944f3 100644 --- a/src/caffe/test/test_maxpool_dropout_layers.cpp +++ b/src/caffe/test/test_maxpool_dropout_layers.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp index b2db984f..0404aa25 100644 --- a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp +++ b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp @@ -1,6 +1,3 @@ -#include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "gtest/gtest.h" @@ -8,7 +5,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_mvn_layer.cpp b/src/caffe/test/test_mvn_layer.cpp index be23d86e..e9a7d54c 100644 --- a/src/caffe/test/test_mvn_layer.cpp +++ b/src/caffe/test/test_mvn_layer.cpp @@ -1,5 +1,3 @@ -#include <cmath> -#include <cstring> #include <vector> #include "caffe/blob.hpp" diff --git a/src/caffe/test/test_neuron_layer.cpp b/src/caffe/test/test_neuron_layer.cpp index c6e4d27b..b333fdee 100644 --- a/src/caffe/test/test_neuron_layer.cpp +++ b/src/caffe/test/test_neuron_layer.cpp @@ -1,5 +1,4 @@ #include <algorithm> -#include <cstring> #include <vector> #include "google/protobuf/text_format.h" @@ -7,8 +6,9 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_pooling_layer.cpp b/src/caffe/test/test_pooling_layer.cpp index 69f2d5c1..9e986e66 100644 --- a/src/caffe/test/test_pooling_layer.cpp +++ b/src/caffe/test/test_pooling_layer.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_power_layer.cpp b/src/caffe/test/test_power_layer.cpp index 76c9e857..1041ddd4 100644 --- a/src/caffe/test/test_power_layer.cpp +++ b/src/caffe/test/test_power_layer.cpp @@ -6,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_random_number_generator.cpp b/src/caffe/test/test_random_number_generator.cpp index 98424c06..833b0047 100644 --- a/src/caffe/test/test_random_number_generator.cpp +++ b/src/caffe/test/test_random_number_generator.cpp @@ -1,5 +1,4 @@ #include <cmath> -#include <cstring> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_reduction_layer.cpp b/src/caffe/test/test_reduction_layer.cpp index f568a180..a8d43727 100644 --- a/src/caffe/test/test_reduction_layer.cpp +++ b/src/caffe/test/test_reduction_layer.cpp @@ -1,12 +1,11 @@ -#include <algorithm> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_reshape_layer.cpp b/src/caffe/test/test_reshape_layer.cpp index 9d08ec60..e0f4ba42 100644 --- a/src/caffe/test/test_reshape_layer.cpp +++ b/src/caffe/test/test_reshape_layer.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" 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 e5737e43..b4f831c8 100644 --- a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp @@ -1,6 +1,4 @@ #include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "gtest/gtest.h" @@ -8,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_slice_layer.cpp b/src/caffe/test/test_slice_layer.cpp index 2d2d0fdc..45fbcffd 100644 --- a/src/caffe/test/test_slice_layer.cpp +++ b/src/caffe/test/test_slice_layer.cpp @@ -1,12 +1,11 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_softmax_layer.cpp b/src/caffe/test/test_softmax_layer.cpp index 996da4b8..4b01f5cf 100644 --- a/src/caffe/test/test_softmax_layer.cpp +++ b/src/caffe/test/test_softmax_layer.cpp @@ -1,13 +1,12 @@ #include <cmath> -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_softmax_with_loss_layer.cpp b/src/caffe/test/test_softmax_with_loss_layer.cpp index 1498d5c5..0ae4cd68 100644 --- a/src/caffe/test/test_softmax_with_loss_layer.cpp +++ b/src/caffe/test/test_softmax_with_loss_layer.cpp @@ -1,6 +1,4 @@ #include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "boost/scoped_ptr.hpp" @@ -9,7 +7,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/loss_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_split_layer.cpp b/src/caffe/test/test_split_layer.cpp index be5204bf..e27e355c 100644 --- a/src/caffe/test/test_split_layer.cpp +++ b/src/caffe/test/test_split_layer.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <string> #include <vector> @@ -7,10 +6,10 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" #include "caffe/proto/caffe.pb.h" #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" diff --git a/src/caffe/test/test_spp_layer.cpp b/src/caffe/test/test_spp_layer.cpp index b2585f1a..1b48a842 100644 --- a/src/caffe/test/test_spp_layer.cpp +++ b/src/caffe/test/test_spp_layer.cpp @@ -1,5 +1,3 @@ -#include <algorithm> -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_stochastic_pooling.cpp b/src/caffe/test/test_stochastic_pooling.cpp index f84464c3..5a412bd4 100644 --- a/src/caffe/test/test_stochastic_pooling.cpp +++ b/src/caffe/test/test_stochastic_pooling.cpp @@ -1,5 +1,4 @@ #include <algorithm> -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_syncedmem.cpp b/src/caffe/test/test_syncedmem.cpp index b946233d..16dfb582 100644 --- a/src/caffe/test/test_syncedmem.cpp +++ b/src/caffe/test/test_syncedmem.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" diff --git a/src/caffe/test/test_tanh_layer.cpp b/src/caffe/test/test_tanh_layer.cpp index 5dc92832..f31579ca 100644 --- a/src/caffe/test/test_tanh_layer.cpp +++ b/src/caffe/test/test_tanh_layer.cpp @@ -5,8 +5,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_threshold_layer.cpp b/src/caffe/test/test_threshold_layer.cpp index 05ce8212..903a9bc8 100644 --- a/src/caffe/test/test_threshold_layer.cpp +++ b/src/caffe/test/test_threshold_layer.cpp @@ -5,7 +5,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/neuron_layers.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_tile_layer.cpp b/src/caffe/test/test_tile_layer.cpp index 540aac3c..5c459604 100644 --- a/src/caffe/test/test_tile_layer.cpp +++ b/src/caffe/test/test_tile_layer.cpp @@ -1,12 +1,11 @@ -#include <cstring> #include <vector> #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_upgrade_proto.cpp b/src/caffe/test/test_upgrade_proto.cpp index 23deddd4..9dcc2aa5 100644 --- a/src/caffe/test/test_upgrade_proto.cpp +++ b/src/caffe/test/test_upgrade_proto.cpp @@ -1,4 +1,3 @@ -#include <cstring> #include <string> #include <vector> diff --git a/src/caffe/test/test_util_blas.cpp b/src/caffe/test/test_util_blas.cpp index 8770f309..9ee8818f 100644 --- a/src/caffe/test/test_util_blas.cpp +++ b/src/caffe/test/test_util_blas.cpp @@ -1,7 +1,5 @@ #ifndef CPU_ONLY // CPU-GPU test -#include <cstring> - #include "gtest/gtest.h" #include "caffe/blob.hpp" diff --git a/src/caffe/util/im2col.cpp b/src/caffe/util/im2col.cpp index 09da23d4..27e5b7c0 100644 --- a/src/caffe/util/im2col.cpp +++ b/src/caffe/util/im2col.cpp @@ -1,6 +1,3 @@ -#include <cmath> -#include <cstdlib> -#include <cstring> #include <vector> #include "caffe/util/im2col.hpp" diff --git a/src/caffe/util/im2col.cu b/src/caffe/util/im2col.cu index 451097f8..49354ab7 100644 --- a/src/caffe/util/im2col.cu +++ b/src/caffe/util/im2col.cu @@ -1,7 +1,4 @@ #include <algorithm> -#include <cmath> -#include <cstdlib> -#include <cstring> #include "caffe/common.hpp" #include "caffe/util/im2col.hpp" diff --git a/src/caffe/util/math_functions.cu b/src/caffe/util/math_functions.cu index 2631a074..e4d0c4b0 100644 --- a/src/caffe/util/math_functions.cu +++ b/src/caffe/util/math_functions.cu @@ -4,8 +4,6 @@ #include <thrust/reduce.h> #include <cmath> -#include <cstdlib> -#include <cstring> #include "caffe/common.hpp" #include "caffe/util/math_functions.hpp" |