Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[master] Add aliases for subgraph operators to be compatible with old models #20679

Merged
merged 5 commits into from
Oct 31, 2021
Merged

[master] Add aliases for subgraph operators to be compatible with old models #20679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a81091
Add aliases
bartekkuncer Oct 19, 2021
e809340
Apply clang format
bartekkuncer Oct 19, 2021
a362551
Remove unnecessary _sg_mkldnn_*
bartekkuncer Oct 19, 2021
3d3cc0e
Fix review
bartekkuncer Oct 19, 2021
9a1a818
Simplify comparison
bartekkuncer Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions python/mxnet/amp/lists/symbol_bf16.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,6 @@
'zeros_like',
'_sg_onednn_conv',
'_sg_onednn_fully_connected',
'_sg_mkldnn_conv',
'_sg_mkldnn_fully_connected',
'broadcast_mul',
'Convolution_v1',
'IdentityAttachKLSparseReg',
Expand Down
4 changes: 0 additions & 4 deletions python/mxnet/amp/lists/symbol_fp16.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,10 +615,6 @@
'_sg_onednn_fully_connected',
'_sg_onednn_selfatt_qk',
'_sg_onednn_selfatt_valatt',
'_sg_mkldnn_conv',
'_sg_mkldnn_fully_connected',
'_sg_mkldnn_selfatt_qk',
'_sg_mkldnn_selfatt_valatt',
])

# Functions that have to be cast to FP32 only for
Expand Down
3 changes: 1 addition & 2 deletions src/operator/quantization/quantize_graph_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,7 @@ inline QuantizeType NeedQuantize(ObjectPtr node,
need = false;
if (need) {
if ((quantize_granularity == "channel-wise") &&
(node->op() == Op::Get("_sg_onednn_fully_connected") ||
node->op() == Op::Get("_sg_mkldnn_fully_connected"))) {
(node->op() == Op::Get("_sg_onednn_fully_connected"))) {
quantized_node->attrs.dict["channel_wise_quantize"] = "True";
}
quantized_node_map->insert(std::make_pair(node, quantized_node));
Expand Down
2 changes: 1 addition & 1 deletion src/operator/subgraph/dnnl/dnnl_post_quantize_property.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" || n.op()->name == "_sg_mkldnn_conv") {
if (n.op()->name == "_sg_onednn_conv") {
bartekkuncer marked this conversation as resolved.
Show resolved Hide resolved
auto const& param = nnvm::get<DNNLConvFusionParam>(n.attrs.parsed);
if (param.full_conv_param.dnnl_param.quantized) {
status = kStart;
Expand Down
8 changes: 2 additions & 6 deletions src/operator/subgraph/dnnl/dnnl_transformer_post_quantize_property.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ class SgDNNLTransformerPostQuantizeSelector : public SubgraphSelector {

bool Select(const nnvm::Node& n) override {
if ((!disable_all) && (n.op() == Op::Get("_sg_onednn_selfatt_qk") ||
n.op() == Op::Get("_sg_onednn_selfatt_valatt") ||
n.op() == Op::Get("_sg_mkldnn_selfatt_qk") ||
n.op() == Op::Get("_sg_mkldnn_selfatt_valatt"))) {
n.op() == Op::Get("_sg_onednn_selfatt_valatt"))) {
status = disable_all ? kSuccess : kStart;
matched_list.clear();
matched_list.push_back(&n);
Expand Down Expand Up @@ -154,9 +152,7 @@ class SgDNNLTransformerPostQuantizeProperty : public SubgraphProperty {
if (node->is_variable())
return;
if (node->op() == Op::Get("_sg_onednn_selfatt_qk") ||
node->op() == Op::Get("_sg_onednn_selfatt_valatt") ||
node->op() == Op::Get("_sg_mkldnn_selfatt_qk") ||
node->op() == Op::Get("_sg_mkldnn_selfatt_valatt")) {
node->op() == Op::Get("_sg_onednn_selfatt_valatt")) {
interleaved_node = node;
} else if (node->op() == Op::Get("_contrib_requantize")) {
requantize_node = node;
Expand Down