diff options
Diffstat (limited to 'src/caffe/layers/conv_layer.cpp')
| -rw-r--r-- | src/caffe/layers/conv_layer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp index df3e31ba..1a1248f3 100644 --- a/src/caffe/layers/conv_layer.cpp +++ b/src/caffe/layers/conv_layer.cpp @@ -9,9 +9,8 @@ namespace caffe { template <typename Dtype> -void ConvolutionLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom, +void ConvolutionLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) { - Layer<Dtype>::SetUp(bottom, top); ConvolutionParameter conv_param = this->layer_param_.convolution_param(); CHECK(!conv_param.has_kernel_size() != !(conv_param.has_kernel_h() && conv_param.has_kernel_w())) @@ -117,7 +116,7 @@ void ConvolutionLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom, template <typename Dtype> -Dtype ConvolutionLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, +void ConvolutionLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) { for (int i = 0; i < bottom.size(); ++i) { const Dtype* bottom_data = bottom[i]->cpu_data(); @@ -147,7 +146,6 @@ Dtype ConvolutionLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, } } } - return Dtype(0.); } template <typename Dtype> |