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 143ce56c86b9f4abe2e26508ab802f224eaa1725..0e8ce8d640053eba5f92a5ee20776e85589981f9 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 ¶m) { 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 2d7825ae14bc03d5f58cf45be0d28e52f45e139f..06c63c4a8d62d886f25465048faf6c109df0eafd 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 ¶m) { 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 ¶m) { 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 14b5992e392247135ce229f64279b3997ee078b2..25cb5ffff552052e8f58f19b1d65bad597807e19 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 ¶m) { 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 67015e14d1662d747d82ea742d847c44c56063b2..186f77a4cee42fba9a80d11f20f2f6fa6e2132eb 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 ¶m) { 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 ¶m) { 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 426e2840b44030f67edca0a8e39cbcfbe7d958c7..27fe0a8a014ff11f96017cad3acc7557cbde5583 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 ¶m) { 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 ¶m) { 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 797848365ef9b41f0ec96e0bed9551e49c03da6a..a9b2668b7be4ceb8717621b14aff4e58c81053de 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 ¶m) { 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 ¶m) { 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);