Fix from loss-generalization: accidentally removed mid-Forward return

from PowerLayer (caused bad performance for trivial PowerLayer cases...)

diff --git a/src/caffe/layers/power_layer.cpp b/src/caffe/layers/power_layer.cpp
index a332c4d..bf61955 100644 (file)
--- a/src/caffe/layers/power_layer.cpp
+++ b/src/caffe/layers/power_layer.cpp
@@ -27,6 +27,7 @@ void 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;
   }
   const Dtype* bottom_data = bottom[0]->cpu_data();
   caffe_copy(count, bottom_data, top_data);

diff --git a/src/caffe/layers/power_layer.cu b/src/caffe/layers/power_layer.cu
index eaf63c1..a40bc75 100644 (file)
--- a/src/caffe/layers/power_layer.cu
+++ b/src/caffe/layers/power_layer.cu
@@ -16,6 +16,7 @@ void PowerLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom,
   if (diff_scale_ == Dtype(0)) {
     Dtype value = (power_ == 0) ? Dtype(1) : pow(shift_, power_);
     caffe_gpu_set(count, value, top_data);
+    return;
   }
   const Dtype* bottom_data = bottom[0]->gpu_data();
   caffe_copy(count, bottom_data, top_data);