From b57d8f2eb740a8ceada56742c8125fd86476cf2d Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Thu, 22 May 2014 21:24:16 -0700 Subject: [PATCH] commment, lint --- src/caffe/layers/eltwise_layer.cpp | 2 -- src/caffe/layers/eltwise_layer.cu | 3 ++- src/caffe/proto/caffe.proto | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/caffe/layers/eltwise_layer.cpp b/src/caffe/layers/eltwise_layer.cpp index 77eae30..5d05124 100644 --- a/src/caffe/layers/eltwise_layer.cpp +++ b/src/caffe/layers/eltwise_layer.cpp @@ -6,8 +6,6 @@ #include "caffe/vision_layers.hpp" #include "caffe/util/math_functions.hpp" -using std::fill; - namespace caffe { template diff --git a/src/caffe/layers/eltwise_layer.cu b/src/caffe/layers/eltwise_layer.cu index e1b63b1..75827ba 100644 --- a/src/caffe/layers/eltwise_layer.cu +++ b/src/caffe/layers/eltwise_layer.cu @@ -15,7 +15,8 @@ Dtype EltwiseLayer::Forward_gpu( Dtype* top_data = (*top)[0]->mutable_gpu_data(); switch (op_) { case EltwiseParameter_EltwiseOp_PROD: - caffe_gpu_mul(count, bottom[0]->gpu_data(), bottom[1]->gpu_data(), top_data); + caffe_gpu_mul(count, bottom[0]->gpu_data(), + bottom[1]->gpu_data(), top_data); for (int i = 2; i < bottom.size(); ++i) { caffe_gpu_mul(count, top_data, bottom[i]->gpu_data(), top_data); } diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto index b792972..5e230a1 100644 --- a/src/caffe/proto/caffe.proto +++ b/src/caffe/proto/caffe.proto @@ -258,7 +258,7 @@ message EltwiseParameter { SUM = 1; } optional EltwiseOp operation = 1 [default = SUM]; // element-wise operation - repeated float coeff = 2; // blob-wise coefficient + repeated float coeff = 2; // blob-wise coefficient for SUM operation } // Message that stores parameters used by HDF5DataLayer -- 2.7.4