From 71f74f5c0ef1fcddfe3beac41202b6c9a138d266 Mon Sep 17 00:00:00 2001
From: Jacek Czaja <jacek.czaja@intel.com>
Date: Mon, 1 Aug 2022 09:04:43 +0200
Subject: [PATCH] Fix to CI (#44744)

* - fix

* - another fix

* lint
---
 .../operators/mkldnn/matmul_v2_mkldnn_op.cc   | 87 ++++++++++---------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/paddle/fluid/operators/mkldnn/matmul_v2_mkldnn_op.cc b/paddle/fluid/operators/mkldnn/matmul_v2_mkldnn_op.cc
index b4c18c42a76..5c3dd0cb123 100644
--- a/paddle/fluid/operators/mkldnn/matmul_v2_mkldnn_op.cc
+++ b/paddle/fluid/operators/mkldnn/matmul_v2_mkldnn_op.cc
@@ -103,6 +103,34 @@ static paddle::framework::DDim ColumnMatrixDimsFromVector(
   return y_dim.size() > 1 ? y_dim : phi::make_ddim({y_dim[0], 1});
 }
 
+phi::DDim GetDimForInput(const ExecutionContext &ctx, std::string input_name) {
+  auto shape = ctx.Attr<std::vector<int>>("fused_reshape_" + input_name);
+  auto axis = ctx.Attr<std::vector<int>>("fused_transpose_" + input_name);
+  auto input_dims = ctx.Input<Tensor>(input_name)->dims();
+  if (!shape.empty() && !axis.empty()) {
+    auto it_zero = std::find(shape.begin(), shape.end(), 0);
+    if (it_zero != shape.end()) {
+      for (uint64_t i = 0; i < shape.size(); i++) {
+        if (shape[i] == 0) {
+          PADDLE_ENFORCE_LT(i,
+                            input_dims.size(),
+                            paddle::platform::errors::InvalidArgument(
+                                "The index of 0 in fused_reshape_%s ",
+                                "should be less than output dim size, ",
+                                "but the index is %d and output dim size is %d",
+                                input_name,
+                                i,
+                                input_dims.size()));
+          shape[i] = input_dims.at(i);
+        }
+      }
+    }
+
+    return input_dims.reshape(shape).transpose(axis);
+  }
+  return input_dims;
+}
+
 template <typename XT, typename YT, typename OT>
 class MatMulMKLDNNHandler
     : public paddle::platform::MKLDNNHandlerNoCachingT<XT, dnnl::matmul> {
@@ -235,36 +263,6 @@ class MatMulMKLDNNHandler
         out_strides;
   };
 
-  phi::DDim GetDimForInput(const ExecutionContext &ctx,
-                           std::string input_name) {
-    auto shape = ctx.Attr<std::vector<int>>("fused_reshape_" + input_name);
-    auto axis = ctx.Attr<std::vector<int>>("fused_transpose_" + input_name);
-    auto input_dims = ctx.Input<Tensor>(input_name)->dims();
-    if (!shape.empty() && !axis.empty()) {
-      auto it_zero = std::find(shape.begin(), shape.end(), 0);
-      if (it_zero != shape.end()) {
-        for (uint64_t i = 0; i < shape.size(); i++) {
-          if (shape[i] == 0) {
-            PADDLE_ENFORCE_LT(
-                i,
-                input_dims.size(),
-                paddle::platform::errors::InvalidArgument(
-                    "The index of 0 in fused_reshape_%s ",
-                    "should be less than output dim size, ",
-                    "but the index is %d and output dim size is %d",
-                    input_name,
-                    i,
-                    input_dims.size()));
-            shape[i] = input_dims.at(i);
-          }
-        }
-      }
-
-      return input_dims.reshape(shape).transpose(axis);
-    }
-    return input_dims;
-  }
-
   std::pair<phi::funcs::MatDescriptor, memory::dims> GetInputDimsAndStrides(
       const ExecutionContext &ctx, std::string input_name) {
     auto shape = ctx.Attr<std::vector<int>>("fused_reshape_" + input_name);
@@ -599,6 +597,23 @@ std::vector<int64_t> GetInputStrides(const ExecutionContext &ctx,
   auto input_dims = ctx.Input<Tensor>(input_name)->dims();
   auto new_dims = input_dims;
   if (!shape.empty() && !axis.empty()) {
+    auto it_zero = std::find(shape.begin(), shape.end(), 0);
+    if (it_zero != shape.end()) {
+      for (uint64_t i = 0; i < shape.size(); i++) {
+        if (shape[i] == 0) {
+          PADDLE_ENFORCE_LT(i,
+                            input_dims.size(),
+                            paddle::platform::errors::InvalidArgument(
+                                "The index of 0 in fused_reshape_%s ",
+                                "should be less than output dim size, ",
+                                "but the index is %d and output dim size is %d",
+                                input_name,
+                                i,
+                                input_dims.size()));
+          shape[i] = input_dims.at(i);
+        }
+      }
+    }
     new_dims = input_dims.reshape(shape).transpose(axis);
   }
 
@@ -693,18 +708,6 @@ void ExecuteMatMulV2(const ExecutionContext &ctx,
   out->set_format(format);
 }
 
-paddle::framework::DDim GetDimForInput(
-    const paddle::framework::ExecutionContext &ctx,
-    const std::string &input_name) {
-  auto shape = ctx.Attr<std::vector<int>>("fused_reshape_" + input_name);
-  auto axis = ctx.Attr<std::vector<int>>("fused_transpose_" + input_name);
-  auto dim = ctx.Input<paddle::framework::Tensor>(input_name)->dims();
-  if (!shape.empty() && !axis.empty()) {
-    dim = dim.reshape(shape).transpose(axis);
-  }
-  return dim;
-}
-
 template <typename T>
 class MatMulV2MKLDNNKernel : public paddle::framework::OpKernel<T> {
  public:
-- 
GitLab