Skip to content

Support Conv2D + BiasAdd + Relu + Sum fusion #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2022
Merged

Support Conv2D + BiasAdd + Relu + Sum fusion #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a48305d
Support Conv2D + BiasAdd + Relu + Sum fusion
lvliang-intel Dec 6, 2022
2df5c97
Merge branch 'master' of https://github.com/intel/neural-compressor i…
lvliang-intel Dec 6, 2022
c522333
update ut case
lvliang-intel Dec 6, 2022
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
4 changes: 4 additions & 0 deletions neural_compressor/adaptor/tensorflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@
'Dequantize + Conv2D + BiasAdd + LeakyRelu + Add + QuantizeV2',
'Dequantize + Conv2D + LeakyRelu + AddV2 + QuantizeV2',
'Dequantize + Conv2D + LeakyRelu + Add + QuantizeV2',
'Dequantize + Conv2D + BiasAdd + Relu + AddV2 + QuantizeV2',
'Dequantize + Conv2D + BiasAdd + Relu + Add + QuantizeV2',
'Dequantize + Conv2D + Relu + AddV2 + QuantizeV2',
'Dequantize + Conv2D + Relu + Add + QuantizeV2',
'Dequantize + Conv2D + Add + QuantizeV2',
'Dequantize + Conv2D + AddV2 + QuantizeV2',
'Dequantize + Conv2D + AddV2 + Add + QuantizeV2',
Expand Down
14 changes: 10 additions & 4 deletions neural_compressor/adaptor/tf_utils/quantize_graph/qdq/fuse_qdq_conv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,16 @@ def __init__(self, **kwargs):
'DequantizeConv2DSigmoidQuantizeV2': self.apply_newly_conv_biasadd_relu_fusion,
'DequantizeConv2DBiasAddLeakyReluAddV2QuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DBiasAddLeakyReluAddQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DBiasAddReluAddV2QuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DBiasAddReluAddQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DBiasAddAddLeakyReluQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DBiasAddAddV2LeakyReluQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DAddLeakyReluQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DAddV2LeakyReluQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DLeakyReluAddV2QuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DLeakyReluAddQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DReluAddV2QuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DReluAddQuantizeV2': self.apply_newly_conv_biasadd_addn_relu_fusion,
'DequantizeConv2DAddRelu6QuantizeV2': self.apply_newly_conv_biasadd_relu_fusion,
'DequantizeConv2DAddReluQuantizeV2': self.apply_newly_conv_biasadd_relu_fusion,
'DequantizeConv2DBiasAddAddRelu6MulMulQuantizeV2': self.apply_conv_biasadd_hardswish_fusion,
Expand Down Expand Up @@ -1194,7 +1198,9 @@ def apply_newly_conv_biasadd_addn_relu_fusion(self, match_node_name):
# Dequantize + Conv2D + BiasAdd + AddV2 + Relu6 + QuantizeV2
# Dequantize + Conv2D + BiasAdd + Add + Relu + QuantizeV2
# Dequantize + Conv2D + BiasAdd + LeakyRelu + AddV2 + QuantizeV2
# Dequantize + Conv2D + BiasAdd + Relu + AddV2(Add) + QuantizeV2
# Dequantize + Conv2D + LeakyRelu + AddV2 + QuantizeV2
# Dequantize + Conv2D + Relu + AddV2(Add) + QuantizeV2
# Dequantize + Conv2D + Add + Add + Relu + QuantizeV2
# Dequantize + Conv2D + BiasAdd + Add + Relu + QuantizeV2
skip_node_name = match_node_name[2:]
Expand Down Expand Up @@ -1236,8 +1242,8 @@ def apply_newly_conv_biasadd_addn_relu_fusion(self, match_node_name):
return self.apply_newly_conv_biasadd_fusion(match_node_name[:3] + [match_node_name[-1]])

forth_node = self.node_name_mapping[match_node_name[4]].node
if forth_node.op != 'LeakyRelu':
if third_node.op != 'LeakyRelu' and not self._find_relu_node(matched_node.node):
if forth_node.op not in ('LeakyRelu', 'Relu'):
if third_node.op not in ('LeakyRelu', 'Relu') and not self._find_relu_node(matched_node.node):
return self.apply_newly_conv_biasadd_fusion(match_node_name[:3] + [match_node_name[-1]])

is_leakyrelu_add_fusion = third_node.op == 'LeakyRelu' and forth_node.op.find('Add') != -1
Expand All @@ -1251,7 +1257,7 @@ def apply_newly_conv_biasadd_addn_relu_fusion(self, match_node_name):

sum_node_name = self.node_name_mapping[match_node_name[3 + relu_offset]].node.input[sum_index]
deq_node = self.node_name_mapping[sum_node_name].node
if (deq_node.op != 'LeakyRelu' and deq_node.op != 'Dequantize') or \
if (deq_node.op != 'LeakyRelu' and deq_node.op != 'Dequantize' and deq_node.op != 'BiasAdd') or \
deq_node.op.find("Quantize") != -1:
return self.apply_newly_conv_biasadd_fusion(match_node_name[:3]+[match_node_name[-1]])

Expand Down Expand Up @@ -1350,7 +1356,7 @@ def apply_newly_conv_biasadd_addn_relu_fusion(self, match_node_name):

self.add_output_graph_node(quantized_conv_node)

if is_leakyrelu_add_fusion or is_leakyrelu:
if is_leakyrelu_add_fusion or is_leakyrelu or is_relu_add_fusion:
quantize_down_name = self._add_quantize_down_nodes(
node, quantized_node_name, dtypes.qint8, False)
self._intel_cpu_add_dequantize_result_node(
Expand Down
2 changes: 1 addition & 1 deletion test/tfnewapi/test_tensorflow_graph_conv_fusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ def test_conv_biasadd_addv2_relu_fallback_fusion_1(self):

for i in output_graph.graph_def.node:
if i.op == '_FusedQuantizedConv2D' and \
i.attr['fused_ops'].list.s == [b'BiasAdd', b'Dequantize']:
i.attr['fused_ops'].list.s == [b'BiasAdd', b'Sum', b'Relu', b'Requantize']:
found_conv_fusion = True
break
self.assertEqual(found_conv_fusion, True)
Expand Down
2 changes: 1 addition & 1 deletion test/tfnewapi/test_tensorflow_graph_qdq_conv_fusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def test_conv_biasadd_addv2_relu_fallback_fusion_1(self):

for i in output_graph.graph_def.node:
if i.op == '_FusedQuantizedConv2D' and \
i.attr['fused_ops'].list.s == [b'BiasAdd', b'Dequantize']:
i.attr['fused_ops'].list.s == [b'BiasAdd', b'Sum', b'Relu', b'Requantize']:
found_conv_fusion = True
break
self.assertEqual(found_conv_fusion, True)
Expand Down