refine NotEqual to remove Parameter layer

Author: minglu2019

include/caffe/layers/not_equal_layer.hpp

@@ -16,6 +16,8 @@ template <typename Dtype> class NotEqualLayer : public Layer<Dtype> {
 public:
   explicit NotEqualLayer(const LayerParameter &param)
       : Layer<Dtype>(param) {}
+  virtual void LayerSetUp(const vector<Blob<Dtype> *> &bottom,
+	  const vector<Blob<Dtype> *> &top);
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
 	  const vector<Blob<Dtype>*>& top);
 
@@ -30,6 +32,9 @@ template <typename Dtype> class NotEqualLayer : public Layer<Dtype> {
 	  const vector<bool>& propagate_down, const vector<Blob<Dtype>*>& bottom) {
 	  NOT_IMPLEMENTED;
   };
+
+  float comparand_;
+  int const_flag_;
 };
 
 } // namespace caffe

src/caffe/layers/not_equal_layer.cpp

@@ -6,41 +6,49 @@
 namespace caffe {
 
 	template <typename Dtype>
-	void NotEqualLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom,
-		const vector<Blob<Dtype>*>& top) {
-
-		Blob<Dtype>* comparand = (bottom.size() > 1) ? bottom[1] : this->blobs_[0].get();
-		vector<int> bottom_shape = bottom[0]->shape();
-
-		// case 1: bottom[1] is a scalar(bottom[0] may be a scalar)
-		if (comparand->num_axes() == 0) {}
-		// case 2: bottom[0] and bottom[1] are tensor and have the same dimension
-		else if (comparand->num_axes() == bottom[0]->num_axes()) {
-			for (int i = 0; i < bottom[0]->num_axes(); ++i) {
-				CHECK_EQ(bottom[0]->shape(i), comparand->shape(i)) << "Broadcasting is not supported now!!! Please confirm that 2 inputs have the same shape!!";
-			}
+	void NotEqualLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype> *> &bottom,
+		const vector<Blob<Dtype> *> &top) {
+		if ((bottom.size() == 1) && (this->blobs_.size() == 0)) {
+			const NotEqualParameter &not_equal_param = this->layer_param_.not_equal_param();
+			comparand_ = not_equal_param.comparand();
+			const_flag_ = 1;
 		}
-		// case 3: bottom[0] and bottom[1] are tensor and have different dimension/shape
 		else {
-			CHECK_EQ(bottom[0]->num_axes(), comparand->num_axes()) << "Broadcasting is not supported now!!! Please confirm that 2 inputs have the same shape!!";
+			const_flag_ = 0;
+			Blob<Dtype>* comparand = (bottom.size() > 1) ? bottom[1] : this->blobs_[0].get();
+			// case 1: bottom[0] and bottom[1] are tensor and have the same dimension
+			if (comparand->num_axes() == bottom[0]->num_axes()) {
+				for (int i = 0; i < bottom[0]->num_axes(); ++i) {
+					CHECK_EQ(bottom[0]->shape(i), comparand->shape(i)) << "Broadcasting is not supported now!!! Please confirm that 2 inputs have the same shape!!";
+				}
+			}
+			// case 2: bottom[0] and bottom[1] are tensor and have different dimension/shape
+			else {
+				CHECK_EQ(bottom[0]->num_axes(), comparand->num_axes()) << "Broadcasting is not supported now!!! Please confirm that 2 inputs have the same shape!!";
+			}
 		}
-		vector<int> top_shape = bottom_shape;
-		top[0]->Reshape(top_shape);
+	}
+
+	template <typename Dtype>
+	void NotEqualLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom,
+		const vector<Blob<Dtype>*>& top) {
+		vector<int> bottom_shape = bottom[0]->shape();
+		top[0]->Reshape(bottom_shape);
 	}
 
 	template <typename Dtype>
 	void NotEqualLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
 		const vector<Blob<Dtype>*>& top) {
 		const Dtype* bottom_data = bottom[0]->cpu_data();
-		Blob<Dtype>* comparand = (bottom.size() > 1) ? bottom[1] : this->blobs_[0].get();
-		const Dtype* comparand_data = comparand->cpu_data();
 		Dtype* top_data = top[0]->mutable_cpu_data();
-		if (comparand->num_axes() == 0) {
+		if (const_flag_ == 1) {
 			for (int i = 0; i < top[0]->count(); ++i) {
-				top_data[i] = bool(bottom_data[i] != comparand_data[0]);
+				top_data[i] = bool(bottom_data[i] != comparand_);
 			}
 		}
 		else {
+			Blob<Dtype>* comparand = (bottom.size() > 1) ? bottom[1] : this->blobs_[0].get();
+			const Dtype* comparand_data = comparand->cpu_data();
 			for (int i = 0; i < top[0]->count(); ++i) {
 				top_data[i] = bool(bottom_data[i] != comparand_data[i]);
 			}

src/caffe/proto/caffe.proto

@@ -673,6 +673,7 @@ message LayerParameter {
   optional AttentionParameter attention_param = 270;
   optional RNNv2Parameter rnn_v2_param = 272;
   optional CountNonzeroParameter count_nonzero_param = 273;
+  optional NotEqualParameter not_equal_param = 274;
 
   //ONNX related
   optional NonMaxSuppressionParameter non_max_suppression_param = 271;
@@ -3377,3 +3378,7 @@ message CountNonzeroParameter {
   repeated int32 axis = 1;
   optional bool keepdims = 2[default = false];
 }
+
+message NotEqualParameter {
+  optional float comparand = 1;
+}