Skip to content

Commit 6189953

Browse files
jmitrevsjmitrevs
authored
Merge branch 'main' into qonnx-1p0
2 parents de790ca + 5c0c4e6 commit 6189953

File tree

15 files changed

+196
-267
lines changed

15 files changed

+196
-267
lines changed

‎Jenkinsfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pipeline {
22
agent {
33
docker {
4-
image 'vivado-el7:3'
4+
image 'vivado-alma9:1'
55
args '-v /data/Xilinx:/data/Xilinx'
66
}
77
}
@@ -14,8 +14,9 @@ pipeline {
1414
steps {
1515
dir(path: 'test') {
1616
sh '''#!/bin/bash --login
17-
conda activate hls4ml-py38
18-
pip install tensorflow pyparsing
17+
conda activate hls4ml-py310
18+
conda install -y jupyterhub pydot graphviz pytest pytest-cov
19+
pip install pytest-randomly jupyter onnx>=1.4.0 matplotlib pandas seaborn pydigitalwavetools==1.1 pyyaml tensorflow==2.14 qonnx torch git+https://github.com/google/qkeras.git pyparsing
1920
pip install -U ../ --user
2021
./convert-keras-models.sh -x -f keras-models.txt
2122
pip uninstall hls4ml -y'''

‎hls4ml/backends/quartus/quartus_backend.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def init_conv1d(self, layer):
274274
# - combination - at compile-time, the decision between Winograd and im2col is made
275275
# - im2col - specifically use im2col
276276
# - Winograd - use Winograd, if possible
277-
layer.set_attr('implementation', layer.model.config.get_layer_config_value(layer, 'Implementation', 'combination'))
277+
layer.set_attr('implementation', layer.model.config.get_layer_config_value(layer, 'Implementation', 'im2col'))
278278

279279
layer.set_attr(
280280
'n_partitions', 1
@@ -305,7 +305,7 @@ def init_conv2d(self, layer):
305305
# - combination - at compile-time, the decision between Winograd and im2col is made
306306
# - im2col - specifically use im2col
307307
# - Winograd - use Winograd, if possible
308-
layer.set_attr('implementation', layer.model.config.get_layer_config_value(layer, 'Implementation', 'combination'))
308+
layer.set_attr('implementation', layer.model.config.get_layer_config_value(layer, 'Implementation', 'im2col'))
309309

310310
layer.set_attr(
311311
'n_partitions', 1

‎hls4ml/backends/vivado/vivado_backend.py‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
Embedding,
1919
GarNet,
2020
GarNetStack,
21-
GlobalPooling1D,
22-
GlobalPooling2D,
2321
Layer,
2422
Pooling1D,
2523
Pooling2D,
@@ -31,7 +29,6 @@
3129
from hls4ml.model.optimizer import get_backend_passes, layer_optimizer
3230
from hls4ml.model.types import FixedPrecisionType, IntegerPrecisionType, NamedType, PackedType
3331
from hls4ml.report import parse_vivado_report
34-
from hls4ml.utils.fixed_point_utils import ceil_log2
3532

3633

3734
class VivadoBackend(FPGABackend):
@@ -413,37 +410,14 @@ def init_depconv2d(self, layer):
413410

414411
layer.set_attr('implementation', layer.model.config.get_conv_implementation(layer).lower())
415412

416-
def _set_pooling_accum_t(self, layer, pool_size):
417-
extra_bits = ceil_log2(pool_size)
418-
accum_t = layer.get_attr('accum_t')
419-
accum_t.precision.width += extra_bits * 2
420-
if isinstance(accum_t.precision, FixedPrecisionType):
421-
accum_t.precision.integer += extra_bits
422-
423413
@layer_optimizer(Pooling1D)
424414
def init_pooling1d(self, layer):
425-
pool_size = layer.get_attr('pool_width')
426-
self._set_pooling_accum_t(layer, pool_size)
427-
428415
layer.set_attr('implementation', layer.model.config.get_conv_implementation(layer).lower())
429416

430417
@layer_optimizer(Pooling2D)
431418
def init_pooling2d(self, layer):
432-
pool_size = layer.get_attr('pool_height') * layer.get_attr('pool_width')
433-
self._set_pooling_accum_t(layer, pool_size)
434-
435419
layer.set_attr('implementation', layer.model.config.get_conv_implementation(layer).lower())
436420

437-
@layer_optimizer(GlobalPooling1D)
438-
def init_global_pooling1d(self, layer):
439-
pool_size = layer.get_attr('n_in')
440-
self._set_pooling_accum_t(layer, pool_size)
441-
442-
@layer_optimizer(GlobalPooling2D)
443-
def init_global_pooling2d(self, layer):
444-
pool_size = layer.get_attr('in_height') * layer.get_attr('in_width')
445-
self._set_pooling_accum_t(layer, pool_size)
446-
447421
@layer_optimizer(Softmax)
448422
def init_softmax(self, layer):
449423
if layer.model.config.get_config_value('IOType') == 'io_parallel':

‎hls4ml/converters/keras/qkeras.py‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010

1111
def get_quantizer_from_config(keras_layer, quantizer_var):
12-
quantizer_config = keras_layer['config'][f'{quantizer_var}_quantizer']
12+
quantizer_config = keras_layer['config'].get(f'{quantizer_var}_quantizer', None)
13+
if quantizer_config is None:
14+
return None # No quantizer specified in the layer
1315
if keras_layer['class_name'] == 'QBatchNormalization':
1416
return QKerasQuantizer(quantizer_config)
1517
elif 'binary' in quantizer_config['class_name']:
@@ -25,10 +27,7 @@ def parse_qdense_layer(keras_layer, input_names, input_shapes, data_reader):
2527
layer, output_shape = parse_dense_layer(keras_layer, input_names, input_shapes, data_reader)
2628

2729
layer['weight_quantizer'] = get_quantizer_from_config(keras_layer, 'kernel')
28-
if keras_layer['config']['bias_quantizer'] is not None:
29-
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
30-
else:
31-
layer['bias_quantizer'] = None
30+
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
3231

3332
return layer, output_shape
3433

@@ -43,10 +42,7 @@ def parse_qconv_layer(keras_layer, input_names, input_shapes, data_reader):
4342
layer, output_shape = parse_conv2d_layer(keras_layer, input_names, input_shapes, data_reader)
4443

4544
layer['weight_quantizer'] = get_quantizer_from_config(keras_layer, 'kernel')
46-
if keras_layer['config']['bias_quantizer'] is not None:
47-
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
48-
else:
49-
layer['bias_quantizer'] = None
45+
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
5046

5147
return layer, output_shape
5248

@@ -56,11 +52,7 @@ def parse_qdepthwiseqconv_layer(keras_layer, input_names, input_shapes, data_rea
5652
layer, output_shape = parse_conv2d_layer(keras_layer, input_names, input_shapes, data_reader)
5753

5854
layer['depthwise_quantizer'] = get_quantizer_from_config(keras_layer, 'depthwise')
59-
60-
if keras_layer['config']['bias_quantizer'] is not None:
61-
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
62-
else:
63-
layer['bias_quantizer'] = None
55+
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
6456

6557
return layer, output_shape
6658

@@ -76,11 +68,7 @@ def parse_qsepconv_layer(keras_layer, input_names, input_shapes, data_reader):
7668

7769
layer['depthwise_quantizer'] = get_quantizer_from_config(keras_layer, 'depthwise')
7870
layer['pointwise_quantizer'] = get_quantizer_from_config(keras_layer, 'pointwise')
79-
80-
if keras_layer['config']['bias_quantizer'] is not None:
81-
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
82-
else:
83-
layer['bias_quantizer'] = None
71+
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
8472

8573
return layer, output_shape
8674

@@ -93,11 +81,7 @@ def parse_qrnn_layer(keras_layer, input_names, input_shapes, data_reader):
9381

9482
layer['weight_quantizer'] = get_quantizer_from_config(keras_layer, 'kernel')
9583
layer['recurrent_quantizer'] = get_quantizer_from_config(keras_layer, 'recurrent')
96-
97-
if keras_layer['config']['bias_quantizer'] is not None:
98-
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
99-
else:
100-
layer['bias_quantizer'] = None
84+
layer['bias_quantizer'] = get_quantizer_from_config(keras_layer, 'bias')
10185

10286
return layer, output_shape
10387

‎hls4ml/templates/quartus/firmware/nnet_utils/nnet_conv1d_resource.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "nnet_common.h"
55
#include "nnet_dense.h"
6+
#include <cstdint>
67

78
namespace nnet {
89

‎hls4ml/templates/quartus/firmware/nnet_utils/nnet_conv2d_resource.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "nnet_common.h"
77
#include "nnet_dense.h"
88
#include "nnet_helpers.h"
9+
#include <cstdint>
910

1011
namespace nnet {
1112

0 commit comments

Comments
 (0)