diff --git a/fetch-repos.sh b/fetch-repos.sh
index 53d199d4d4771402962a035b19fa3edc0ba8ee21..86a2176c7549ae1debcae6365137ac30374de7cb 100755
--- a/fetch-repos.sh
+++ b/fetch-repos.sh
@@ -27,7 +27,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-QONNX_COMMIT="dd35a8ff49d7225a07ffceeebe25a6361df48349"
+QONNX_COMMIT="d9ac34c638ccbdcd3b3f5cd236fe76d611b08f6a"
FINN_EXP_COMMIT="0aa7e1c44b20cf085b6fe42cff360f0a832afd2c"
BREVITAS_COMMIT="c65f9c13dc124971f14739349531bbcda5c2a4aa"
PYVERILATOR_COMMIT="766e457465f5c0dd315490d7b9cc5d74f9a76f4f"
diff --git a/src/finn/custom_op/fpgadataflow/addstreams_batch.py b/src/finn/custom_op/fpgadataflow/addstreams_batch.py
index cd0af6b3ab3d8250abbf7d48e004622e55f09f04..af106d9c0698d2d49bbd8f8998f57cad0b2e781e 100644
--- a/src/finn/custom_op/fpgadataflow/addstreams_batch.py
+++ b/src/finn/custom_op/fpgadataflow/addstreams_batch.py
@@ -38,8 +38,8 @@ from finn.util.data_packing import npy_to_rtlsim_input, rtlsim_output_to_npy
class AddStreams_Batch(HLSCustomOp):
"""Class that corresponds to finn-hlslib AddStreams_Batch function."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = super().get_nodeattr_types()
diff --git a/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py b/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py
index 46adca680d3c96695eeb5a91be53ea158fc78f1f..cde66f1ae2cf633ef97ed2715543cfe12253d510 100644
--- a/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py
+++ b/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py
@@ -85,8 +85,8 @@ class ChannelwiseOp_Batch(HLSCustomOp):
including Add, Mul and multi-thresholding.
"""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
self.decoupled_wrapper = templates.decoupled_wrapper
def get_nodeattr_types(self):
diff --git a/src/finn/custom_op/fpgadataflow/checksum.py b/src/finn/custom_op/fpgadataflow/checksum.py
index c927c07df21faf40ccbf9ddbe47e3f2f2ca61c89..99646274fa1bc5b710b23ea42a25d0fed0da529c 100644
--- a/src/finn/custom_op/fpgadataflow/checksum.py
+++ b/src/finn/custom_op/fpgadataflow/checksum.py
@@ -38,8 +38,8 @@ from finn.util.data_packing import npy_to_rtlsim_input, rtlsim_output_to_npy
class CheckSum(HLSCustomOp):
"""Class that corresponds to custom_hls checksum function."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/concat.py b/src/finn/custom_op/fpgadataflow/concat.py
index 4437bcd1984c5194b0a19b43d692babb7e3cd158..8b655b570d0396e253a1c98231702f816072da20 100644
--- a/src/finn/custom_op/fpgadataflow/concat.py
+++ b/src/finn/custom_op/fpgadataflow/concat.py
@@ -39,8 +39,8 @@ class StreamingConcat(HLSCustomOp):
"""Streaming concatenation node with dynamically generated HLS.
Only supports concatenating along the last axis."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py
index 1566445999a2c568b5c5a112d436bf05fd89aca5..6cc9208bb81ff68fe941c8d8d006c65b635eb437 100644
--- a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py
+++ b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py
@@ -54,8 +54,8 @@ class ConvolutionInputGenerator(HLSCustomOp):
attributes (e.g. depthwise or not, whether k % stride is 0) a different
variant will be picked for the actual HLS implementation."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py
index f1c84662cc06e89df5bd7c0762ac47b8c5723502..6e792ca585718ff9690b0a2430fc09ba46e0a2ba 100644
--- a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py
+++ b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py
@@ -59,8 +59,8 @@ class ConvolutionInputGenerator1D(HLSCustomOp):
attributes (e.g. depthwise or not, whether dilation is 0) a different
variant will be picked for the actual HLS implementation."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator_rtl.py b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator_rtl.py
index 1afd23d3a1709a8929a03c21a6eba0a5a8cd6ba6..30861f01351d0f397762c04d3404b69b56e71167 100755
--- a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator_rtl.py
+++ b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator_rtl.py
@@ -60,8 +60,8 @@ class ConvolutionInputGenerator_rtl(HLSCustomOp):
(sliding window) function variants. Generates an RTL ConvolutionInputGenerator
implementation based on (System-)Verilog templates, defined in finn-rtllib/swg."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/downsampler.py b/src/finn/custom_op/fpgadataflow/downsampler.py
index b7efaff440dd5cc2160fbfb8050b30924460ffe6..255606ee7f1998586c2b357904bd32b9a5590c96 100644
--- a/src/finn/custom_op/fpgadataflow/downsampler.py
+++ b/src/finn/custom_op/fpgadataflow/downsampler.py
@@ -39,8 +39,8 @@ class DownSampler(HLSCustomOp):
"""Corresponds to finn-hlslib ConvolutionInputGenerator_*_kernel1 function.
Basically performs a down sampling of the image removing rows and columns."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py b/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py
index 93cde15ca7d42dbed12417837916359fdcc71b67..312f5e7e4a799d75aa0b9b7cd82b83c1b0e51dd9 100644
--- a/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py
+++ b/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py
@@ -38,8 +38,8 @@ from finn.util.data_packing import npy_to_rtlsim_input, rtlsim_output_to_npy
class DuplicateStreams_Batch(HLSCustomOp):
"""Class that corresponds to finn-hlslib function of the same name."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/eltwise.py b/src/finn/custom_op/fpgadataflow/eltwise.py
index 68ed6546c741277bd8e962b6e80eda083cedba9c..c96f12f06bb1104152cecc6f5c6cdf5c0cc215f1 100644
--- a/src/finn/custom_op/fpgadataflow/eltwise.py
+++ b/src/finn/custom_op/fpgadataflow/eltwise.py
@@ -38,8 +38,8 @@ from finn.util.data_packing import npy_to_rtlsim_input, rtlsim_output_to_npy
class StreamingEltwise(HLSCustomOp):
"""Class that corresponds to finn-hlslib StreamingEltwise function."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
diff --git a/src/finn/custom_op/fpgadataflow/fmpadding_batch.py b/src/finn/custom_op/fpgadataflow/fmpadding_batch.py
index dfc55d283fa664e3b60fc7c4d5a056f53a119292..bdb5775c3eea84b09297025501f0116438b09ae7 100644
--- a/src/finn/custom_op/fpgadataflow/fmpadding_batch.py
+++ b/src/finn/custom_op/fpgadataflow/fmpadding_batch.py
@@ -39,8 +39,8 @@ class FMPadding_Batch(HLSCustomOp):
"""Corresponds to finn-hlslib FMPadding_Batch function.
Pads input image by given amount."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/fmpadding_rtl.py b/src/finn/custom_op/fpgadataflow/fmpadding_rtl.py
index 5650d218857a7c7ff86c15ac057c4ebbc18df5ca..9c2750322433627678d098c399b7a932eeac398d 100644
--- a/src/finn/custom_op/fpgadataflow/fmpadding_rtl.py
+++ b/src/finn/custom_op/fpgadataflow/fmpadding_rtl.py
@@ -49,8 +49,8 @@ class FMPadding_rtl(HLSCustomOp):
Supports adjusting the padding amount and spatial feature sizes at
runtime."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py b/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py
index e7fa5bc0048b54a32ebc61482b96009fa019809e..220856922c1ed805ccfa60213dc0cf32f45573a1 100644
--- a/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py
+++ b/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py
@@ -38,8 +38,8 @@ from finn.util.data_packing import npy_to_rtlsim_input, rtlsim_output_to_npy
class GlobalAccPool_Batch(HLSCustomOp):
"""Class that corresponds to finn-hlslib AccPool_Batch function."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/hlscustomop.py b/src/finn/custom_op/fpgadataflow/hlscustomop.py
index d1326607aa0dc5c34eef105b2ceb8ed86c1a0458..d5d0c9ea6e77395d95b2f1a3b2b6ff0412d2a553 100644
--- a/src/finn/custom_op/fpgadataflow/hlscustomop.py
+++ b/src/finn/custom_op/fpgadataflow/hlscustomop.py
@@ -59,8 +59,8 @@ class HLSCustomOp(CustomOp):
custom node should have. Some as abstract methods, these have to be filled
when writing a new fpgadataflow custom op node."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
self.code_gen_dict = {}
diff --git a/src/finn/custom_op/fpgadataflow/iodma.py b/src/finn/custom_op/fpgadataflow/iodma.py
index 65683079fc6a648de31148e398ea498f38b8d3d9..8a756b630ddbd25d5740f0e46297a4ae6f686d2b 100644
--- a/src/finn/custom_op/fpgadataflow/iodma.py
+++ b/src/finn/custom_op/fpgadataflow/iodma.py
@@ -75,8 +75,8 @@ from finn.custom_op.fpgadataflow.hlscustomop import HLSCustomOp
class IODMA(HLSCustomOp):
"""Class that corresponds to finn-hlslib DMA function(s)."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/labelselect_batch.py b/src/finn/custom_op/fpgadataflow/labelselect_batch.py
index 03f89bd7ecac69a9097f4f35c42bd528be709515..492cd0107321f3abbfe02d5e456ee3732da982d0 100644
--- a/src/finn/custom_op/fpgadataflow/labelselect_batch.py
+++ b/src/finn/custom_op/fpgadataflow/labelselect_batch.py
@@ -39,8 +39,8 @@ from finn.util.data_packing import npy_to_rtlsim_input, rtlsim_output_to_npy
class LabelSelect_Batch(HLSCustomOp):
"""Class that corresponds to finn-hlslib LabelSelect_Batch function."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
odt_name = self.get_nodeattr("outputDataType")
if odt_name == "":
# If not provided compute min size
diff --git a/src/finn/custom_op/fpgadataflow/lookup.py b/src/finn/custom_op/fpgadataflow/lookup.py
index fd3e2b5b1cfa74eb4f957df4b568e6c46da47617..ed560ac962477965bae39d296287c09eb077eca0 100644
--- a/src/finn/custom_op/fpgadataflow/lookup.py
+++ b/src/finn/custom_op/fpgadataflow/lookup.py
@@ -44,8 +44,8 @@ from finn.util.data_packing import (
class Lookup(HLSCustomOp):
"Streaming elementwise HLS lookup, mapping indices to values."
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py b/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py
index 72128fda4cfe23db4858fe3ffe80a755733954cc..27c44e3e654f59a81c343d4a4d0e638b621c13e2 100644
--- a/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py
+++ b/src/finn/custom_op/fpgadataflow/matrixvectoractivation.py
@@ -60,8 +60,8 @@ class MatrixVectorActivation(HLSCustomOp):
"""Class that corresponds to finn-hls Matrix_Vector_Activate(_Stream)_Batch
function."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
self.decoupled_wrapper = templates.decoupled_wrapper
def get_nodeattr_types(self):
diff --git a/src/finn/custom_op/fpgadataflow/streamingfifo.py b/src/finn/custom_op/fpgadataflow/streamingfifo.py
index 522305327ff7c5f1356aad4fdf6b9e0a942eca72..34b1940fa1aa8e6c94d1a24cb069eb3d1a432274 100644
--- a/src/finn/custom_op/fpgadataflow/streamingfifo.py
+++ b/src/finn/custom_op/fpgadataflow/streamingfifo.py
@@ -41,8 +41,8 @@ from . import templates
class StreamingFIFO(HLSCustomOp):
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
self.strm_fifo_wrapper = templates.strm_fifo_wrapper
def get_nodeattr_types(self):
diff --git a/src/finn/custom_op/fpgadataflow/thresholding_batch.py b/src/finn/custom_op/fpgadataflow/thresholding_batch.py
index d9745acf63c4685b3369ac379abde0a6c5a3f157..ce8c31ee9a6cf335dadacff95cf3dbd5cd7590f7 100644
--- a/src/finn/custom_op/fpgadataflow/thresholding_batch.py
+++ b/src/finn/custom_op/fpgadataflow/thresholding_batch.py
@@ -57,8 +57,8 @@ from . import templates
class Thresholding_Batch(HLSCustomOp):
"""Class that corresponds to finn-hls Thresholding_Batch function."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
self.decoupled_wrapper = templates.decoupled_wrapper
def get_nodeattr_types(self):
diff --git a/src/finn/custom_op/fpgadataflow/tlastmarker.py b/src/finn/custom_op/fpgadataflow/tlastmarker.py
index 1bd32442a1986d6a86571e85a09322d6c15d8a78..895a2eedab51cee6322c7307ea1944d49a0dade5 100644
--- a/src/finn/custom_op/fpgadataflow/tlastmarker.py
+++ b/src/finn/custom_op/fpgadataflow/tlastmarker.py
@@ -37,8 +37,8 @@ class TLastMarker(HLSCustomOp):
(needed by the FINN PYNQ shell) or at the beginning to remove the end-of-burst
from DMA read."""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/upsampler.py b/src/finn/custom_op/fpgadataflow/upsampler.py
index a018fd35aac4d63b365e97464dab0fd4a5fa13f2..b653b9386e940dd2220fa1fb0d198e63b81a356d 100644
--- a/src/finn/custom_op/fpgadataflow/upsampler.py
+++ b/src/finn/custom_op/fpgadataflow/upsampler.py
@@ -41,8 +41,8 @@ class UpsampleNearestNeighbour_Batch(HLSCustomOp):
The layer expects square feature maps for the in and output.
"""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {
diff --git a/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py b/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py
index d5e29ca22acf89440c3c3a66101bec89d4a66d46..531dc75a5f9bea98dc3419bd5dd7b7f11c949857 100644
--- a/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py
+++ b/src/finn/custom_op/fpgadataflow/vectorvectoractivation.py
@@ -50,8 +50,8 @@ from finn.util.data_packing import (
class VectorVectorActivation(HLSCustomOp):
"""Class that corresponds to finn-hlslib Vector_Vector_Activate_Batch function"""
- def __init__(self, onnx_node):
- super().__init__(onnx_node)
+ def __init__(self, onnx_node, **kwargs):
+ super().__init__(onnx_node, **kwargs)
def get_nodeattr_types(self):
my_attrs = {