Merge branch 'qonnx-1p0' into qonnx-big-fixes

Author: nghielme

docs/api/configuration.rst

@@ -9,15 +9,18 @@ We currently support two ways of setting hls4ml's model configuration. This page
 
 .. contents:: \
 
+The Python API approach is recommended for most users as there are more utilities to help create the configuration dictionaries.
 
 **NOTE:**
 
 
 *
   One important part of ``hls4ml`` to remember is that the user is responsible for the format of the inputs.  There is no automatic formatting or normalization so this must be done in the training.
 
-*
+..
+  *
   For developers, you might also want to checkout this section: `Detailed configuration in converted hls codes <#detailed-configuration-in-converted-hls-codes>`_.
+  *Broken link*
 
 ----
 
@@ -31,11 +34,26 @@ Using hls4ml, you can quickly generate a simple configuration dictionary from a
    import hls4ml
    config = hls4ml.utils.config_from_keras_model(model, granularity='model')
 
-For more advanced and detailed configuration, you can also set them through the created dictionary. For example, to change the reuse factor:
+This python dictionary can be edited as needed. A more advanced configuration can be generated by, for example:
+
+.. code-block:: python
+
+   import hls4ml
+   config = hls4ml.utils.config_from_keras_model(
+        model,
+        granularity='name',
+        default_precision='fixed<16,6>',
+        backend='Vitis')
+
+This will include per-layer configuration based on the model. Including the backend is recommended because some configation options depend on the backend. Note, the precisions at the
+higher granularites usually default to 'auto', which means that ``hls4ml`` will try to set it automatically. Note that higher granularity settings take precendence
+over model-level settings. See :py:class:`~hls4ml.utils.config.config_from_keras_model` for more information on the various options.
+
+One can override specific values before using the configuration:
 
 .. code-block:: python
 
-   config['Model']['ReuseFactor'] = 2
+   config['LayerName']['fc1']['ReuseFactor'] = 2
 
 Or to set the precision of a specific layer's weight:
 
@@ -45,6 +63,20 @@ Or to set the precision of a specific layer's weight:
 
 To better understand how the configuration hierachy works, refer to the next section for more details.
 
+Finally, one then uses the configuration to create an hls model:
+
+.. code-block:: python
+
+  hls_model = hls4ml.converters.convert_from_keras_model(
+        model,
+        hls_config=config,
+        output_dir="my_project_dir",
+        io_type='io_stream',
+        backend='Vitis'
+    )
+
+See :py:class:`~hls4ml.converters.convert_from_keras_model` for more information on the various options.
+
 ----
 
 2. YAML Configuration file

docs/setup.rst

@@ -57,7 +57,7 @@ To run FPGA synthesis, installation of following tools is required:
 
 * Xilinx Vivado HLS 2018.2 to 2020.1 for synthesis for Xilinx FPGAs
 
-  * Vitis HLS 2022.1 or newer is required for synthesis for Xilinx FPGAs using the experimental ``Vitis`` backend.
+  * Vitis HLS 2022.2 or newer is required for synthesis for Xilinx FPGAs using the ``Vitis`` backend.
 
 * Intel Quartus 20.1 to 21.4 for the synthesis for Intel FPGAs
 

docs/status.rst

@@ -81,7 +81,7 @@ Other feature notes:
 * ``hls4ml`` is tested on Linux, and supports
    * Vivado HLS versions 2018.2 to 2020.1
    * Intel HLS versions 20.1 to 21.4
-   * Vitis HLS versions 2020.2 to 2022.2 (experimentally)
+   * Vitis HLS versions 2022.2 to 2024.1
 * Windows and macOS are not supported
 * BDT support has moved to the `Conifer <https://github.com/thesps/conifer>`__ package
 

hls4ml/backends/catapult/catapult_backend.py

@@ -110,6 +110,7 @@ def _register_flows(self):
             'catapult:inplace_stream_flatten',
             'catapult:skip_softmax',
             'catapult:fix_softmax_table_size',
+            'infer_precision_types',
         ]
         optimization_flow = register_flow('optimize', optimization_passes, requires=[init_flow], backend=self.name)
 

hls4ml/backends/catapult/passes/conv_same_pad.py

@@ -6,10 +6,8 @@ class InsertZeroPaddingBeforeConv1D(OptimizerPass):
     name = 'insert_zero_padding_before_conv1d'
 
     def match(self, node):
-        is_match = (
-            isinstance(node, (Conv1D, SeparableConv1D))
-            and ((node.get_attr('padding') == 'same') or (node.get_attr('padding') == 'causal'))
-            and node.get_attr('filt_width') != 1
+        is_match = isinstance(node, (Conv1D, SeparableConv1D)) and (
+            (node.get_attr('pad_left') != 0) or (node.get_attr('pad_right') != 0)
         )
         return is_match
 
@@ -37,7 +35,6 @@ def transform(self, model, node):
         }
 
         # Switch Conv1D layer padding to 'valid'
-        node.set_attr('padding', 'valid')
         node.set_attr('pad_left', 0)
         node.set_attr('pad_right', 0)
         node.set_attr('in_width', out_width)
@@ -54,11 +51,11 @@ class InsertZeroPaddingBeforeConv2D(OptimizerPass):
     name = 'insert_zero_padding_before_conv2d'
 
     def match(self, node):
-        is_match = (
-            isinstance(node, (Conv2D, SeparableConv2D))
-            and node.get_attr('padding') == 'same'
-            and node.get_attr('filt_height') != 1
-            and node.get_attr('filt_width') != 1
+        is_match = isinstance(node, (Conv2D, SeparableConv2D)) and (
+            (node.get_attr('pad_left') != 0)
+            or (node.get_attr('pad_right') != 0)
+            or (node.get_attr('pad_top') != 0)
+            or (node.get_attr('pad_bottom') != 0)
         )
         return is_match
 
@@ -93,7 +90,6 @@ def transform(self, model, node):
         }
 
         # Switch Conv2D layer padding to 'valid'
-        node.set_attr('padding', 'valid')
         node.set_attr('pad_top', 0)
         node.set_attr('pad_bottom', 0)
         node.set_attr('pad_left', 0)

hls4ml/backends/vivado/passes/conv_same_pad.py

@@ -6,10 +6,8 @@ class InsertZeroPaddingBeforeConv1D(OptimizerPass):
     name = 'insert_zero_padding_before_conv1d'
 
     def match(self, node):
-        is_match = (
-            isinstance(node, (Conv1D, SeparableConv1D))
-            and ((node.get_attr('padding') == 'same') or (node.get_attr('padding') == 'causal'))
-            and node.get_attr('filt_width') != 1
+        is_match = isinstance(node, (Conv1D, SeparableConv1D)) and (
+            (node.get_attr('pad_left') != 0) or (node.get_attr('pad_right') != 0)
         )
         return is_match
 
@@ -37,7 +35,6 @@ def transform(self, model, node):
         }
 
         # Switch Conv1D layer padding to 'valid'
-        node.set_attr('padding', 'valid')
         node.set_attr('pad_left', 0)
         node.set_attr('pad_right', 0)
         node.set_attr('in_width', out_width)
@@ -54,11 +51,11 @@ class InsertZeroPaddingBeforeConv2D(OptimizerPass):
     name = 'insert_zero_padding_before_conv2d'
 
     def match(self, node):
-        is_match = (
-            isinstance(node, (Conv2D, SeparableConv2D))
-            and node.get_attr('padding') == 'same'
-            and node.get_attr('filt_height') != 1
-            and node.get_attr('filt_width') != 1
+        is_match = isinstance(node, (Conv2D, SeparableConv2D)) and (
+            (node.get_attr('pad_left') != 0)
+            or (node.get_attr('pad_right') != 0)
+            or (node.get_attr('pad_top') != 0)
+            or (node.get_attr('pad_bottom') != 0)
         )
         return is_match
 
@@ -93,7 +90,6 @@ def transform(self, model, node):
         }
 
         # Switch Conv2D layer padding to 'valid'
-        node.set_attr('padding', 'valid')
         node.set_attr('pad_top', 0)
         node.set_attr('pad_bottom', 0)
         node.set_attr('pad_left', 0)

hls4ml/converters/keras/convolution.py

@@ -30,10 +30,9 @@ def parse_conv1d_layer(keras_layer, input_names, input_shapes, data_reader):
         layer['n_filt'] = layer['n_chan'] * layer.get('depth_multiplier')
     layer['filt_width'] = keras_layer['config']['kernel_size'][0]
     layer['stride_width'] = keras_layer['config']['strides'][0]
-    layer['padding'] = keras_layer['config']['padding']
 
     (layer['out_width'], layer['pad_left'], layer['pad_right']) = compute_padding_1d(
-        layer['padding'], layer['in_width'], layer['stride_width'], layer['filt_width']
+        keras_layer['config']['padding'], layer['in_width'], layer['stride_width'], layer['filt_width']
     )
 
     if layer['data_format'] == 'channels_last':
@@ -74,7 +73,6 @@ def parse_conv2d_layer(keras_layer, input_names, input_shapes, data_reader):
     layer['filt_width'] = keras_layer['config']['kernel_size'][1]
     layer['stride_height'] = keras_layer['config']['strides'][0]
     layer['stride_width'] = keras_layer['config']['strides'][1]
-    layer['padding'] = keras_layer['config']['padding']
 
     (
         layer['out_height'],
@@ -84,7 +82,7 @@ def parse_conv2d_layer(keras_layer, input_names, input_shapes, data_reader):
         layer['pad_left'],
         layer['pad_right'],
     ) = compute_padding_2d(
-        layer['padding'],
+        keras_layer['config']['padding'],
         layer['in_height'],
         layer['in_width'],
         layer['stride_height'],

hls4ml/converters/keras/pooling.py

@@ -15,10 +15,9 @@ def parse_pooling_layer(keras_layer, input_names, input_shapes, data_reader):
 
         layer['pool_width'] = keras_layer['config']['pool_size'][0]
         layer['stride_width'] = keras_layer['config']['strides'][0]
-        layer['padding'] = keras_layer['config']['padding']
 
         (layer['n_out'], layer['pad_left'], layer['pad_right']) = compute_padding_1d(
-            layer['padding'], layer['n_in'], layer['stride_width'], layer['pool_width']
+            keras_layer['config']['padding'], layer['n_in'], layer['stride_width'], layer['pool_width']
         )
 
         if layer['data_format'] == 'channels_last':
@@ -32,7 +31,6 @@ def parse_pooling_layer(keras_layer, input_names, input_shapes, data_reader):
         layer['stride_width'] = keras_layer['config']['strides'][1]
         layer['pool_height'] = keras_layer['config']['pool_size'][0]
         layer['pool_width'] = keras_layer['config']['pool_size'][1]
-        layer['padding'] = keras_layer['config']['padding']
 
         (
             layer['out_height'],
@@ -42,7 +40,7 @@ def parse_pooling_layer(keras_layer, input_names, input_shapes, data_reader):
             layer['pad_left'],
             layer['pad_right'],
         ) = compute_padding_2d(
-            layer['padding'],
+            keras_layer['config']['padding'],
             layer['in_height'],
             layer['in_width'],
             layer['stride_height'],

hls4ml/converters/pytorch/convolution.py

@@ -35,11 +35,6 @@ def parse_conv1d_layer(operation, layer_name, input_names, input_shapes, node, c
     else:
         padding = class_object.padding
 
-    if padding == 0:  # No padding, i.e., 'VALID' padding in Keras/Tensorflow
-        layer['padding'] = 'valid'
-    else:  # Only 'valid' and 'same' padding are available in Keras
-        layer['padding'] = 'same'
-
     # Ouput info
     (layer['out_width'], pad_left, pad_right) = compute_padding_1d_pytorch(
         padding, layer['in_width'], layer['stride_width'], layer['filt_width'], layer['dilation']
@@ -84,11 +79,6 @@ def parse_conv2d_layer(operation, layer_name, input_names, input_shapes, node, c
     layer['pad_top'] = layer['pad_bottom'] = class_object.padding[0]
     layer['pad_left'] = layer['pad_right'] = class_object.padding[1]
 
-    if all(x == 0 for x in class_object.padding):  # No padding, i.e., 'VALID' padding in Keras/Tensorflow
-        layer['padding'] = 'valid'
-    else:  # Only 'valid' and 'same' padding are available in Keras
-        layer['padding'] = 'same'
-
     # Ouput info
     (layer['out_height'], layer['out_width'], _, _, _, _) = compute_padding_2d_pytorch(
         class_object.padding,

hls4ml/converters/pytorch/core.py

@@ -43,14 +43,12 @@ def parse_activation_layer(operation, layer_name, input_names, input_shapes, nod
     layer = {}
 
     layer['class_name'] = operation
-    layer['activation'] = layer['class_name']
+    layer['activation'] = layer['class_name'].lower()
     layer['name'] = layer_name
     layer['inputs'] = input_names
 
-    # if layer['class_name'] != 'Activation':
-    #    layer['activation'] = layer['class_name']
     if node.op == 'call_module':
-        if layer['class_name'] == 'ReLU' or layer['class_name'] == 'Sigmoid':
+        if layer['class_name'] in ['ReLU', 'Sigmoid', 'Tanh']:
             layer['class_name'] = 'Activation'
         if layer['class_name'] == 'LeakyReLU':
             layer['activ_param'] = class_object.negative_slope
@@ -68,7 +66,7 @@ def parse_activation_layer(operation, layer_name, input_names, input_shapes, nod
         if hasattr(node, 'dim'):
             layer['axis'] = class_object.dim
     else:
-        if layer['class_name'] == 'ReLU' or layer['class_name'] == 'Sigmoid':
+        if layer['class_name'] in ['ReLU', 'Sigmoid', 'Tanh']:
             layer['class_name'] = 'Activation'
         if layer['class_name'] == 'LeakyReLU':
             layer['activ_param'] = node.kwargs['negative_slope']