Merge branch 'i43' into i41

Author: co63oc

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

@@ -31,7 +31,8 @@ void InterpolateOneDNNPass::ApplyImpl(ir::Graph* graph) const {
   PADDLE_ENFORCE_NOT_NULL(graph,
                           common::errors::InvalidArgument(
                               "Pointer to graph argument should not be NULL."));
-  if (!(graph->Has("use_mkldnn") && graph->Get<bool>("use_mkldnn"))) {
+  if (!(graph->Has("use_mkldnn") && graph->Get<bool>("use_mkldnn")) &&
+      !(graph->Has("use_onednn") && graph->Get<bool>("use_onednn"))) {
     VLOG(3) << "Do not handle interpolate_onednn_pass";
     return;
   }
@@ -53,7 +54,7 @@ void InterpolateOneDNNPass::ApplyImpl(ir::Graph* graph) const {
                                   interpolate_op_types.end(),
                                   node->Name()) != interpolate_op_types.end()) {
       auto* op_desc = node->Op();
-      op_desc->SetAttr("use_mkldnn", true);
+      op_desc->SetAttr("use_onednn", true);
       ++found_count;
     }
   }

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

@@ -56,9 +56,15 @@ void FuseOperatorUnsqueeze2OneDNNPass::FuseUnsqueeze2(
     GET_IR_NODE_FROM_SUBGRAPH(
         unsqueeze2_out, unsqueeze2_out, op_unsqueeze2_pattern);
 
-    if (!operator_op->Op()->HasAttr("use_mkldnn") ||
+    bool use_mkldnn_not =
+        !operator_op->Op()->HasAttr("use_mkldnn") ||
         (operator_op->Op()->HasAttr("use_mkldnn") &&
-         !(PADDLE_GET_CONST(bool, operator_op->Op()->GetAttr("use_mkldnn"))))) {
+         !(PADDLE_GET_CONST(bool, operator_op->Op()->GetAttr("use_mkldnn"))));
+    bool use_onednn_not =
+        !operator_op->Op()->HasAttr("use_onednn") ||
+        (operator_op->Op()->HasAttr("use_onednn") &&
+         !(PADDLE_GET_CONST(bool, operator_op->Op()->GetAttr("use_onednn"))));
+    if (use_mkldnn_not && use_onednn_not) {
       VLOG(4) << "Only oneDNN version of " << op_type
               << "can be fused with unsqueeze2.";
       return;