From aa18ae11f21a957584f3125b9fb5e4deba7a3827 Mon Sep 17 00:00:00 2001 From: "joanna.wozna.intel" Date: Wed, 6 Jul 2022 13:17:47 +0200 Subject: [PATCH] Set FC input data format to ANY (#44023) * Fc add any to input format * Pre-commit changes --- paddle/fluid/operators/mkldnn/fc_mkldnn_op.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/paddle/fluid/operators/mkldnn/fc_mkldnn_op.cc b/paddle/fluid/operators/mkldnn/fc_mkldnn_op.cc index 79551b6d59..8cfbc95be7 100644 --- a/paddle/fluid/operators/mkldnn/fc_mkldnn_op.cc +++ b/paddle/fluid/operators/mkldnn/fc_mkldnn_op.cc @@ -209,7 +209,7 @@ class FCPrimitiveFactory { const Tensor* bias, LoDTensor* output, const ExecutionContext& ctx) { - auto src_desc = CreateMemDescriptor(input, input->format()); + auto src_desc = CreateMemDescriptor(input, MKLDNNMemoryFormat::any); auto weight_dims = Get2DWeightDimsForDNNL(weights); auto weights_desc = CreateMemDescriptor(weight_dims, MKLDNNMemoryFormat::any); @@ -236,7 +236,8 @@ class FCPrimitiveFactory { auto input_dims = phi::vectorize(input->dims()); std::vector new_input_dims = { input_dims[0] * input_dims[1], input_dims[2], 1}; - auto src_desc = CreateMemDescriptor(new_input_dims, input->format()); + auto src_desc = + CreateMemDescriptor(new_input_dims, MKLDNNMemoryFormat::any); auto weight_dims = Get3DWeightDimsForDNNL(weights); auto weights_desc = @@ -267,7 +268,7 @@ class FCPrimitiveFactory { const Tensor* bias, LoDTensor* output, const ExecutionContext& ctx) { - auto src_desc = CreateMemDescriptor(input, input->format()); + auto src_desc = CreateMemDescriptor(input, MKLDNNMemoryFormat::any); // Since MKL-DNN doesn't support 4D column-major data formats in // inner_product primitive, transpose the weights to be in // row-major format -- GitLab