diff options
Diffstat (limited to 'src/caffe')
152 files changed, 233 insertions, 159 deletions
diff --git a/src/caffe/data_reader.cpp b/src/caffe/data_reader.cpp index 16378203..9f019bbf 100644 --- a/src/caffe/data_reader.cpp +++ b/src/caffe/data_reader.cpp @@ -4,8 +4,8 @@ #include <vector> #include "caffe/common.hpp" -#include "caffe/data_layers.hpp" #include "caffe/data_reader.hpp" +#include "caffe/layers/data_layer.hpp" #include "caffe/proto/caffe.pb.h" namespace caffe { diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp index 417ffe98..76d851af 100644 --- a/src/caffe/layer_factory.cpp +++ b/src/caffe/layer_factory.cpp @@ -7,11 +7,28 @@ #include "caffe/layer.hpp" #include "caffe/layer_factory.hpp" +#include "caffe/layers/conv_layer.hpp" +#include "caffe/layers/lrn_layer.hpp" +#include "caffe/layers/pooling_layer.hpp" +#include "caffe/layers/relu_layer.hpp" +#include "caffe/layers/sigmoid_layer.hpp" +#include "caffe/layers/softmax_layer.hpp" +#include "caffe/layers/tanh_layer.hpp" #include "caffe/proto/caffe.pb.h" -#include "caffe/vision_layers.hpp" + +#ifdef USE_CUDNN +#include "caffe/layers/cudnn_conv_layer.hpp" +#include "caffe/layers/cudnn_lcn_layer.hpp" +#include "caffe/layers/cudnn_lrn_layer.hpp" +#include "caffe/layers/cudnn_pooling_layer.hpp" +#include "caffe/layers/cudnn_relu_layer.hpp" +#include "caffe/layers/cudnn_sigmoid_layer.hpp" +#include "caffe/layers/cudnn_softmax_layer.hpp" +#include "caffe/layers/cudnn_tanh_layer.hpp" +#endif #ifdef WITH_PYTHON_LAYER -#include "caffe/python_layer.hpp" +#include "caffe/layers/python_layer.hpp" #endif namespace caffe { diff --git a/src/caffe/layers/absval_layer.cpp b/src/caffe/layers/absval_layer.cpp index 7e552352..855bf0bf 100644 --- a/src/caffe/layers/absval_layer.cpp +++ b/src/caffe/layers/absval_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/absval_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/absval_layer.cu b/src/caffe/layers/absval_layer.cu index b5a6c25a..6c927e6f 100644 --- a/src/caffe/layers/absval_layer.cu +++ b/src/caffe/layers/absval_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/absval_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/accuracy_layer.cpp b/src/caffe/layers/accuracy_layer.cpp index ae2df1f1..4eddbb5c 100644 --- a/src/caffe/layers/accuracy_layer.cpp +++ b/src/caffe/layers/accuracy_layer.cpp @@ -2,7 +2,7 @@ #include <utility> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/accuracy_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/argmax_layer.cpp b/src/caffe/layers/argmax_layer.cpp index 354d83f7..2d3d6f2d 100644 --- a/src/caffe/layers/argmax_layer.cpp +++ b/src/caffe/layers/argmax_layer.cpp @@ -3,7 +3,7 @@ #include <utility> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/argmax_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/base_conv_layer.cpp b/src/caffe/layers/base_conv_layer.cpp index 316cb0fd..f6f14cd0 100644 --- a/src/caffe/layers/base_conv_layer.cpp +++ b/src/caffe/layers/base_conv_layer.cpp @@ -2,9 +2,9 @@ #include <vector> #include "caffe/filler.hpp" +#include "caffe/layers/base_conv_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/base_data_layer.cpp b/src/caffe/layers/base_data_layer.cpp index d77f91c9..989319f1 100644 --- a/src/caffe/layers/base_data_layer.cpp +++ b/src/caffe/layers/base_data_layer.cpp @@ -1,7 +1,13 @@ #include <boost/thread.hpp> #include <vector> -#include "caffe/data_layers.hpp" +#include "caffe/blob.hpp" +#include "caffe/data_transformer.hpp" +#include "caffe/internal_thread.hpp" +#include "caffe/layer.hpp" +#include "caffe/layers/base_data_layer.hpp" +#include "caffe/proto/caffe.pb.h" +#include "caffe/util/blocking_queue.hpp" namespace caffe { diff --git a/src/caffe/layers/base_data_layer.cu b/src/caffe/layers/base_data_layer.cu index ff6e412a..4056d36a 100644 --- a/src/caffe/layers/base_data_layer.cu +++ b/src/caffe/layers/base_data_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/data_layers.hpp" +#include "caffe/layers/base_data_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/batch_norm_layer.cpp b/src/caffe/layers/batch_norm_layer.cpp index b5c91b5e..a69d8f99 100644 --- a/src/caffe/layers/batch_norm_layer.cpp +++ b/src/caffe/layers/batch_norm_layer.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/batch_norm_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/batch_norm_layer.cu b/src/caffe/layers/batch_norm_layer.cu index 2a6cac54..c21713c8 100644 --- a/src/caffe/layers/batch_norm_layer.cu +++ b/src/caffe/layers/batch_norm_layer.cu @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/batch_norm_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/batch_reindex_layer.cpp b/src/caffe/layers/batch_reindex_layer.cpp index 3d3ce32c..b14e56f7 100644 --- a/src/caffe/layers/batch_reindex_layer.cpp +++ b/src/caffe/layers/batch_reindex_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/batch_reindex_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/batch_reindex_layer.cu b/src/caffe/layers/batch_reindex_layer.cu index 0b5ccf09..83054d36 100644 --- a/src/caffe/layers/batch_reindex_layer.cu +++ b/src/caffe/layers/batch_reindex_layer.cu @@ -2,7 +2,7 @@ #include <utility> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/batch_reindex_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/bnll_layer.cpp b/src/caffe/layers/bnll_layer.cpp index 1e422a54..448d86d7 100644 --- a/src/caffe/layers/bnll_layer.cpp +++ b/src/caffe/layers/bnll_layer.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/bnll_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/bnll_layer.cu b/src/caffe/layers/bnll_layer.cu index 3e328ef7..8df8ef09 100644 --- a/src/caffe/layers/bnll_layer.cu +++ b/src/caffe/layers/bnll_layer.cu @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/bnll_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/concat_layer.cpp b/src/caffe/layers/concat_layer.cpp index 14cbfb11..580bd479 100644 --- a/src/caffe/layers/concat_layer.cpp +++ b/src/caffe/layers/concat_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/concat_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/concat_layer.cu b/src/caffe/layers/concat_layer.cu index e1e9449e..a3a0bf6f 100644 --- a/src/caffe/layers/concat_layer.cu +++ b/src/caffe/layers/concat_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/concat_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/contrastive_loss_layer.cpp b/src/caffe/layers/contrastive_loss_layer.cpp index 45facd4a..599e178e 100644 --- a/src/caffe/layers/contrastive_loss_layer.cpp +++ b/src/caffe/layers/contrastive_loss_layer.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/contrastive_loss_layer.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 ee278407..fd7d67cc 100644 --- a/src/caffe/layers/contrastive_loss_layer.cu +++ b/src/caffe/layers/contrastive_loss_layer.cu @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/contrastive_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp index efd69d45..cff09783 100644 --- a/src/caffe/layers/conv_layer.cpp +++ b/src/caffe/layers/conv_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/conv_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/conv_layer.cu b/src/caffe/layers/conv_layer.cu index a534b356..d06e4b62 100644 --- a/src/caffe/layers/conv_layer.cu +++ b/src/caffe/layers/conv_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/conv_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_conv_layer.cpp b/src/caffe/layers/cudnn_conv_layer.cpp index c82cb7ef..1987fb09 100644 --- a/src/caffe/layers/cudnn_conv_layer.cpp +++ b/src/caffe/layers/cudnn_conv_layer.cpp @@ -2,7 +2,7 @@ #include <algorithm> #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_conv_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_conv_layer.cu b/src/caffe/layers/cudnn_conv_layer.cu index f2df4aa5..1990e932 100644 --- a/src/caffe/layers/cudnn_conv_layer.cu +++ b/src/caffe/layers/cudnn_conv_layer.cu @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_conv_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lcn_layer.cpp b/src/caffe/layers/cudnn_lcn_layer.cpp index 4c700786..9c09bf26 100644 --- a/src/caffe/layers/cudnn_lcn_layer.cpp +++ b/src/caffe/layers/cudnn_lcn_layer.cpp @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_lcn_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lcn_layer.cu b/src/caffe/layers/cudnn_lcn_layer.cu index e79c7458..b44ef473 100644 --- a/src/caffe/layers/cudnn_lcn_layer.cu +++ b/src/caffe/layers/cudnn_lcn_layer.cu @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_lcn_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lrn_layer.cpp b/src/caffe/layers/cudnn_lrn_layer.cpp index a03db3bd..0495b802 100644 --- a/src/caffe/layers/cudnn_lrn_layer.cpp +++ b/src/caffe/layers/cudnn_lrn_layer.cpp @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_lrn_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_lrn_layer.cu b/src/caffe/layers/cudnn_lrn_layer.cu index 327e44b4..ca647f3c 100644 --- a/src/caffe/layers/cudnn_lrn_layer.cu +++ b/src/caffe/layers/cudnn_lrn_layer.cu @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_lrn_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_pooling_layer.cpp b/src/caffe/layers/cudnn_pooling_layer.cpp index 5f995d45..24f14780 100644 --- a/src/caffe/layers/cudnn_pooling_layer.cpp +++ b/src/caffe/layers/cudnn_pooling_layer.cpp @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_pooling_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_pooling_layer.cu b/src/caffe/layers/cudnn_pooling_layer.cu index 9aa39ed8..6f00195f 100644 --- a/src/caffe/layers/cudnn_pooling_layer.cu +++ b/src/caffe/layers/cudnn_pooling_layer.cu @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_pooling_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_relu_layer.cpp b/src/caffe/layers/cudnn_relu_layer.cpp index e6b6d5a9..c86c6907 100644 --- a/src/caffe/layers/cudnn_relu_layer.cpp +++ b/src/caffe/layers/cudnn_relu_layer.cpp @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_relu_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_relu_layer.cu b/src/caffe/layers/cudnn_relu_layer.cu index 2a53a49b..9f617183 100644 --- a/src/caffe/layers/cudnn_relu_layer.cu +++ b/src/caffe/layers/cudnn_relu_layer.cu @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_relu_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_sigmoid_layer.cpp b/src/caffe/layers/cudnn_sigmoid_layer.cpp index 4b489fa5..ccb955cd 100644 --- a/src/caffe/layers/cudnn_sigmoid_layer.cpp +++ b/src/caffe/layers/cudnn_sigmoid_layer.cpp @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_sigmoid_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_sigmoid_layer.cu b/src/caffe/layers/cudnn_sigmoid_layer.cu index 9de5c742..e2a4b460 100644 --- a/src/caffe/layers/cudnn_sigmoid_layer.cu +++ b/src/caffe/layers/cudnn_sigmoid_layer.cu @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_sigmoid_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_softmax_layer.cpp b/src/caffe/layers/cudnn_softmax_layer.cpp index f5cd0450..6440df98 100644 --- a/src/caffe/layers/cudnn_softmax_layer.cpp +++ b/src/caffe/layers/cudnn_softmax_layer.cpp @@ -3,7 +3,7 @@ #include "thrust/device_vector.h" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_softmax_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_softmax_layer.cu b/src/caffe/layers/cudnn_softmax_layer.cu index c270202f..7283eb71 100644 --- a/src/caffe/layers/cudnn_softmax_layer.cu +++ b/src/caffe/layers/cudnn_softmax_layer.cu @@ -3,7 +3,7 @@ #include "thrust/device_vector.h" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/cudnn_softmax_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_tanh_layer.cpp b/src/caffe/layers/cudnn_tanh_layer.cpp index 46296818..1a564182 100644 --- a/src/caffe/layers/cudnn_tanh_layer.cpp +++ b/src/caffe/layers/cudnn_tanh_layer.cpp @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/cudnn_tanh_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/cudnn_tanh_layer.cu b/src/caffe/layers/cudnn_tanh_layer.cu index 84f784b3..89df28a3 100644 --- a/src/caffe/layers/cudnn_tanh_layer.cu +++ b/src/caffe/layers/cudnn_tanh_layer.cu @@ -1,7 +1,7 @@ #ifdef USE_CUDNN #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/cudnn_tanh_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp index 49ac858e..66e6301f 100644 --- a/src/caffe/layers/data_layer.cpp +++ b/src/caffe/layers/data_layer.cpp @@ -5,8 +5,8 @@ #include <vector> -#include "caffe/data_layers.hpp" -#include "caffe/proto/caffe.pb.h" +#include "caffe/data_transformer.hpp" +#include "caffe/layers/data_layer.hpp" #include "caffe/util/benchmark.hpp" namespace caffe { diff --git a/src/caffe/layers/deconv_layer.cpp b/src/caffe/layers/deconv_layer.cpp index 5038b638..275c0562 100644 --- a/src/caffe/layers/deconv_layer.cpp +++ b/src/caffe/layers/deconv_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/deconv_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/deconv_layer.cu b/src/caffe/layers/deconv_layer.cu index 0e8e2ede..22676322 100644 --- a/src/caffe/layers/deconv_layer.cu +++ b/src/caffe/layers/deconv_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layers/deconv_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/dropout_layer.cpp b/src/caffe/layers/dropout_layer.cpp index eb7a8a9a..9cb64d97 100644 --- a/src/caffe/layers/dropout_layer.cpp +++ b/src/caffe/layers/dropout_layer.cpp @@ -2,7 +2,7 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/dropout_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/dropout_layer.cu b/src/caffe/layers/dropout_layer.cu index 028fc026..186c10ca 100644 --- a/src/caffe/layers/dropout_layer.cu +++ b/src/caffe/layers/dropout_layer.cu @@ -1,11 +1,10 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/dropout_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { - template <typename Dtype> __global__ void DropoutForward(const int n, const Dtype* in, const unsigned int* mask, const unsigned int threshold, const float scale, @@ -68,5 +67,4 @@ void DropoutLayer<Dtype>::Backward_gpu(const vector<Blob<Dtype>*>& top, INSTANTIATE_LAYER_GPU_FUNCS(DropoutLayer); - } // namespace caffe diff --git a/src/caffe/layers/dummy_data_layer.cpp b/src/caffe/layers/dummy_data_layer.cpp index ab0478c8..e382bfea 100644 --- a/src/caffe/layers/dummy_data_layer.cpp +++ b/src/caffe/layers/dummy_data_layer.cpp @@ -1,7 +1,7 @@ #include <vector> -#include "caffe/data_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/dummy_data_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/eltwise_layer.cpp b/src/caffe/layers/eltwise_layer.cpp index 7924fbee..21256166 100644 --- a/src/caffe/layers/eltwise_layer.cpp +++ b/src/caffe/layers/eltwise_layer.cpp @@ -1,7 +1,7 @@ #include <cfloat> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/eltwise_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/eltwise_layer.cu b/src/caffe/layers/eltwise_layer.cu index 01404209..c142852e 100644 --- a/src/caffe/layers/eltwise_layer.cu +++ b/src/caffe/layers/eltwise_layer.cu @@ -1,7 +1,7 @@ #include <cfloat> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/eltwise_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/embed_layer.cpp b/src/caffe/layers/embed_layer.cpp index 52704a06..36b40d70 100644 --- a/src/caffe/layers/embed_layer.cpp +++ b/src/caffe/layers/embed_layer.cpp @@ -1,7 +1,7 @@ #include <vector> -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/embed_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 cd4b40f5..6324a3a8 100644 --- a/src/caffe/layers/embed_layer.cu +++ b/src/caffe/layers/embed_layer.cu @@ -1,7 +1,7 @@ #include <vector> -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/embed_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 7338953d..300d991e 100644 --- a/src/caffe/layers/euclidean_loss_layer.cpp +++ b/src/caffe/layers/euclidean_loss_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/euclidean_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/euclidean_loss_layer.cu b/src/caffe/layers/euclidean_loss_layer.cu index 1aa79bd5..4c221b64 100644 --- a/src/caffe/layers/euclidean_loss_layer.cu +++ b/src/caffe/layers/euclidean_loss_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/euclidean_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/exp_layer.cpp b/src/caffe/layers/exp_layer.cpp index f85692d6..1f4a309f 100644 --- a/src/caffe/layers/exp_layer.cpp +++ b/src/caffe/layers/exp_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/exp_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/exp_layer.cu b/src/caffe/layers/exp_layer.cu index 9e24bbee..61f7f11d 100644 --- a/src/caffe/layers/exp_layer.cu +++ b/src/caffe/layers/exp_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/exp_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/filter_layer.cpp b/src/caffe/layers/filter_layer.cpp index e8b62a5d..e226c0b6 100644 --- a/src/caffe/layers/filter_layer.cpp +++ b/src/caffe/layers/filter_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/filter_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/filter_layer.cu b/src/caffe/layers/filter_layer.cu index 746e91c9..b01b16f8 100644 --- a/src/caffe/layers/filter_layer.cu +++ b/src/caffe/layers/filter_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/filter_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/flatten_layer.cpp b/src/caffe/layers/flatten_layer.cpp index d831fb5c..651507e2 100644 --- a/src/caffe/layers/flatten_layer.cpp +++ b/src/caffe/layers/flatten_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/flatten_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp index c765fa02..2f13dc64 100644 --- a/src/caffe/layers/hdf5_data_layer.cpp +++ b/src/caffe/layers/hdf5_data_layer.cpp @@ -14,7 +14,7 @@ TODO: #include "hdf5_hl.h" #include "stdint.h" -#include "caffe/data_layers.hpp" +#include "caffe/layers/hdf5_data_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 6ac499c6..595d2230 100644 --- a/src/caffe/layers/hdf5_data_layer.cu +++ b/src/caffe/layers/hdf5_data_layer.cu @@ -9,7 +9,7 @@ TODO: #include "hdf5.h" #include "hdf5_hl.h" -#include "caffe/data_layers.hpp" +#include "caffe/layers/hdf5_data_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_output_layer.cpp b/src/caffe/layers/hdf5_output_layer.cpp index dbde65da..f8f1edcd 100644 --- a/src/caffe/layers/hdf5_output_layer.cpp +++ b/src/caffe/layers/hdf5_output_layer.cpp @@ -3,7 +3,7 @@ #include "hdf5.h" #include "hdf5_hl.h" -#include "caffe/data_layers.hpp" +#include "caffe/layers/hdf5_output_layer.hpp" #include "caffe/util/hdf5.hpp" namespace caffe { diff --git a/src/caffe/layers/hdf5_output_layer.cu b/src/caffe/layers/hdf5_output_layer.cu index ca8f2616..c1685cd3 100644 --- a/src/caffe/layers/hdf5_output_layer.cu +++ b/src/caffe/layers/hdf5_output_layer.cu @@ -3,7 +3,7 @@ #include "hdf5.h" #include "hdf5_hl.h" -#include "caffe/data_layers.hpp" +#include "caffe/layers/hdf5_output_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/hinge_loss_layer.cpp b/src/caffe/layers/hinge_loss_layer.cpp index a88c8775..374aed3c 100644 --- a/src/caffe/layers/hinge_loss_layer.cpp +++ b/src/caffe/layers/hinge_loss_layer.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/hinge_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/im2col_layer.cpp b/src/caffe/layers/im2col_layer.cpp index f3b0f710..c12e4f52 100644 --- a/src/caffe/layers/im2col_layer.cpp +++ b/src/caffe/layers/im2col_layer.cpp @@ -1,7 +1,7 @@ #include <vector> +#include "caffe/layers/im2col_layer.hpp" #include "caffe/util/im2col.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/im2col_layer.cu b/src/caffe/layers/im2col_layer.cu index 4633628b..517b4220 100644 --- a/src/caffe/layers/im2col_layer.cu +++ b/src/caffe/layers/im2col_layer.cu @@ -1,7 +1,7 @@ #include <vector> +#include "caffe/layers/im2col_layer.hpp" #include "caffe/util/im2col.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/image_data_layer.cpp b/src/caffe/layers/image_data_layer.cpp index 9a7df5a7..62fda4ac 100644 --- a/src/caffe/layers/image_data_layer.cpp +++ b/src/caffe/layers/image_data_layer.cpp @@ -7,7 +7,9 @@ #include <utility> #include <vector> -#include "caffe/data_layers.hpp" +#include "caffe/data_transformer.hpp" +#include "caffe/layers/base_data_layer.hpp" +#include "caffe/layers/image_data_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 88bd8aaf..624d3118 100644 --- a/src/caffe/layers/infogain_loss_layer.cpp +++ b/src/caffe/layers/infogain_loss_layer.cpp @@ -2,7 +2,7 @@ #include <cmath> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/infogain_loss_layer.hpp" #include "caffe/util/io.hpp" namespace caffe { diff --git a/src/caffe/layers/inner_product_layer.cpp b/src/caffe/layers/inner_product_layer.cpp index 274744ea..d9088805 100644 --- a/src/caffe/layers/inner_product_layer.cpp +++ b/src/caffe/layers/inner_product_layer.cpp @@ -1,7 +1,7 @@ #include <vector> -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/inner_product_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/inner_product_layer.cu b/src/caffe/layers/inner_product_layer.cu index e91e94fc..dc25aa33 100644 --- a/src/caffe/layers/inner_product_layer.cu +++ b/src/caffe/layers/inner_product_layer.cu @@ -1,7 +1,7 @@ #include <vector> -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/inner_product_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/log_layer.cpp b/src/caffe/layers/log_layer.cpp index a1876b9d..c70a795c 100644 --- a/src/caffe/layers/log_layer.cpp +++ b/src/caffe/layers/log_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/log_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/log_layer.cu b/src/caffe/layers/log_layer.cu index 055b713b..db466dba 100644 --- a/src/caffe/layers/log_layer.cu +++ b/src/caffe/layers/log_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/log_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/loss_layer.cpp b/src/caffe/layers/loss_layer.cpp index c10466db..c0b7a862 100644 --- a/src/caffe/layers/loss_layer.cpp +++ b/src/caffe/layers/loss_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/loss_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/lrn_layer.cpp b/src/caffe/layers/lrn_layer.cpp index cc561811..210525e2 100644 --- a/src/caffe/layers/lrn_layer.cpp +++ b/src/caffe/layers/lrn_layer.cpp @@ -1,7 +1,7 @@ #include <vector> +#include "caffe/layers/lrn_layer.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 4523d410..26e619c7 100644 --- a/src/caffe/layers/lrn_layer.cu +++ b/src/caffe/layers/lrn_layer.cu @@ -1,7 +1,7 @@ #include <vector> +#include "caffe/layers/lrn_layer.hpp" #include "caffe/util/math_functions.hpp" -#include "caffe/vision_layers.hpp" namespace caffe { diff --git a/src/caffe/layers/memory_data_layer.cpp b/src/caffe/layers/memory_data_layer.cpp index 13a3d9f6..82909874 100644 --- a/src/caffe/layers/memory_data_layer.cpp +++ b/src/caffe/layers/memory_data_layer.cpp @@ -4,7 +4,7 @@ #include <vector> -#include "caffe/data_layers.hpp" +#include "caffe/layers/memory_data_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/multinomial_logistic_loss_layer.cpp b/src/caffe/layers/multinomial_logistic_loss_layer.cpp index 59745923..65664998 100644 --- a/src/caffe/layers/multinomial_logistic_loss_layer.cpp +++ b/src/caffe/layers/multinomial_logistic_loss_layer.cpp @@ -2,7 +2,7 @@ #include <cmath> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/multinomial_logistic_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/mvn_layer.cpp b/src/caffe/layers/mvn_layer.cpp index 0e730144..8fe4ef8c 100644 --- a/src/caffe/layers/mvn_layer.cpp +++ b/src/caffe/layers/mvn_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/mvn_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 b7e3b3ce..739293be 100644 --- a/src/caffe/layers/mvn_layer.cu +++ b/src/caffe/layers/mvn_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/mvn_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 1dcb2c06..d7b5f389 100644 --- a/src/caffe/layers/neuron_layer.cpp +++ b/src/caffe/layers/neuron_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/neuron_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/pooling_layer.cpp b/src/caffe/layers/pooling_layer.cpp index 3a7de42c..90897db0 100644 --- a/src/caffe/layers/pooling_layer.cpp +++ b/src/caffe/layers/pooling_layer.cpp @@ -2,8 +2,8 @@ #include <cfloat> #include <vector> +#include "caffe/layers/pooling_layer.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 5e94ce2b..1ea46cc8 100644 --- a/src/caffe/layers/pooling_layer.cu +++ b/src/caffe/layers/pooling_layer.cu @@ -2,8 +2,8 @@ #include <cfloat> #include <vector> +#include "caffe/layers/pooling_layer.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 6304fadd..d99b77ca 100644 --- a/src/caffe/layers/power_layer.cpp +++ b/src/caffe/layers/power_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/power_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/power_layer.cu b/src/caffe/layers/power_layer.cu index 680faad4..07711c42 100644 --- a/src/caffe/layers/power_layer.cu +++ b/src/caffe/layers/power_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/power_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/prelu_layer.cpp b/src/caffe/layers/prelu_layer.cpp index b5a294e1..853181bd 100644 --- a/src/caffe/layers/prelu_layer.cpp +++ b/src/caffe/layers/prelu_layer.cpp @@ -2,7 +2,9 @@ #include <vector> #include "caffe/filler.hpp" -#include "caffe/neuron_layers.hpp" + +#include "caffe/layers/neuron_layer.hpp" +#include "caffe/layers/prelu_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/prelu_layer.cu b/src/caffe/layers/prelu_layer.cu index 992cd885..aeb80eac 100644 --- a/src/caffe/layers/prelu_layer.cu +++ b/src/caffe/layers/prelu_layer.cu @@ -1,7 +1,8 @@ #include <algorithm> #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/neuron_layer.hpp" +#include "caffe/layers/prelu_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/reduction_layer.cpp b/src/caffe/layers/reduction_layer.cpp index 6b7925e3..fa46487e 100644 --- a/src/caffe/layers/reduction_layer.cpp +++ b/src/caffe/layers/reduction_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/reduction_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/reduction_layer.cu b/src/caffe/layers/reduction_layer.cu index a9a8c8d9..4a6b2b73 100644 --- a/src/caffe/layers/reduction_layer.cu +++ b/src/caffe/layers/reduction_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/reduction_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/relu_layer.cpp b/src/caffe/layers/relu_layer.cpp index 93d09026..92a729c8 100644 --- a/src/caffe/layers/relu_layer.cpp +++ b/src/caffe/layers/relu_layer.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/relu_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/relu_layer.cu b/src/caffe/layers/relu_layer.cu index c18ab61f..4bf15b3a 100644 --- a/src/caffe/layers/relu_layer.cu +++ b/src/caffe/layers/relu_layer.cu @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/relu_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/reshape_layer.cpp b/src/caffe/layers/reshape_layer.cpp index 8659049b..82339f76 100644 --- a/src/caffe/layers/reshape_layer.cpp +++ b/src/caffe/layers/reshape_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/reshape_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 98588637..10ac9470 100644 --- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/sigmoid_cross_entropy_loss_layer.hpp" #include "caffe/util/math_functions.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 48dbec41..046cb9d3 100644 --- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu +++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/sigmoid_cross_entropy_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/sigmoid_layer.cpp b/src/caffe/layers/sigmoid_layer.cpp index d4a3f877..85fd9676 100644 --- a/src/caffe/layers/sigmoid_layer.cpp +++ b/src/caffe/layers/sigmoid_layer.cpp @@ -1,7 +1,7 @@ #include <cmath> #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/sigmoid_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/sigmoid_layer.cu b/src/caffe/layers/sigmoid_layer.cu index 5730636e..184c61ed 100644 --- a/src/caffe/layers/sigmoid_layer.cu +++ b/src/caffe/layers/sigmoid_layer.cu @@ -1,7 +1,7 @@ #include <cmath> #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/sigmoid_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/silence_layer.cpp b/src/caffe/layers/silence_layer.cpp index 3974f5d4..b2f85c52 100644 --- a/src/caffe/layers/silence_layer.cpp +++ b/src/caffe/layers/silence_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/silence_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 c49ecb23..3494f6f6 100644 --- a/src/caffe/layers/silence_layer.cu +++ b/src/caffe/layers/silence_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/silence_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 f368a249..759beafe 100644 --- a/src/caffe/layers/slice_layer.cpp +++ b/src/caffe/layers/slice_layer.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/slice_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/slice_layer.cu b/src/caffe/layers/slice_layer.cu index d555f7d0..1be3a797 100644 --- a/src/caffe/layers/slice_layer.cu +++ b/src/caffe/layers/slice_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/slice_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_layer.cpp b/src/caffe/layers/softmax_layer.cpp index 8ae7d49c..f60e9b03 100644 --- a/src/caffe/layers/softmax_layer.cpp +++ b/src/caffe/layers/softmax_layer.cpp @@ -1,7 +1,7 @@ #include <algorithm> #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/softmax_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_layer.cu b/src/caffe/layers/softmax_layer.cu index a620fcc8..7a9e6833 100644 --- a/src/caffe/layers/softmax_layer.cu +++ b/src/caffe/layers/softmax_layer.cu @@ -4,7 +4,7 @@ #include "thrust/device_vector.h" -#include "caffe/common_layers.hpp" +#include "caffe/layers/softmax_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_loss_layer.cpp b/src/caffe/layers/softmax_loss_layer.cpp index 3cdef82a..dddb7606 100644 --- a/src/caffe/layers/softmax_loss_layer.cpp +++ b/src/caffe/layers/softmax_loss_layer.cpp @@ -2,7 +2,7 @@ #include <cfloat> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/softmax_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/softmax_loss_layer.cu b/src/caffe/layers/softmax_loss_layer.cu index 4753a1ec..660e1b39 100644 --- a/src/caffe/layers/softmax_loss_layer.cu +++ b/src/caffe/layers/softmax_loss_layer.cu @@ -2,7 +2,7 @@ #include <cfloat> #include <vector> -#include "caffe/loss_layers.hpp" +#include "caffe/layers/softmax_loss_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/split_layer.cpp b/src/caffe/layers/split_layer.cpp index 5333e578..1a27a9af 100644 --- a/src/caffe/layers/split_layer.cpp +++ b/src/caffe/layers/split_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/split_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/split_layer.cu b/src/caffe/layers/split_layer.cu index 73d04c98..bec9987c 100644 --- a/src/caffe/layers/split_layer.cu +++ b/src/caffe/layers/split_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/split_layer.hpp" #include "caffe/util/math_functions.hpp" namespace caffe { diff --git a/src/caffe/layers/spp_layer.cpp b/src/caffe/layers/spp_layer.cpp index 2ef4ac7a..b9af8e8a 100644 --- a/src/caffe/layers/spp_layer.cpp +++ b/src/caffe/layers/spp_layer.cpp @@ -1,7 +1,12 @@ #include <algorithm> #include <vector> -#include "caffe/vision_layers.hpp" +#include "caffe/layer.hpp" +#include "caffe/layers/concat_layer.hpp" +#include "caffe/layers/flatten_layer.hpp" +#include "caffe/layers/pooling_layer.hpp" +#include "caffe/layers/split_layer.hpp" +#include "caffe/layers/spp_layer.hpp" namespace caffe { @@ -217,7 +222,6 @@ void SPPLayer<Dtype>::Backward_cpu(const vector<Blob<Dtype>*>& top, split_layer_->Backward(split_top_vec_, propagate_down, bottom); } - INSTANTIATE_CLASS(SPPLayer); REGISTER_LAYER_CLASS(SPP); diff --git a/src/caffe/layers/tanh_layer.cpp b/src/caffe/layers/tanh_layer.cpp index 9d1cac76..184e926d 100644 --- a/src/caffe/layers/tanh_layer.cpp +++ b/src/caffe/layers/tanh_layer.cpp @@ -3,7 +3,7 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/tanh_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/tanh_layer.cu b/src/caffe/layers/tanh_layer.cu index d87bccec..cbfc178e 100644 --- a/src/caffe/layers/tanh_layer.cu +++ b/src/caffe/layers/tanh_layer.cu @@ -3,7 +3,7 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/tanh_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/threshold_layer.cpp b/src/caffe/layers/threshold_layer.cpp index d6514736..63822ee5 100644 --- a/src/caffe/layers/threshold_layer.cpp +++ b/src/caffe/layers/threshold_layer.cpp @@ -1,7 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" - +#include "caffe/layers/threshold_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/threshold_layer.cu b/src/caffe/layers/threshold_layer.cu index 1cd62d99..b0b06655 100644 --- a/src/caffe/layers/threshold_layer.cu +++ b/src/caffe/layers/threshold_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/threshold_layer.hpp" namespace caffe { diff --git a/src/caffe/layers/tile_layer.cpp b/src/caffe/layers/tile_layer.cpp index 581546c4..cf0c1870 100644 --- a/src/caffe/layers/tile_layer.cpp +++ b/src/caffe/layers/tile_layer.cpp @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/tile_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 fdf96090..282049eb 100644 --- a/src/caffe/layers/tile_layer.cu +++ b/src/caffe/layers/tile_layer.cu @@ -1,6 +1,6 @@ #include <vector> -#include "caffe/common_layers.hpp" +#include "caffe/layers/tile_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 3f937bc9..4ca8315d 100644 --- a/src/caffe/layers/window_data_layer.cpp +++ b/src/caffe/layers/window_data_layer.cpp @@ -12,7 +12,10 @@ #include "opencv2/highgui/highgui.hpp" #include "opencv2/imgproc/imgproc.hpp" -#include "caffe/data_layers.hpp" +#include "caffe/data_transformer.hpp" +#include "caffe/internal_thread.hpp" +#include "caffe/layers/base_data_layer.hpp" +#include "caffe/layers/window_data_layer.hpp" #include "caffe/util/benchmark.hpp" #include "caffe/util/io.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 5960a666..6fe808bd 100644 --- a/src/caffe/test/test_accuracy_layer.cpp +++ b/src/caffe/test/test_accuracy_layer.cpp @@ -6,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/accuracy_layer.hpp" #include "caffe/util/rng.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 f3f2094e..472e6652 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/layers/argmax_layer.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_batch_norm_layer.cpp b/src/caffe/test/test_batch_norm_layer.cpp index 22b9667f..936b93a1 100644 --- a/src/caffe/test/test_batch_norm_layer.cpp +++ b/src/caffe/test/test_batch_norm_layer.cpp @@ -6,8 +6,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/batch_norm_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_batch_reindex_layer.cpp b/src/caffe/test/test_batch_reindex_layer.cpp index 17e47f05..9ea1a2f6 100644 --- a/src/caffe/test/test_batch_reindex_layer.cpp +++ b/src/caffe/test/test_batch_reindex_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/batch_reindex_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_concat_layer.cpp b/src/caffe/test/test_concat_layer.cpp index 8ba51f4f..23c1e8c1 100644 --- a/src/caffe/test/test_concat_layer.cpp +++ b/src/caffe/test/test_concat_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/concat_layer.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 95901f14..2fa055ee 100644 --- a/src/caffe/test/test_contrastive_loss_layer.cpp +++ b/src/caffe/test/test_contrastive_loss_layer.cpp @@ -7,7 +7,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/contrastive_loss_layer.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 b4747357..e2d43f31 100644 --- a/src/caffe/test/test_convolution_layer.cpp +++ b/src/caffe/test/test_convolution_layer.cpp @@ -5,7 +5,11 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/conv_layer.hpp" + +#ifdef USE_CUDNN +#include "caffe/layers/cudnn_conv_layer.hpp" +#endif #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_data_layer.cpp b/src/caffe/test/test_data_layer.cpp index 9e03954a..3e8d113d 100644 --- a/src/caffe/test/test_data_layer.cpp +++ b/src/caffe/test/test_data_layer.cpp @@ -7,8 +7,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/data_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/data_layer.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/db.hpp" #include "caffe/util/io.hpp" diff --git a/src/caffe/test/test_deconvolution_layer.cpp b/src/caffe/test/test_deconvolution_layer.cpp index b473dbb9..c4b09ad5 100644 --- a/src/caffe/test/test_deconvolution_layer.cpp +++ b/src/caffe/test/test_deconvolution_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/layers/deconv_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_dummy_data_layer.cpp b/src/caffe/test/test_dummy_data_layer.cpp index c9ed38db..1a01ca85 100644 --- a/src/caffe/test/test_dummy_data_layer.cpp +++ b/src/caffe/test/test_dummy_data_layer.cpp @@ -5,8 +5,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" +#include "caffe/layers/dummy_data_layer.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_eltwise_layer.cpp b/src/caffe/test/test_eltwise_layer.cpp index 3b56c5ca..c06e3baa 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/layers/eltwise_layer.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 0f4caf15..acd4b0f6 100644 --- a/src/caffe/test/test_embed_layer.cpp +++ b/src/caffe/test/test_embed_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/embed_layer.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 9dc14de4..f253f9fd 100644 --- a/src/caffe/test/test_euclidean_loss_layer.cpp +++ b/src/caffe/test/test_euclidean_loss_layer.cpp @@ -6,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/euclidean_loss_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_filter_layer.cpp b/src/caffe/test/test_filter_layer.cpp index a2d0c293..9ea2b8b2 100644 --- a/src/caffe/test/test_filter_layer.cpp +++ b/src/caffe/test/test_filter_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/filter_layer.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 5d1caac2..d929ac7a 100644 --- a/src/caffe/test/test_flatten_layer.cpp +++ b/src/caffe/test/test_flatten_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/flatten_layer.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 adc27df4..3833ebff 100644 --- a/src/caffe/test/test_hdf5_output_layer.cpp +++ b/src/caffe/test/test_hdf5_output_layer.cpp @@ -5,7 +5,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/data_layers.hpp" +#include "caffe/layers/hdf5_output_layer.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/hdf5.hpp" #include "caffe/util/io.hpp" diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp index 7169e7bf..8884ce95 100644 --- a/src/caffe/test/test_hdf5data_layer.cpp +++ b/src/caffe/test/test_hdf5data_layer.cpp @@ -1,11 +1,13 @@ #include <string> #include <vector> +#include "hdf5.h" + #include "gtest/gtest.h" #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/data_layers.hpp" +#include "caffe/layers/hdf5_data_layer.hpp" #include "caffe/proto/caffe.pb.h" #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 dfdd01d0..8bf89fa6 100644 --- a/src/caffe/test/test_hinge_loss_layer.cpp +++ b/src/caffe/test/test_hinge_loss_layer.cpp @@ -6,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/hinge_loss_layer.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 bafcacf7..3f97cf6d 100644 --- a/src/caffe/test/test_im2col_kernel.cu +++ b/src/caffe/test/test_im2col_kernel.cu @@ -5,8 +5,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/im2col_layer.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 ec055b20..8274dd48 100644 --- a/src/caffe/test/test_im2col_layer.cpp +++ b/src/caffe/test/test_im2col_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/layers/im2col_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_image_data_layer.cpp b/src/caffe/test/test_image_data_layer.cpp index 77690245..a4080ccd 100644 --- a/src/caffe/test/test_image_data_layer.cpp +++ b/src/caffe/test/test_image_data_layer.cpp @@ -7,8 +7,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/data_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/image_data_layer.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/io.hpp" diff --git a/src/caffe/test/test_infogain_loss_layer.cpp b/src/caffe/test/test_infogain_loss_layer.cpp index b2a6754f..a24ac683 100644 --- a/src/caffe/test/test_infogain_loss_layer.cpp +++ b/src/caffe/test/test_infogain_loss_layer.cpp @@ -5,7 +5,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/infogain_loss_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_inner_product_layer.cpp b/src/caffe/test/test_inner_product_layer.cpp index 1ad2c97e..b888b510 100644 --- a/src/caffe/test/test_inner_product_layer.cpp +++ b/src/caffe/test/test_inner_product_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/inner_product_layer.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 bd1c4fe8..4c97b1ae 100644 --- a/src/caffe/test/test_lrn_layer.cpp +++ b/src/caffe/test/test_lrn_layer.cpp @@ -6,7 +6,12 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/lrn_layer.hpp" + +#ifdef USE_CUDNN +#include "caffe/layers/cudnn_lcn_layer.hpp" +#include "caffe/layers/cudnn_lrn_layer.hpp" +#endif #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_maxpool_dropout_layers.cpp b/src/caffe/test/test_maxpool_dropout_layers.cpp index 8fc944f3..4f0e20ac 100644 --- a/src/caffe/test/test_maxpool_dropout_layers.cpp +++ b/src/caffe/test/test_maxpool_dropout_layers.cpp @@ -5,7 +5,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/dropout_layer.hpp" +#include "caffe/layers/pooling_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_memory_data_layer.cpp b/src/caffe/test/test_memory_data_layer.cpp index 7269a4d4..7998bc18 100644 --- a/src/caffe/test/test_memory_data_layer.cpp +++ b/src/caffe/test/test_memory_data_layer.cpp @@ -5,8 +5,8 @@ #include <string> #include <vector> -#include "caffe/data_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/memory_data_layer.hpp" #include "caffe/test/test_caffe_main.hpp" diff --git a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp index 0404aa25..8cc21022 100644 --- a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp +++ b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp @@ -5,7 +5,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/multinomial_logistic_loss_layer.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 e9a7d54c..28a762d2 100644 --- a/src/caffe/test/test_mvn_layer.cpp +++ b/src/caffe/test/test_mvn_layer.cpp @@ -2,8 +2,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/mvn_layer.hpp" #include "google/protobuf/text_format.h" #include "gtest/gtest.h" diff --git a/src/caffe/test/test_neuron_layer.cpp b/src/caffe/test/test_neuron_layer.cpp index b333fdee..21441b41 100644 --- a/src/caffe/test/test_neuron_layer.cpp +++ b/src/caffe/test/test_neuron_layer.cpp @@ -6,9 +6,26 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" -#include "caffe/neuron_layers.hpp" + +#include "caffe/layers/absval_layer.hpp" +#include "caffe/layers/bnll_layer.hpp" +#include "caffe/layers/dropout_layer.hpp" +#include "caffe/layers/exp_layer.hpp" +#include "caffe/layers/inner_product_layer.hpp" +#include "caffe/layers/log_layer.hpp" +#include "caffe/layers/power_layer.hpp" +#include "caffe/layers/prelu_layer.hpp" +#include "caffe/layers/relu_layer.hpp" +#include "caffe/layers/sigmoid_layer.hpp" +#include "caffe/layers/tanh_layer.hpp" +#include "caffe/layers/threshold_layer.hpp" + +#ifdef USE_CUDNN +#include "caffe/layers/cudnn_relu_layer.hpp" +#include "caffe/layers/cudnn_sigmoid_layer.hpp" +#include "caffe/layers/cudnn_tanh_layer.hpp" +#endif #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 9e986e66..bb95cae0 100644 --- a/src/caffe/test/test_pooling_layer.cpp +++ b/src/caffe/test/test_pooling_layer.cpp @@ -5,7 +5,11 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/pooling_layer.hpp" + +#ifdef USE_CUDNN +#include "caffe/layers/cudnn_pooling_layer.hpp" +#endif #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_power_layer.cpp b/src/caffe/test/test_power_layer.cpp index 1041ddd4..1aa587ac 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/neuron_layers.hpp" +#include "caffe/layers/power_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_reduction_layer.cpp b/src/caffe/test/test_reduction_layer.cpp index a8d43727..6ed7cda6 100644 --- a/src/caffe/test/test_reduction_layer.cpp +++ b/src/caffe/test/test_reduction_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/reduction_layer.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 e0f4ba42..4f261386 100644 --- a/src/caffe/test/test_reshape_layer.cpp +++ b/src/caffe/test/test_reshape_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/reshape_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.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 b4f831c8..5dfd7656 100644 --- a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp @@ -6,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/sigmoid_cross_entropy_loss_layer.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 45fbcffd..c2b231e1 100644 --- a/src/caffe/test/test_slice_layer.cpp +++ b/src/caffe/test/test_slice_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/slice_layer.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 4b01f5cf..94443576 100644 --- a/src/caffe/test/test_softmax_layer.cpp +++ b/src/caffe/test/test_softmax_layer.cpp @@ -5,8 +5,12 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/softmax_layer.hpp" + +#ifdef USE_CUDNN +#include "caffe/layers/cudnn_softmax_layer.hpp" +#endif #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 0ae4cd68..c67f3e0d 100644 --- a/src/caffe/test/test_softmax_with_loss_layer.cpp +++ b/src/caffe/test/test_softmax_with_loss_layer.cpp @@ -7,7 +7,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/loss_layers.hpp" +#include "caffe/layers/softmax_loss_layer.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 e27e355c..ba2ccbb2 100644 --- a/src/caffe/test/test_split_layer.cpp +++ b/src/caffe/test/test_split_layer.cpp @@ -6,8 +6,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/split_layer.hpp" #include "caffe/proto/caffe.pb.h" #include "caffe/util/insert_splits.hpp" diff --git a/src/caffe/test/test_spp_layer.cpp b/src/caffe/test/test_spp_layer.cpp index 1b48a842..59a3af2a 100644 --- a/src/caffe/test/test_spp_layer.cpp +++ b/src/caffe/test/test_spp_layer.cpp @@ -5,7 +5,12 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/concat_layer.hpp" +#include "caffe/layers/flatten_layer.hpp" +#include "caffe/layers/pooling_layer.hpp" +#include "caffe/layers/split_layer.hpp" +#include "caffe/layers/spp_layer.hpp" + #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_stochastic_pooling.cpp b/src/caffe/test/test_stochastic_pooling.cpp index 5a412bd4..cd5db838 100644 --- a/src/caffe/test/test_stochastic_pooling.cpp +++ b/src/caffe/test/test_stochastic_pooling.cpp @@ -6,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/vision_layers.hpp" +#include "caffe/layers/pooling_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/test/test_tanh_layer.cpp b/src/caffe/test/test_tanh_layer.cpp index f31579ca..bb8699a8 100644 --- a/src/caffe/test/test_tanh_layer.cpp +++ b/src/caffe/test/test_tanh_layer.cpp @@ -6,7 +6,7 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" #include "caffe/filler.hpp" -#include "caffe/neuron_layers.hpp" +#include "caffe/layers/tanh_layer.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 903a9bc8..1e84cc5a 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/neuron_layers.hpp" +#include "caffe/layers/threshold_layer.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 5c459604..7ff75520 100644 --- a/src/caffe/test/test_tile_layer.cpp +++ b/src/caffe/test/test_tile_layer.cpp @@ -4,8 +4,8 @@ #include "caffe/blob.hpp" #include "caffe/common.hpp" -#include "caffe/common_layers.hpp" #include "caffe/filler.hpp" +#include "caffe/layers/tile_layer.hpp" #include "caffe/test/test_caffe_main.hpp" #include "caffe/test/test_gradient_check_util.hpp" diff --git a/src/caffe/util/blocking_queue.cpp b/src/caffe/util/blocking_queue.cpp index d1d1fa86..058668fe 100644 --- a/src/caffe/util/blocking_queue.cpp +++ b/src/caffe/util/blocking_queue.cpp @@ -1,8 +1,8 @@ #include <boost/thread.hpp> #include <string> -#include "caffe/data_layers.hpp" #include "caffe/data_reader.hpp" +#include "caffe/layers/base_data_layer.hpp" #include "caffe/parallel.hpp" #include "caffe/util/blocking_queue.hpp" |