Fix

Author: co63oc

paddle/fluid/framework/ir/onednn/cpu_bfloat16_pass_tester.cc

@@ -28,7 +28,7 @@ void SetOp(ProgramDesc* prog,
            const std::string& onednn_data_type = "float32") {
   auto* op = prog->MutableBlock(0)->AppendOp();
   op->SetType(type);
-  op->SetAttr("use_mkldnn", use_onednn);
+  op->SetAttr("use_onednn", use_onednn);
   op->SetAttr("name", name);
 
   if (type == "conv2d") {

paddle/fluid/framework/ir/onednn/multi_gru_fuse_pass.cc

@@ -186,7 +186,7 @@ MultiGRUFusePass::MultiGRUFusePass() {
       .AddAttr("origin_mode")
       .IsType<bool>()
       .End()
-      .AddAttr("use_mkldnn")
+      .AddAttr("use_onednn")
       .IsType<bool>()
       .End()
       .AddAttr("mkldnn_data_type")

paddle/fluid/framework/ir/onednn/shuffle_channel_onednn_detect_pass.cc

@@ -208,7 +208,7 @@ void ShuffleChannelMKLDNNDetectPass::ApplyImpl(ir::Graph* graph) const {
     new_op_desc.SetOutput("Out", {output_name});
 
     new_op_desc.SetAttr("group", group);
-    new_op_desc.SetAttr("use_mkldnn", true);
+    new_op_desc.SetAttr("use_onednn", true);
     new_op_desc.Flush();
 
     // Create a new node for the fused op.

paddle/fluid/framework/ir/onednn/shuffle_channel_onednn_detect_pass_tester.cc

@@ -66,8 +66,11 @@ void MainTest() {
   for (const auto* node : graph->Nodes()) {
     if (node->IsOp() && node->Op()->Type() == "shuffle_channel") {
       const auto* op = node->Op();
-      ASSERT_TRUE(op->HasAttr("use_mkldnn"));
-      EXPECT_TRUE(PADDLE_GET_CONST(bool, op->GetAttr("use_mkldnn")));
+      ASSERT_TRUE(op->HasAttr("use_mkldnn") || op->HasAttr("use_onednn"));
+      EXPECT_TRUE((op->HasAttr("use_mkldnn") &&
+                   PADDLE_GET_CONST(bool, op->GetAttr("use_mkldnn"))) ||
+                  (op->HasAttr("use_onednn") &&
+                   PADDLE_GET_CONST(bool, op->GetAttr("use_onednn"))));
     }
   }
 }

paddle/fluid/framework/ir/onednn/squeeze2_transpose2_onednn_fuse_pass.cc

@@ -47,10 +47,15 @@ void FuseSqueeze2Transpose2OneDNNPass::ApplyImpl(Graph *graph) const {
     GET_IR_NODE_FROM_SUBGRAPH(
         transpose2_op, transpose2_op, squeeze2_transpose2_pattern);
 
-    if (!transpose2_op->Op()->HasAttr("use_mkldnn") ||
+    bool use_mkldnn_not =
+        !transpose2_op->Op()->HasAttr("use_mkldnn") ||
         (transpose2_op->Op()->HasAttr("use_mkldnn") &&
-         !(PADDLE_GET_CONST(bool,
-                            transpose2_op->Op()->GetAttr("use_mkldnn"))))) {
+         !(PADDLE_GET_CONST(bool, transpose2_op->Op()->GetAttr("use_mkldnn"))));
+    bool use_onednn_not =
+        !transpose2_op->Op()->HasAttr("use_onednn") ||
+        (transpose2_op->Op()->HasAttr("use_onednn") &&
+         !(PADDLE_GET_CONST(bool, transpose2_op->Op()->GetAttr("use_onednn"))));
+    if (use_mkldnn_not && use_onednn_not) {
       VLOG(4) << "Only oneDNN version of transpose2 can be fused after with "
                  "squeeze2.";
       return;