triggerflow 0.2.7__tar.gz → 0.2.9__tar.gz

{triggerflow-0.2.7/src/triggerflow.egg-info → triggerflow-0.2.9}/PKG-INFO

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

{triggerflow-0.2.7 → triggerflow-0.2.9}/pyproject.toml

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

{triggerflow-0.2.7 → triggerflow-0.2.9}/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():

{triggerflow-0.2.7 → triggerflow-0.2.9}/src/triggerflow/templates/model-gt.cpp

@@ -59,21 +59,10 @@ void {{MODEL_NAME}}_GT(
     input_t input_scaled[{{N_INPUTS}}];
     int idx = 0;
 
-    // Muons
-    for (int i = 0; i < {{MUON_SIZE}}; i++) {
-        #pragma HLS unroll
-        {% for f in MUON_FEATURES %}
-        input_unscaled[idx++] = muons[i].{{f}};
-        {% endfor %}
-    }
-
-    // Jets
-    for (int i = 0; i < {{JET_SIZE}}; i++) {
-        #pragma HLS unroll
-        {% for f in JET_FEATURES %}
-        input_unscaled[idx++] = jets[i].{{f}};
-        {% endfor %}
-    }
+    // Scalars / global objects FIRST
+    {% for f in GLOBAL_FEATURES %}
+    input_unscaled[idx++] = {{f}};
+    {% endfor %}
 
     // EGammas
     for (int i = 0; i < {{EGAMMA_SIZE}}; i++) {
@@ -83,6 +72,14 @@ void {{MODEL_NAME}}_GT(
         {% endfor %}
     }
 
+    // Muons
+    for (int i = 0; i < {{MUON_SIZE}}; i++) {
+        #pragma HLS unroll
+        {% for f in MUON_FEATURES %}
+        input_unscaled[idx++] = muons[i].{{f}};
+        {% endfor %}
+    }
+
     // Taus
     for (int i = 0; i < {{TAU_SIZE}}; i++) {
         #pragma HLS unroll
@@ -91,14 +88,17 @@ void {{MODEL_NAME}}_GT(
         {% endfor %}
     }
 
-    // Scalars / global objects
-    {% for f in GLOBAL_FEATURES %}
-    input_unscaled[idx++] = {{f}};
-    {% endfor %}
+    // Jets
+    for (int i = 0; i < {{JET_SIZE}}; i++) {
+        #pragma HLS unroll
+        {% for f in JET_FEATURES %}
+        input_unscaled[idx++] = jets[i].{{f}};
+        {% endfor %}
+    }
 
     scaleNNInputs(input_unscaled, input_scaled);
 
     {{MODEL_NAME}}_project(input_scaled, {{OUT}});
 }
 
-} // namespace {{MODEL_NAME}}
+} // namespace {{MODEL_NAME}}

{triggerflow-0.2.7 → triggerflow-0.2.9/src/triggerflow.egg-info}/PKG-INFO

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