triggerflow 0.2.7__py3-none-any.whl → 0.2.9__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():

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

@@ -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.dist-info → triggerflow-0.2.9.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=LzVEZ5cFe5U8WroDGRC0eetCbMw0xyQlEp-AEFWkTp8,22701
 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
@@ -92,11 +92,11 @@ triggerflow/templates/build_ugt.tcl,sha256=P1y42s9Ju6zDyRskCVlD-vSnblAmTafw7Jpzs
 triggerflow/templates/data_types.h,sha256=m7_jLsRixSVjp8auxHZUUNAcSO777C5TTZl__9ENk90,12640
 triggerflow/templates/makefile,sha256=A-aetsLC51Bop0T_-yPY8Z8Hg29ApN4YPvKx_jjPuHw,970
 triggerflow/templates/makefile_version,sha256=6kFc_u2oiM9l2rH7RK_BLzdZu1ZEK8PQTQKGBLRY0v4,328
-triggerflow/templates/model-gt.cpp,sha256=qZwuTtsvrKB_mOB-HDb2uOD7mDo4-20EjFiQzRjMdPo,2969
+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.7.dist-info/METADATA,sha256=vp6187RdnsGgdanBTqvY6jifqZmOZ8JoN92wGT7tBbM,5535
-triggerflow-0.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-triggerflow-0.2.7.dist-info/entry_points.txt,sha256=5QSV9YDseB_FqgVh9q10BdL4b1I6t68rGwPLXgVL60g,53
-triggerflow-0.2.7.dist-info/top_level.txt,sha256=cX0jkuM9tfxGp002ZBQ1AYgx-6D_NgBtomgPL0WA9bE,43
-triggerflow-0.2.7.dist-info/RECORD,,
+triggerflow-0.2.9.dist-info/METADATA,sha256=gLTU8WCRsolsVdg3hgkjDgq-I5MJTMZXStKXXlffE3w,5535
+triggerflow-0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+triggerflow-0.2.9.dist-info/entry_points.txt,sha256=5QSV9YDseB_FqgVh9q10BdL4b1I6t68rGwPLXgVL60g,53
+triggerflow-0.2.9.dist-info/top_level.txt,sha256=cX0jkuM9tfxGp002ZBQ1AYgx-6D_NgBtomgPL0WA9bE,43
+triggerflow-0.2.9.dist-info/RECORD,,