From f10af946d3b2738967003368737912a2849fce7e Mon Sep 17 00:00:00 2001
From: eclipsess <wowchinasuiyang@163.com>
Date: Tue, 30 Oct 2018 17:20:54 +0800
Subject: [PATCH] 2->3 width not [2]

---
 src/operators/kernel/central-arm-func/conv_add_arm_func.h     | 4 ++--
 .../kernel/central-arm-func/conv_add_bn_relu_arm_func.h       | 4 ++--
 src/operators/kernel/central-arm-func/conv_arm_func.h         | 4 ++--
 .../kernel/central-arm-func/conv_bn_add_relu_arm_func.h       | 4 ++--
 src/operators/kernel/central-arm-func/conv_bn_relu_arm_func.h | 4 ++--
 .../kernel/central-arm-func/dwconv_bn_relu_arm_func.h         | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/operators/kernel/central-arm-func/conv_add_arm_func.h b/src/operators/kernel/central-arm-func/conv_add_arm_func.h
index 143ce56c86..0e8ce8d640 100644
--- a/src/operators/kernel/central-arm-func/conv_add_arm_func.h
+++ b/src/operators/kernel/central-arm-func/conv_add_arm_func.h
@@ -119,14 +119,14 @@ void ConvAddCompute(const FusionConvAddParam<CPU> &param) {
       param.Input()->dims()[1] == param.Output()->dims()[1] &&
       param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
       param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[2]) {
+      param.Input()->dims()[2] == param.Input()->dims()[3]) {
     math::DepthwiseConv3x3s1p1(param.Input(), param.Filter(), param.Output(),
                                param.Bias(), true);
   } else if (param.Groups() == param.Input()->dims()[1] &&
              param.Input()->dims()[1] == param.Output()->dims()[1] &&
              param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
              param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2 &&
-             param.Input()->dims()[2] == param.Input()->dims()[2]) {
+             param.Input()->dims()[2] == param.Input()->dims()[3]) {
     //        math::DepthwiseConv3x3(param.Input(), param.Strides(),
     //        param.Paddings(),
     //                               param.Filter(), param.Bias(),
diff --git a/src/operators/kernel/central-arm-func/conv_add_bn_relu_arm_func.h b/src/operators/kernel/central-arm-func/conv_add_bn_relu_arm_func.h
index 2d7825ae14..06c63c4a8d 100644
--- a/src/operators/kernel/central-arm-func/conv_add_bn_relu_arm_func.h
+++ b/src/operators/kernel/central-arm-func/conv_add_bn_relu_arm_func.h
@@ -119,7 +119,7 @@ void ConvAddBNReluCompute(const FusionConvAddBNReluParam<CPU> &param) {
       param.Input()->dims()[1] == param.Output()->dims()[1] &&
       param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
       param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[2]) {
+      param.Input()->dims()[2] == param.Input()->dims()[3]) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), true);
@@ -127,7 +127,7 @@ void ConvAddBNReluCompute(const FusionConvAddBNReluParam<CPU> &param) {
              param.Input()->dims()[1] == param.Output()->dims()[1] &&
              param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
              param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2 &&
-             param.Input()->dims()[2] == param.Input()->dims()[2]) {
+             param.Input()->dims()[2] == param.Input()->dims()[3]) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);
diff --git a/src/operators/kernel/central-arm-func/conv_arm_func.h b/src/operators/kernel/central-arm-func/conv_arm_func.h
index 14b5992e39..25cb5ffff5 100644
--- a/src/operators/kernel/central-arm-func/conv_arm_func.h
+++ b/src/operators/kernel/central-arm-func/conv_arm_func.h
@@ -125,14 +125,14 @@ void ConvCompute(const ConvParam<CPU> &param) {
         param.Input()->dims()[1] == param.Output()->dims()[1] &&
         param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
         param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1 &&
-        param.Input()->dims()[2] == param.Input()->dims()[2]) {
+        param.Input()->dims()[2] == param.Input()->dims()[3]) {
       math::DepthwiseConv3x3s1p1(param.Input(), param.Filter(), param.Output(),
                                  nullptr, false);
     } else if (param.Groups() == param.Input()->dims()[1] &&
                param.Input()->dims()[1] == param.Output()->dims()[1] &&
                param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
                param.Filter()->dims()[2] == 3 &&
-               param.Input()->dims()[2] == param.Input()->dims()[2]) {
+               param.Input()->dims()[2] == param.Input()->dims()[3]) {
       math::DepthwiseConv3x3(param.Input(), param.Strides(), param.Paddings(),
                              param.Filter(), nullptr, param.Output(), false);
     } else {
diff --git a/src/operators/kernel/central-arm-func/conv_bn_add_relu_arm_func.h b/src/operators/kernel/central-arm-func/conv_bn_add_relu_arm_func.h
index 67015e14d1..186f77a4ce 100644
--- a/src/operators/kernel/central-arm-func/conv_bn_add_relu_arm_func.h
+++ b/src/operators/kernel/central-arm-func/conv_bn_add_relu_arm_func.h
@@ -123,7 +123,7 @@ void ConvBNAddReluCompute(const FusionConvBNAddReluParam<CPU> &param) {
       param.Input()->dims()[1] == param.Output()->dims()[1] &&
       param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
       param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[2]) {
+      param.Input()->dims()[2] == param.Input()->dims()[3]) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), true);
@@ -131,7 +131,7 @@ void ConvBNAddReluCompute(const FusionConvBNAddReluParam<CPU> &param) {
              param.Input()->dims()[1] == param.Output()->dims()[1] &&
              param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
              param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2 &&
-             param.Input()->dims()[2] == param.Input()->dims()[2]) {
+             param.Input()->dims()[2] == param.Input()->dims()[3]) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);
diff --git a/src/operators/kernel/central-arm-func/conv_bn_relu_arm_func.h b/src/operators/kernel/central-arm-func/conv_bn_relu_arm_func.h
index 426e2840b4..27fe0a8a01 100644
--- a/src/operators/kernel/central-arm-func/conv_bn_relu_arm_func.h
+++ b/src/operators/kernel/central-arm-func/conv_bn_relu_arm_func.h
@@ -118,7 +118,7 @@ void ConvBNReluCompute(const FusionConvBNReluParam<CPU> &param) {
       param.Input()->dims()[1] == param.Output()->dims()[1] &&
       param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
       param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[2]) {
+      param.Input()->dims()[2] == param.Input()->dims()[3]) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), true);
@@ -126,7 +126,7 @@ void ConvBNReluCompute(const FusionConvBNReluParam<CPU> &param) {
              param.Input()->dims()[1] == param.Output()->dims()[1] &&
              param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
              param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2 &&
-             param.Input()->dims()[2] == param.Input()->dims()[2]) {
+             param.Input()->dims()[2] == param.Input()->dims()[3]) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);
diff --git a/src/operators/kernel/central-arm-func/dwconv_bn_relu_arm_func.h b/src/operators/kernel/central-arm-func/dwconv_bn_relu_arm_func.h
index 797848365e..a9b2668b7b 100644
--- a/src/operators/kernel/central-arm-func/dwconv_bn_relu_arm_func.h
+++ b/src/operators/kernel/central-arm-func/dwconv_bn_relu_arm_func.h
@@ -116,7 +116,7 @@ void DWConvBNReluCompute(const FusionDWConvBNReluParam<CPU> &param) {
       param.Input()->dims()[1] == param.Output()->dims()[1] &&
       param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
       param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[2]) {
+      param.Input()->dims()[2] == param.Input()->dims()[3]) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), true);
@@ -124,7 +124,7 @@ void DWConvBNReluCompute(const FusionDWConvBNReluParam<CPU> &param) {
              param.Input()->dims()[1] == param.Output()->dims()[1] &&
              param.Filter()->dims()[2] == param.Filter()->dims()[3] &&
              param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2 &&
-             param.Input()->dims()[2] == param.Input()->dims()[2]) {
+             param.Input()->dims()[2] == param.Input()->dims()[3]) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);
-- 
GitLab