fix dwconv in w!=h

src/operators/kernel/central-arm-func/conv_add_arm_func.h

@@ -124,8 +124,7 @@ void ConvAddCompute(const FusionConvAddParam<CPU> &param) {
   } 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()[3]) {
+             param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2) {
     //        math::DepthwiseConv3x3(param.Input(), param.Strides(),
     //        param.Paddings(),
     //                               param.Filter(), param.Bias(),

src/operators/kernel/central-arm-func/conv_add_bn_relu_arm_func.h

@@ -118,16 +118,14 @@ void ConvAddBNReluCompute(const FusionConvAddBNReluParam<CPU> &param) {
   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] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[3]) {
+      param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), 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()[3]) {
+             param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);

src/operators/kernel/central-arm-func/conv_arm_func.h

@@ -130,8 +130,7 @@ void ConvCompute(const ConvParam<CPU> &param) {
     } 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()[3]) {
+               param.Filter()->dims()[2] == 3) {
       math::DepthwiseConv3x3(param.Input(), param.Strides(), param.Paddings(),
                              param.Filter(), nullptr, param.Output(), false);
     } else {

src/operators/kernel/central-arm-func/conv_bn_add_relu_arm_func.h

@@ -122,16 +122,14 @@ void ConvBNAddReluCompute(const FusionConvBNAddReluParam<CPU> &param) {
   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] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[3]) {
+      param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), 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()[3]) {
+             param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);

src/operators/kernel/central-arm-func/conv_bn_relu_arm_func.h

@@ -117,16 +117,14 @@ void ConvBNReluCompute(const FusionConvBNReluParam<CPU> &param) {
   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] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[3]) {
+      param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), 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()[3]) {
+             param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);

src/operators/kernel/central-arm-func/depthwise_conv_arm_func.h

@@ -36,8 +36,7 @@ void DepthwiseConvCompute(const ConvParam<CPU> &param) {
   } 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()[3]) {
+             param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2) {
     //    math::DepthwiseConv3x3(param.Input(), param.Strides(),
     //    param.Paddings(),
     //                           param.Filter(), &Bias, param.Output(), false);

src/operators/kernel/central-arm-func/dwconv_bn_relu_arm_func.h

@@ -115,16 +115,14 @@ void DWConvBNReluCompute(const FusionDWConvBNReluParam<CPU> &param) {
   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] == 1 &&
-      param.Input()->dims()[2] == param.Input()->dims()[3]) {
+      param.Filter()->dims()[2] == 3 && param.Strides()[0] == 1) {
     math::DepthwiseConvAddBNRelu3x3s1p1(param.Input(), param.Filter(),
                                         param.Output(), param.NewScale(),
                                         param.NewBias(), 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()[3]) {
+             param.Filter()->dims()[2] == 3 && param.Strides()[0] == 2) {
     //    math::DepthwiseConvAddBNRelu3x3s2p1(param.Input(), param.Filter(),
     //                                        param.Output(), param.NewScale(),
     //                                        param.NewBias(), 1);