diff options
| author | Sergey Karayev <sergeykarayev@gmail.com> | 2014-05-20 21:32:19 -0700 |
|---|---|---|
| committer | Sergey Karayev <sergeykarayev@gmail.com> | 2014-05-20 21:32:19 -0700 |
| commit | 0033f9c607f7f5079f38e569b7949e3073d2fc01 (patch) | |
| tree | dc26dc0bb530c9052a378daff7ab93c2dd327cf2 /src/caffe/layers/argmax_layer.cpp | |
| parent | a31dc6537e79f51ff6ad6f9d863af0d8ece8ee7a (diff) | |
| download | caffeonacl-0033f9c607f7f5079f38e569b7949e3073d2fc01.tar.gz caffeonacl-0033f9c607f7f5079f38e569b7949e3073d2fc01.tar.bz2 caffeonacl-0033f9c607f7f5079f38e569b7949e3073d2fc01.zip | |
Fixed lint errors due to ArgmaxLayer
Diffstat (limited to 'src/caffe/layers/argmax_layer.cpp')
| -rw-r--r-- | src/caffe/layers/argmax_layer.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/caffe/layers/argmax_layer.cpp b/src/caffe/layers/argmax_layer.cpp index 33ec1d34..e04588d4 100644 --- a/src/caffe/layers/argmax_layer.cpp +++ b/src/caffe/layers/argmax_layer.cpp @@ -15,11 +15,11 @@ void ArgMaxLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom, CHECK_EQ(bottom.size(), 1) << "ArgMaxLayer Layer takes 1 input."; CHECK_EQ(top->size(), 1) << "ArgMaxLayer Layer takes 1 output."; out_max_val_ = this->layer_param_.argmax_param().out_max_val(); - // Produces max_ind and max_val - if (out_max_val_) { + if (out_max_val_) { + // Produces max_ind and max_val (*top)[0]->Reshape(bottom[0]->num(), 2, 1, 1); - } // Produces only max_ind - else { + } else { + // Produces only max_ind (*top)[0]->Reshape(bottom[0]->num(), 1, 1, 1); } } @@ -44,8 +44,7 @@ Dtype ArgMaxLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom, if (out_max_val_) { top_data[i * 2] = max_ind; top_data[i * 2 + 1] = max_val; - } - else { + } else { top_data[i] = max_ind; } } |