From 3dffdc1e639f1bc3f74a3cbc389ab4416e7793c8 Mon Sep 17 00:00:00 2001
From: bartekkuncer <bartosz.kuncer@intel.com>
Date: Sun, 31 Oct 2021 03:45:06 +0100
Subject: [PATCH] [master] Add aliases for subgraph operators to be compatible
 with old models (#20679)

* Add aliases

* Apply clang format

* Remove unnecessary _sg_mkldnn_*

* Fix review

* Simplify comparison
---
 src/operator/subgraph/dnnl/dnnl_conv.cc                  | 1 +
 src/operator/subgraph/dnnl/dnnl_fc.cc                    | 1 +
 src/operator/subgraph/dnnl/dnnl_post_quantize_property.h | 2 +-
 src/operator/subgraph/dnnl/dnnl_transformer.cc           | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/operator/subgraph/dnnl/dnnl_conv.cc b/src/operator/subgraph/dnnl/dnnl_conv.cc
index 8702430d45b0..f85ece31e450 100644
--- a/src/operator/subgraph/dnnl/dnnl_conv.cc
+++ b/src/operator/subgraph/dnnl/dnnl_conv.cc
@@ -731,6 +731,7 @@ bool SgDNNLAvoidConvQuantizeInput(const NodeAttrs& attrs,
 }
 
 NNVM_REGISTER_OP(_sg_onednn_conv)
+    .add_alias("_sg_mkldnn_conv")
     .describe(R"code(_sg_onednn_conv)code" ADD_FILELINE)
     .set_num_inputs(SgDNNLConvNumInputs)
     .set_num_outputs([](const NodeAttrs& attrs) {
diff --git a/src/operator/subgraph/dnnl/dnnl_fc.cc b/src/operator/subgraph/dnnl/dnnl_fc.cc
index 24910e71b9d4..c07b8f7b8835 100644
--- a/src/operator/subgraph/dnnl/dnnl_fc.cc
+++ b/src/operator/subgraph/dnnl/dnnl_fc.cc
@@ -652,6 +652,7 @@ static bool SgDNNLAvoidFCQuantizeInput(const NodeAttrs& attrs,
 }
 
 NNVM_REGISTER_OP(_sg_onednn_fully_connected)
+    .add_alias("_sg_mkldnn_fully_connected")
     .describe(R"code(_sg_onednn_fully_connected)code" ADD_FILELINE)
     .set_num_inputs([](const NodeAttrs& attrs) {
       auto const& full_param = nnvm::get<DNNLFCFullParam>(attrs.parsed);
diff --git a/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h b/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h
index 6da43869afd9..662b792d737d 100644
--- a/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h
@@ -56,7 +56,7 @@ class SgDNNLPostQuantizeSelector : public SubgraphSelector {
 
   bool Select(const nnvm::Node& n) override {
     if (n.op() && support_requantize_fusion_op_name.count(n.op()->name)) {
-      if (n.op()->name == "_sg_onednn_conv") {
+      if (n.op() == Op::Get("_sg_onednn_conv")) {
         auto const& param = nnvm::get<DNNLConvFusionParam>(n.attrs.parsed);
         if (param.full_conv_param.dnnl_param.quantized) {
           status = kStart;
diff --git a/src/operator/subgraph/dnnl/dnnl_transformer.cc b/src/operator/subgraph/dnnl/dnnl_transformer.cc
index 965aff4df301..e71761a4bd51 100644
--- a/src/operator/subgraph/dnnl/dnnl_transformer.cc
+++ b/src/operator/subgraph/dnnl/dnnl_transformer.cc
@@ -306,6 +306,7 @@ nnvm::ObjectPtr SgDNNLSelfAttQKQuantizedOp(const NodeAttrs& attrs) {
 }
 
 NNVM_REGISTER_OP(_sg_onednn_selfatt_qk)
+    .add_alias("_sg_mkldnn_selfatt_qk")
     .describe(R"code(_sg_onednn_selfatt_qk)code" ADD_FILELINE)
     .set_num_inputs([](const NodeAttrs& attrs) {
       auto const& param = nnvm::get<DNNLSelfAttParam>(attrs.parsed);
@@ -700,6 +701,7 @@ void DNNLSelfAttValAttOp::Forward(const OpContext& ctx,
 }
 
 NNVM_REGISTER_OP(_sg_onednn_selfatt_valatt)
+    .add_alias("_sg_mkldnn_selfatt_valatt")
     .describe(R"code(_sg_onednn_selfatt_valatt)code" ADD_FILELINE)
     .set_num_inputs([](const NodeAttrs& attrs) {
       auto const& param = nnvm::get<DNNLSelfAttParam>(attrs.parsed);