fix valid padding pooling, fix #121

Tencent · Sep 13, 2017 · ba6026d · ba6026d
1 parent f57018d
commit ba6026d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/layer/arm/pooling_arm.cpp b/src/layer/arm/pooling_arm.cpp
@@ -70,7 +70,12 @@ int Pooling_arm::forward(const Mat& bottom_blob, Mat& top_blob) const
 
     int wtail = (w - kernel_size) % stride;
     int htail = (h - kernel_size) % stride;
-    if (pad != -233 && (wtail != 0 || htail != 0))
+    if (pad == -233 || pad == -2333)
+    {
+        wtail = 0;
+        htail = 0;
+    }
+    if (wtail != 0 || htail != 0)
     {
         int wtailpad = 0;
         int htailpad = 0;

diff --git a/src/layer/pooling.cpp b/src/layer/pooling.cpp
@@ -162,7 +162,12 @@ int Pooling::forward(const Mat& bottom_blob, Mat& top_blob) const
 
     int wtail = (w - kernel_size) % stride;
     int htail = (h - kernel_size) % stride;
-    if (pad != -233 && (wtail != 0 || htail != 0))
+    if (pad == -233 || pad == -2333)
+    {
+        wtail = 0;
+        htail = 0;
+    }
+    if (wtail != 0 || htail != 0)
     {
         int wtailpad = 0;
         int htailpad = 0;
@@ -277,7 +282,7 @@ int Pooling::forward(const Mat& bottom_blob, Mat& top_blob) const
             }
 
             // fix tail pad
-            if (pad != -233 && wtail != 0)
+            if (wtail != 0)
             {
                 const float scale = (float)kernel_size / wtail;
 
@@ -288,7 +293,7 @@ int Pooling::forward(const Mat& bottom_blob, Mat& top_blob) const
                     outptr += outw;
                 }
             }
-            if (pad != -233 && htail != 0)
+            if (htail != 0)
             {
                 const float scale = (float)kernel_size / htail;
 

diff --git a/tools/tensorflow/tensorflow2ncnn.cpp b/tools/tensorflow/tensorflow2ncnn.cpp
@@ -817,7 +817,7 @@ int main(int argc, char** argv)
             {
                 if (value_padding.s() == "VALID")
                 {
-                    pad = 0;
+                    pad = -2333;
                 }
                 else if (value_padding.s() == "SAME")
                 {