diff options
Diffstat (limited to 'src/caffe/layers/power_layer.cpp')
| -rw-r--r-- | src/caffe/layers/power_layer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/caffe/layers/power_layer.cpp b/src/caffe/layers/power_layer.cpp index 8b5d8d16..a332c4d2 100644 --- a/src/caffe/layers/power_layer.cpp +++ b/src/caffe/layers/power_layer.cpp @@ -8,9 +8,9 @@ namespace caffe { template <typename Dtype> -void PowerLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom, +void PowerLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) { - NeuronLayer<Dtype>::SetUp(bottom, top); + NeuronLayer<Dtype>::LayerSetUp(bottom, top); power_ = this->layer_param_.power_param().power(); scale_ = this->layer_param_.power_param().scale(); shift_ = this->layer_param_.power_param().shift(); @@ -19,7 +19,7 @@ void PowerLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom, // Compute y = (shift + scale * x)^power template <typename Dtype> -Dtype PowerLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, +void PowerLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) { Dtype* top_data = (*top)[0]->mutable_cpu_data(); const int count = bottom[0]->count(); @@ -27,7 +27,6 @@ Dtype PowerLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, if (diff_scale_ == Dtype(0)) { Dtype value = (power_ == 0) ? Dtype(1) : pow(shift_, power_); caffe_set(count, value, top_data); - return Dtype(0); } const Dtype* bottom_data = bottom[0]->cpu_data(); caffe_copy(count, bottom_data, top_data); @@ -40,7 +39,6 @@ Dtype PowerLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, if (power_ != Dtype(1)) { caffe_powx(count, top_data, power_, top_data); } - return Dtype(0); } template <typename Dtype> |