add mode pytorch_half_pixel to ResizeBilinear

Author: snoopyisadog

include/caffe/layers/resize_bilinear_layer.hpp

@@ -51,6 +51,7 @@ class ResizeBilinearLayer : public Layer<Dtype> {
   bool align_corners_;
   string data_format_;
   bool half_pixel_centers_;
+  bool pytorch_half_pixel_;
 
   // Compute the interpolation indices only once.
   struct CachedInterpolation {

src/caffe/layers/resize_bilinear_layer.cpp

@@ -18,6 +18,11 @@ void ResizeBilinearLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom,
   half_pixel_centers_ = this->layer_param_.resize_bilinear_param().half_pixel_centers();
   CHECK(!(align_corners_ && half_pixel_centers_)) <<
         "If half_pixel_centers is True, align_corners must be False.";
+  pytorch_half_pixel_ = this->layer_param_.resize_bilinear_param().pytorch_half_pixel();
+  CHECK(!(align_corners_ && pytorch_half_pixel_)) <<
+        "If pytorch_half_pixel_ is True, align_corners must be False.";
+  CHECK(!(half_pixel_centers_ && pytorch_half_pixel_)) <<
+        "If pytorch_half_pixel_ is True, half_pixel_centers_ must be False.";
 }
 
 template <typename Dtype>
@@ -70,14 +75,21 @@ void ResizeBilinearLayer<Dtype>::compute_interpolation_weights(const int out_siz
   interpolation[out_size].upper = 0;
   for (int i = out_size - 1; i >= 0; --i) {
     float in;
-    if (!half_pixel_centers_)
+    if (align_corners_)
     {
       in = static_cast<float>(i) * scale;
     }
     else //if (half_pixel_centers_)
     {
-      in = (static_cast<float>(i) + 0.5f) * scale - 0.5f;
-      // ref: https://github.com/tensorflow/tensorflow/blob/r1.15/tensorflow/core/kernels/image_resizer_state.h#L50
+      if (half_pixel_centers_ || out_size > 1) {
+        in = (static_cast<float>(i) + 0.5f) * scale - 0.5f;
+        // ref: https://github.com/tensorflow/tensorflow/blob/r1.15/tensorflow/core/kernels/image_resizer_state.h#L50
+      }else {
+        // pytorch_half_pixel_ && out_size <= 1
+        in = -0.5f;
+        // ref: https://github.com/onnx/onnx/blob/master/docs/Operators.md#Resize
+        // https://github.com/onnx/onnx/blob/master/onnx/backend/test/case/node/resize.py#L132
+      }
     }
     const float in_f = std::floor(in);
     interpolation[i].lower =

src/caffe/proto/caffe.proto

@@ -674,6 +674,7 @@ message LayerParameter {
   optional RNNv2Parameter rnn_v2_param = 272;
   optional CountNonzeroParameter count_nonzero_param = 273;
   optional NotEqualParameter not_equal_param = 274;
+  optional PointNetParameter point_net_param = 275;
 
   //ONNX related
   optional NonMaxSuppressionParameter non_max_suppression_param = 271;
@@ -3110,6 +3111,7 @@ message ResizeBilinearParameter {
   optional float scale_height = 5 [default = 1];
   optional float scale_width = 6 [default = 1];
   optional bool half_pixel_centers = 7 [default = false];
+  optional bool pytorch_half_pixel = 8 [default = false];
 }
 
 message ReduceSumParameter {
@@ -3304,6 +3306,7 @@ message MatMulParameter {
 
 message GatherV2Parameter {
   optional int32 axis = 1[default = 0];
+  optional bool batch_flag = 2[default = false];
 }
 
 message ScaledTanHParameter {
@@ -3382,3 +3385,7 @@ message CountNonzeroParameter {
 message NotEqualParameter {
   optional float comparand = 1;
 }
+
+message PointNetParameter {
+  optional uint32 n_sample_point = 1;
+}