Merge branch 'main' into quartus_streaming_conv

Author: vloncar

hls4ml/backends/vivado/vivado_backend.py

@@ -14,6 +14,7 @@
 from hls4ml.backends import FPGABackend
 from hls4ml.backends.fpga.fpga_types import APTypeConverter, HLSTypeConverter, VivadoArrayVariableConverter
 from hls4ml.report import parse_vivado_report
+from hls4ml.utils.fixed_point_utils import ceil_log2
 
 class VivadoBackend(FPGABackend):
     def __init__(self):
@@ -129,7 +130,7 @@ def build(self, model, reset=False, csim=True, synth=True, cosim=False, validati
 
     def _validate_conv_strategy(self, layer):
         if layer.model.config.model_strategy.lower() != 'resource':
-            print('WARNING: Cannot use "Latency" model strategy for {} layer. Switching to "Resource" strategy.')
+            print(f'WARNING: Cannot use "Latency" model strategy for {layer.name} layer. Switching to "Resource" strategy.')
             layer.model.config.model_strategy = 'Resource'
 
     @layer_optimizer(Layer)
@@ -251,6 +252,36 @@ def init_depconv2d(self, layer):
         layer.set_attr('n_partitions', 1) #TODO Once we have SeparableConv implementation for io_parallel this should be set properly
         layer.set_attr('implementation', layer.model.config.get_conv_implementation(layer).lower())
 
+    def _set_pooling_accum_t(self, layer, pool_size):
+        extra_bits = ceil_log2(pool_size)
+        accum_t = layer.get_attr('accum_t')
+        accum_t.precision.fractional += extra_bits
+        accum_t.precision.integer += extra_bits
+
+    @layer_optimizer(Pooling1D)
+    def init_pooling1d(self, layer):
+        pool_size = layer.get_attr('pool_width')
+        self._set_pooling_accum_t(layer, pool_size)
+
+        layer.set_attr('implementation', layer.model.config.get_conv_implementation(layer).lower())
+
+    @layer_optimizer(Pooling2D)
+    def init_pooling2d(self, layer):
+        pool_size = layer.get_attr('pool_height') * layer.get_attr('pool_width')
+        self._set_pooling_accum_t(layer, pool_size)
+
+        layer.set_attr('implementation', layer.model.config.get_conv_implementation(layer).lower())
+
+    @layer_optimizer(GlobalPooling1D)
+    def init_global_pooling1d(self, layer):
+        pool_size = layer.get_attr('n_in')
+        self._set_pooling_accum_t(layer, pool_size)
+
+    @layer_optimizer(GlobalPooling2D)
+    def init_global_pooling2d(self, layer):
+        pool_size = layer.get_attr('in_height') * layer.get_attr('in_width')
+        self._set_pooling_accum_t(layer, pool_size)
+
     @layer_optimizer(Activation)
     def init_activation(self, layer):
         if 'table_t' not in layer.attributes:

hls4ml/model/layers.py

@@ -573,7 +573,6 @@ def initialize(self):
             dims = ['N_FILT_{}'.format(self.index), 'N_OUTPUTS_{}'.format(self.index)]
         self.add_output_variable(shape, dims)
         self.set_attr('pool_op', self.get_attr('class_name').split('Pooling')[0])
-        self.set_attr('implementation', self.model.config.get_conv_implementation(self).lower())
 
 class Pooling2D(Layer):
     _expected_attributes = [
@@ -607,7 +606,6 @@ def initialize(self):
             dims = ['N_FILT_{}'.format(self.index), 'OUT_HEIGHT_{}'.format(self.index), 'OUT_WIDTH_{}'.format(self.index)]
         self.add_output_variable(shape, dims)
         self.set_attr('pool_op', self.get_attr('class_name').split('Pooling')[0])
-        self.set_attr('implementation', self.model.config.get_conv_implementation(self).lower())
 
 class GlobalPooling1D(Layer):
     _expected_attributes = [

hls4ml/templates/vivado/nnet_utils/nnet_pooling_stream.h

@@ -169,7 +169,7 @@ void compute_pool_buffer_2d(
     static int sX = 0; // stride X
     static int sY = 0; // stride Y
 
-    typename data_T::value_type pool_window[CONFIG_T::pool_height * CONFIG_T::pool_width];
+    typename CONFIG_T::accum_t pool_window[CONFIG_T::pool_height * CONFIG_T::pool_width];
     #pragma HLS ARRAY_PARTITION variable=pool_window complete
 
     static typename data_T::value_type kernel_data[CONFIG_T::pool_height * CONFIG_T::pool_width * CONFIG_T::n_filt];
@@ -192,7 +192,7 @@ void compute_pool_buffer_2d(
             }
 
             // Compute Pooling
-            res_pack[i_ic] = reduce_pool<typename data_T::value_type, CONFIG_T::pool_height * CONFIG_T::pool_width, CONFIG_T>(pool_window);
+            res_pack[i_ic] = reduce_pool<typename CONFIG_T::accum_t, CONFIG_T::pool_height * CONFIG_T::pool_width, CONFIG_T>(pool_window);
         }
 
         // Write to output
@@ -378,7 +378,7 @@ void compute_pool_buffer_1d(
     static int pX = 0;
     static int sX = 0;
 
-    typename data_T::value_type pool_window[CONFIG_T::pool_width];
+    typename CONFIG_T::accum_t pool_window[CONFIG_T::pool_width];
     #pragma HLS ARRAY_PARTITION variable=pool_window complete
 
     static typename data_T::value_type kernel_data[CONFIG_T::pool_width * CONFIG_T::n_filt];
@@ -402,7 +402,7 @@ void compute_pool_buffer_1d(
             }
 
             // Compute Pooling
-            res_pack[i_ic] = reduce_pool<typename data_T::value_type, CONFIG_T::pool_width, CONFIG_T>(pool_window);
+            res_pack[i_ic] = reduce_pool<typename CONFIG_T::accum_t, CONFIG_T::pool_width, CONFIG_T>(pool_window);
         }
 
         // Write to output

test/pytest/test_cnn_mnist.py

@@ -57,7 +57,7 @@ def keras_model(mnist_data):
 def test_mnist_cnn(keras_model, mnist_data, backend, io_type, strategy):
   x_train, y_train, x_test, y_test = mnist_data
 
-  hls_config = hls4ml.utils.config_from_keras_model(keras_model, granularity='name', default_precision='ap_fixed<32, 9>')     
+  hls_config = hls4ml.utils.config_from_keras_model(keras_model, granularity='name')     
   hls_config['Model']['Strategy'] = strategy
   hls_config['LayerName']['softmax']['Strategy'] = 'Stable'
   output_dir = str(test_root_path / 'hls4mlprj_cnn_mnist_{}_{}_{}'.format(backend, io_type, strategy))