triggerflow 0.2.8__tar.gz → 0.3.0__tar.gz

{triggerflow-0.2.8/src/triggerflow.egg-info → triggerflow-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.2.8
+Version: 0.3.0
 Summary: Utilities for ML models targeting hardware triggers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{triggerflow-0.2.8 → triggerflow-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "triggerflow"
-version = "0.2.8"
+version = "0.3.0"
 description = "Utilities for ML models targeting hardware triggers"
 readme = "README.md"
 requires-python = ">=3.11"

{triggerflow-0.2.8 → triggerflow-0.3.0}/src/triggerflow/core.py

@@ -87,6 +87,15 @@ class HLS4MLStrategy(CompilerStrategy):
         for key in ["project_name", "namespace", "io_type", "backend", "write_weights_txt"]:
             if key in config:
                 hls_kwargs[key] = config[key]
+        
+        if config and "Model" in config:
+            for key, value in config["Model"].items():
+                if isinstance(value, dict):
+                    for layer, layer_config in value.items():
+                        if layer in hls_config["LayerName"]:
+                            hls_config["LayerName"][layer][key] = layer_config
+                else:
+                    hls_config["Model"][key] = value
 
         firmware_model = hls4ml.converters.convert_from_keras_model(
             model,
@@ -123,6 +132,7 @@ class ConiferStrategy(CompilerStrategy):
         cfg['ProjectName'] = config['project_name']
         cfg['XilinxPart'] = config['fpga_part']
         cfg['ClockPeriod'] = config['clock_period']
+        cfg['Precision'] = config['Precision']
 
         if config:
             for key, value in config.items():
@@ -222,9 +232,10 @@ class ConverterFactory:
     @staticmethod
     def create_converter(ml_backend: str, compiler: str) -> ModelConverter:
         if ml_backend.lower() == "keras" and compiler.lower() == "hls4ml":
-            return KerasToQONNXConverter()
-        else:
-            return NoOpConverter()
+            import keras
+            if not keras.__version__.startswith("3"):
+                return KerasToQONNXConverter()
+        return NoOpConverter()
 
 
 class CompilerFactory:
@@ -274,7 +285,7 @@ class WorkspaceManager:
     def save_native_model(self, model, ml_backend: str):
         """Save the native model to workspace"""
         if ml_backend.lower() == "keras":
-            model.save(self.workspace / "keras_model")
+            model.save(self.workspace / "keras_model.h5")
         elif ml_backend.lower() == "xgboost":
             model.save_model(str(self.workspace / "xgb_model.json"))
     
@@ -599,4 +610,4 @@ class TriggerModel:
         obj.converter = ConverterFactory.create_converter(obj.ml_backend, obj.compiler)
         obj.dataset_object = None 
         
-        return obj
+        return obj

{triggerflow-0.2.8 → triggerflow-0.3.0/src/triggerflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.2.8
+Version: 0.3.0
 Summary: Utilities for ML models targeting hardware triggers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{triggerflow-0.2.8 → triggerflow-0.3.0}/tests/test.py

@@ -1,4 +1,5 @@
 import numpy as np
+import keras
 from keras.layers import Input
 from keras.models import Model
 from qkeras.qlayers import QActivation, QDense