Merge remote-tracking branch 'upstream/develop' into develop

4bd59f24 · zhangyang · 3269515e · 9da43434 · 4bd59f24 · 4bd59f24
展开全部隐藏空白更改
内联并排

Showing with 404 addition and 225 deletion

src/operators/math/im2col.cpp src/operators/math/im2col.cpp +1 -1

src/operators/math/pool_3x3.cpp src/operators/math/pool_3x3.cpp +403 -224

未找到文件。
--- a/src/operators/math/im2col.cpp
+++ b/src/operators/math/im2col.cpp
@@ -74,7 +74,7 @@ class Im2ColFunctor<ColFormat::kCFO, CPU, T> {
    const int isize = im_height;
    bool pad1 = padding[0] > 0;
    bool pad2 =
-        (pad1 &&
+        (pad1 && padding[1] &&
         (((isize - 2 * padding[0] + filter_height) % stride[0] == 0) ? 1 : 0));
    int fill = isize % 2;
    if (stride[0] == 1 && filter_height == 3 && pad1 && pad2 &&

--- a/src/operators/math/pool_3x3.cpp
+++ b/src/operators/math/pool_3x3.cpp