post-rebase import conflicts

Author: calad0i

hls4ml/backends/fpga/fpga_backend.py

@@ -32,13 +32,16 @@
     SeparableConv1D,
     SeparableConv2D,
     SimpleRNN,
+    Softmax,
 )
 from hls4ml.model.optimizer import model_optimizer
 from hls4ml.model.types import (
     ExponentPrecisionType,
     FixedPrecisionType,
     IntegerPrecisionType,
     PrecisionType,
+    RoundingMode,
+    SaturationMode,
     UnspecifiedPrecisionType,
     XnorPrecisionType,
 )

hls4ml/converters/keras_v3/core.py

@@ -208,7 +208,7 @@ def handle(
 
 
 @register
-class KV3NoOp(KerasV3LayerHandler):
+class NoOp(KerasV3LayerHandler):
     handles = (
         'keras.src.layers.preprocessing.image_preprocessing.random_brightness.RandomBrightness',
         'keras.src.layers.preprocessing.image_preprocessing.random_color_degeneration.RandomColorDegeneration',

hls4ml/converters/keras_v3/hgq2/_base.py

@@ -1,12 +1,14 @@
+from collections.abc import Sequence
 from math import prod
-from typing import TYPE_CHECKING, Any, Sequence
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 
 from hls4ml.converters.keras_v3._base import KerasV3LayerHandler, register
-from hls4ml.converters.keras_v3.conv import KV3ConvHandler
-from hls4ml.converters.keras_v3.core import KV3ActivationHandler, KV3DenseHandler, KV3MergeHandler
-from hls4ml.converters.keras_v3.einsum_dense import KV3EinsumDenseHandler
+from hls4ml.converters.keras_v3.conv import ConvHandler
+from hls4ml.converters.keras_v3.core import ActivationHandler, DenseHandler
+from hls4ml.converters.keras_v3.einsum_dense import EinsumDenseHandler
+from hls4ml.converters.keras_v3.merge import MergeHandler
 
 if TYPE_CHECKING:
     import hgq
@@ -107,7 +109,7 @@ def load_weight(self, layer: 'Layer', key: str):
 
 
 @register
-class SQEinsumDenseHandler(SQLayerHandler, KV3EinsumDenseHandler):
+class SQEinsumDenseHandler(SQLayerHandler, EinsumDenseHandler):
     handles = (
         'hgq.layers.core.einsum_dense.QEinsumDense',
         'hgq.layers.einsum_dense_batchnorm.QEinsumDenseBatchnorm',
@@ -130,7 +132,7 @@ def handle(
 
 
 @register
-class SQConvHandler(SQLayerHandler, KV3ConvHandler):
+class SQConvHandler(SQLayerHandler, ConvHandler):
     handles = (
         'hgq.layers.conv.QConv1D',
         'hgq.layers.conv.QConv2D',
@@ -156,7 +158,7 @@ def handle(
 
 
 @register
-class SQDenseHandler(SQLayerHandler, KV3DenseHandler):
+class SQDenseHandler(SQLayerHandler, DenseHandler):
     handles = ('hgq.layers.core.dense.QDense', 'hgq.layers.core.dense.QBatchNormDense')
 
     def handle(
@@ -175,7 +177,7 @@ def handle(
 
 
 @register
-class SQActivationHandler(SQLayerHandler, KV3ActivationHandler):
+class SQActivationHandler(SQLayerHandler, ActivationHandler):
     handles = ('hgq.layers.activation.QActivation',)
 
 
@@ -206,7 +208,7 @@ def handle(
 
 
 @register
-class SQMergeHandler(SQLayerHandler, KV3MergeHandler):
+class SQMergeHandler(SQLayerHandler, MergeHandler):
     handles = (
         'hgq.layers.ops.merge.QAdd',
         'hgq.layers.ops.merge.QSubtract',

hls4ml/model/layers.py

@@ -3,7 +3,6 @@
 
 import numpy as np
 
-from hls4ml.model import ModelGraph
 from hls4ml.model.attributes import (
     Attribute,
     AttributeDict,
@@ -31,7 +30,6 @@
     find_minimum_width,
 )
 from hls4ml.utils import attribute_descriptions as descriptions
-from hls4ml.utils.einsum_utils import parse_einsum
 from hls4ml.utils.string_utils import convert_to_snake_case
 
 if typing.TYPE_CHECKING:
@@ -1005,29 +1003,6 @@ def initialize(self):
 
 
 class Softmax(Activation):
-    _expected_attributes = [
-        Attribute('n_in'),
-        Attribute('activation', value_type=str),
-        ChoiceAttribute('implementation', ['latency', 'stable', 'argmax', 'legacy'], default='stable'),
-        ConfigurableAttribute('skip', value_type=bool, default=False),
-        TypeAttribute(
-            'exp_table',
-            default=FixedPrecisionType(18, 8, rounding_mode=RoundingMode.RND, saturation_mode=SaturationMode.SAT),
-        ),
-        TypeAttribute(
-            'inv_table',
-            default=FixedPrecisionType(18, 8, rounding_mode=RoundingMode.RND, saturation_mode=SaturationMode.SAT),
-        ),
-        TypeAttribute(
-            'inv_inp',
-            default=FixedPrecisionType(18, 8, rounding_mode=RoundingMode.RND, saturation_mode=SaturationMode.SAT),
-        ),
-        TypeAttribute(
-            'accum',
-            default=FixedPrecisionType(18, 8, rounding_mode=RoundingMode.RND, saturation_mode=SaturationMode.SAT),
-        ),
-    ]
-
     def initialize(self):
         super().initialize()