triggerflow 0.2.8__py3-none-any.whl → 0.3.0__py3-none-any.whl

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.dist-info → triggerflow-0.3.0.dist-info}/METADATA

@@ -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.dist-info → triggerflow-0.3.0.dist-info}/RECORD

@@ -6,7 +6,7 @@ trigger_loader/loader.py,sha256=wMkeZ3k36wpxt-B8OpKOa6j7z0-fnJUqQ-5AbVjNpBM,5158
 trigger_loader/processor.py,sha256=cvBfYmvcr4FLzOHgGE50oy7EkFzFaV80Z_66amqfsEY,7724
 triggerflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 triggerflow/cli.py,sha256=ZNQb3XQN8Ir6Hp6KX_ugec9bm2kqxLNZ0KdVGJmnqFA,4498
-triggerflow/core.py,sha256=WlIYCKzd2NQJlr8Rw2t9zFvvNPZUlWMEIgkU-ov2E3E,22228
+triggerflow/core.py,sha256=yWu3Jt3M71u6BVg0lyu9OywONOlKBOJKBpbRQxGX-oM,22770
 triggerflow/mlflow_wrapper.py,sha256=yCaIS-H7oC2KxnExj24ka9ylF4A1wgzRIpc7Y43ervI,10667
 triggerflow/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 triggerflow/interfaces/uGT.py,sha256=aPIYorMrISie1-BSUr-ywWF5AvHruGhGx4ibg21sCMs,4014
@@ -95,8 +95,8 @@ triggerflow/templates/makefile_version,sha256=6kFc_u2oiM9l2rH7RK_BLzdZu1ZEK8PQTQ
 triggerflow/templates/model-gt.cpp,sha256=zceVNNIvHx0EK1SoyBglC-1mR_l8q-HrSCFx9-lKE0I,2974
 triggerflow/templates/model_template.cpp,sha256=Uh80AwDAcFlseonEwV7_HqD85ALs0IPG5JfVT204d5k,1887
 triggerflow/templates/scales.h,sha256=MFcB5S0DEvfzHuUhyZqILR0O4ktugOG-fLnuCDUUewM,373
-triggerflow-0.2.8.dist-info/METADATA,sha256=2qmDnjUtNSN8MCMKqfUcvmATeGw-920S-QTOpH9w66g,5535
-triggerflow-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-triggerflow-0.2.8.dist-info/entry_points.txt,sha256=5QSV9YDseB_FqgVh9q10BdL4b1I6t68rGwPLXgVL60g,53
-triggerflow-0.2.8.dist-info/top_level.txt,sha256=cX0jkuM9tfxGp002ZBQ1AYgx-6D_NgBtomgPL0WA9bE,43
-triggerflow-0.2.8.dist-info/RECORD,,
+triggerflow-0.3.0.dist-info/METADATA,sha256=rlA9NvP6ZqVwrKqu7X2NA0OllTvO-V5om9YW-fUMsPM,5535
+triggerflow-0.3.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+triggerflow-0.3.0.dist-info/entry_points.txt,sha256=5QSV9YDseB_FqgVh9q10BdL4b1I6t68rGwPLXgVL60g,53
+triggerflow-0.3.0.dist-info/top_level.txt,sha256=cX0jkuM9tfxGp002ZBQ1AYgx-6D_NgBtomgPL0WA9bE,43
+triggerflow-0.3.0.dist-info/RECORD,,

{triggerflow-0.2.8.dist-info → triggerflow-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any