fix up automatic precision inferrence

Author: jmitrevs

hls4ml/model/optimizer/passes/infer_precision.py

@@ -49,7 +49,10 @@ def _infer_precision(self, node, types_to_infer):
         if node_class in ['Conv1D', 'Conv2D', 'PointwiseConv1D', 'PointwiseConv2D', 'Conv2DBatchnorm']:
             return self._infer_conv_precision(node, types_to_infer)
 
-        if node_class in ['SeparableConv1D', 'SeparableConv2D', 'DepthwiseConv2D']:
+        if node_class in ['DepthwiseConv1D', 'DepthwiseConv2D']:
+            return self._infer_depthconv_precision(node, types_to_infer)
+
+        if node_class in ['SeparableConv1D', 'SeparableConv2D']:
             return self._infer_sepconv_precision(node, types_to_infer)
 
         if node_class in ['Pooling1D', 'Pooling2D']:
@@ -166,6 +169,10 @@ def _infer_conv_precision(self, node, types_to_infer):
         n_ops = node.get_attr('n_chan') * node.get_attr('filt_height', 1) * node.get_attr('filt_width')
         return self._infer_common_precision(node, types_to_infer, n_ops)
 
+    def _infer_depthconv_precision(self, node, types_to_infer):
+        n_ops = node.get_attr('filt_height', 1) * node.get_attr('filt_width')
+        return self._infer_common_precision(node, types_to_infer, n_ops)
+
     def _infer_sepconv_precision(self, node, types_to_infer):
         inferred_types = []
 

hls4ml/model/optimizer/passes/seperable_to_dw_conv.py

@@ -71,7 +71,7 @@ def transform(self, model, node):
             model.config.parse_name_config(dw_name, dw_layer_config)
 
         # creating the attributes
-        dw_attributes = {k: node.attributes.get(k, None) for k in SeperableToDepthwiseAndConv._dw_attributes}
+        dw_attributes = {k: node.attributes[k] for k in SeperableToDepthwiseAndConv._dw_attributes if k in node.attributes}
 
         dw_attributes['use_bias'] = False
 
@@ -101,7 +101,7 @@ def transform(self, model, node):
             model.config.parse_name_config(pw_name, pw_layer_config)
 
         # creating the attributes
-        pw_attributes = {k: node.attributes.get(k, None) for k in SeperableToDepthwiseAndConv._pw_attributes}
+        pw_attributes = {k: node.attributes[k] for k in SeperableToDepthwiseAndConv._pw_attributes if k in node.attributes}
         pw_attributes['filt_width'] = 1
         pw_attributes['filt_height'] = 1
         pw_attributes['stride_width'] = 1
@@ -111,7 +111,7 @@ def transform(self, model, node):
         pw_attributes['pad_top'] = 0
         pw_attributes['pad_bottom'] = 0
         pw_attributes['in_width'] = pw_attributes['out_width']
-        pw_attributes['in_height'] = pw_attributes['out_height']
+        pw_attributes['in_height'] = pw_attributes.get('out_height', 1)
         pw_attributes['n_chan'] = node.get_attr('n_chan') * node.get_attr('depth_multiplier')
         pw_attributes['weight_data'] = node.get_attr('pointwise_data')
         pw_attributes['weight_quantizer'] = node.get_attr('pointwise_quantizer')