commment, lint
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 23 May 2014 04:24:16 +0000 (21:24 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 23 May 2014 04:24:16 +0000 (21:24 -0700)
src/caffe/layers/eltwise_layer.cpp
src/caffe/layers/eltwise_layer.cu
src/caffe/proto/caffe.proto

index 77eae30..5d05124 100644 (file)
@@ -6,8 +6,6 @@
 #include "caffe/vision_layers.hpp"
 #include "caffe/util/math_functions.hpp"
 
-using std::fill;
-
 namespace caffe {
 
 template <typename Dtype>
index e1b63b1..75827ba 100644 (file)
@@ -15,7 +15,8 @@ Dtype EltwiseLayer<Dtype>::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);
     }
index b792972..5e230a1 100644 (file)
@@ -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