triggerflow 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

triggerflow/core.py

@@ -458,8 +458,7 @@ class TriggerModel:
             )
 
         
-        if shutil.which("vivado") is not None:
-            build_ugt_model(
+        build_ugt_model(
                 templates_dir=self.subsystem_cfg.get("templates_dir", Path("templates")),
                 firmware_dir=self.workspace_manager.workspace / "firmware",
                 compiler = self.compiler,
@@ -478,12 +477,7 @@ class TriggerModel:
                 object_features=self.subsystem_cfg.get("object_features"),
                 global_features=self.subsystem_cfg.get("global_features")
             )
-        else:
-            warnings.warn(
-                "Vivado executable not found on the system PATH. "
-                "Skipping FW build. ",
-                UserWarning
-            )
+  
 
 
         self.workspace_manager.add_artifact("firmware", self.workspace_manager.workspace / "firmware")

triggerflow/interfaces/uGT.py

@@ -1,12 +1,15 @@
 from pathlib import Path
-import shutil
+import shutil, warnings
 import pkg_resources
 from jinja2 import Template
 import re
 
-def _render_template(template_file: str, output_file: Path, context: dict):
-    with open(template_file, "r") as f:
-        template_text = f.read()
+
+def _render_template(template_name: str, output_file: Path, context: dict):
+    template_bytes = pkg_resources.resource_string(
+        "triggerflow" , template_name
+    )
+    template_text = template_bytes.decode('utf-8')
 
     template = Template(template_text)
     rendered = template.render(**context)
@@ -108,20 +111,29 @@ def build_ugt_model(
 
     out_path = firmware_dir / "firmware/model-gt.cpp"
     
-    _render_template(f"{templates_dir}/model-gt.cpp", out_path, context)
+    _render_template("templates/model-gt.cpp", out_path, context)
 
     out_path = firmware_dir / "firmware/build_ugt.tcl"
-    _render_template(f"{templates_dir}/build_ugt.tcl", out_path, context_tcl)
+    _render_template("templates/build_ugt.tcl", out_path, context_tcl)
 
-    shutil.copy(f"{templates_dir}/data_types.h", firmware_dir / "firmware")
- 
-    
-    subprocess.run(
-        ["vitis_hls", "-f", "build_ugt.tcl"],
-        cwd=firmware_dir/"firmware",
-        check=True
+    shutil.copy(
+        pkg_resources.resource_filename("triggerflow", "templates/data_types.h"), 
+        firmware_dir / "firmware"
     )
 
+    if shutil.which("vivado") is not None:
+        subprocess.run(
+            ["vitis_hls", "-f", "build_ugt.tcl"],
+            cwd=firmware_dir/"firmware",
+            check=True
+        )
+    else:
+            warnings.warn(
+                "Vivado executable not found on the system PATH. "
+                "Skipping FW build. ",
+                UserWarning
+            )
+
 
 
 

triggerflow/templates/model_template.cpp

@@ -15,18 +15,18 @@ class {{MODEL_NAME}}_emulator : public hls4mlEmulator::Model {
 private:
     typedef {{UNSCALED_TYPE}} unscaled_t;
     static const int N_INPUT_SIZE = {{N_INPUTS}};
+    static const int N_OUTPUT_SIZE = {{N_OUTPUTS}};
 
     unscaled_t _unscaled_input[N_INPUT_SIZE];
-    {{MODEL_NAME}}::input_t _scaled_input;
-    {{MODEL_NAME}}::result_t _result;
+    {{MODEL_NAME}}::input_t _scaled_input[N_INPUT_SIZE];
+    {{MODEL_NAME}}::result_t _result[N_OUTPUT_SIZE];
 
-    // Scale the raw input array to the model input type
-    virtual void _scaleNNInputs(unscaled_t unscaled[N_INPUT_SIZE], {{MODEL_NAME}}::input_t &scaled)
+    virtual void _scaleNNInputs(unscaled_t unscaled[N_INPUT_SIZE], {{MODEL_NAME}}::input_t scaled[N_INPUT_SIZE])
     {
         for (int i = 0; i < N_INPUT_SIZE; i++)
         {
             unscaled_t tmp0 = unscaled[i] - hls4ml_{{MODEL_NAME}}::ad_offsets[i];
-            {{UNSCALED_TYPE}} tmp1 = tmp0 >> hls4ml_{{MODEL_NAME}}::ad_shift[i];
+            {{MODEL_NAME}}::input_t tmp1 = tmp0 >> hls4ml_{{MODEL_NAME}}::ad_shift[i];
             scaled[i] = tmp1;
         }
     }
@@ -41,13 +41,14 @@ public:
     }
 
     virtual void predict() {
-        // Call the io_parallel model function; pass pointers
-        {{MODEL_NAME}}::{{MODEL_NAME}}_project(&_scaled_input, &_result);
+        {{MODEL_NAME}}::{{MODEL_NAME}}_project(_scaled_input, _result);
     }
 
     virtual void read_result(std::any result) {
         {{MODEL_NAME}}::result_t *result_p = std::any_cast<{{MODEL_NAME}}::result_t*>(result);
-        *result_p = _result;
+        for (int i = 0; i < N_OUTPUT_SIZE; i++) {
+            result_p[i] = _result[i];
+        }
     }
 };
 
@@ -57,4 +58,4 @@ extern "C" hls4mlEmulator::Model* create_model() {
 
 extern "C" void destroy_model(hls4mlEmulator::Model* m) {
     delete m;
-}
+}

{triggerflow-0.2.4.dist-info → triggerflow-0.2.6.dist-info}/METADATA

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

{triggerflow-0.2.4.dist-info → triggerflow-0.2.6.dist-info}/RECORD

@@ -6,10 +6,10 @@ 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=QMU_zuWrYXuZekB7z8Q90Cuaga3B_uuDnYOPthQGdps,22465
+triggerflow/core.py,sha256=WlIYCKzd2NQJlr8Rw2t9zFvvNPZUlWMEIgkU-ov2E3E,22228
 triggerflow/mlflow_wrapper.py,sha256=yCaIS-H7oC2KxnExj24ka9ylF4A1wgzRIpc7Y43ervI,10667
 triggerflow/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-triggerflow/interfaces/uGT.py,sha256=UBCK0WtF-MUkI9mWrulOdExtDXgwKPsHDS4C-FXIgMs,3637
+triggerflow/interfaces/uGT.py,sha256=aPIYorMrISie1-BSUr-ywWF5AvHruGhGx4ibg21sCMs,4014
 triggerflow/starter/.gitignore,sha256=tH2z_M-tPM9MLWC2wPz1Z43Dq-wdVmb_kVYtrLT3tN4,2052
 triggerflow/starter/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 triggerflow/starter/cookiecutter.json,sha256=neplzXvVe3g6OVqYD8M2olfmjRKNr1UKqmflzP3j1UY,259
@@ -93,10 +93,10 @@ triggerflow/templates/data_types.h,sha256=m7_jLsRixSVjp8auxHZUUNAcSO777C5TTZl__9
 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_template.cpp,sha256=jMNRcO7NgC6I9Wd2BV3Bim-P1qPsAl_oeVQ8KofQGEw,1807
+triggerflow/templates/model_template.cpp,sha256=FrZ3Dw229UnCrOUGddlbA4cKfkMeRz6N_iiulM86WWY,1854
 triggerflow/templates/scales.h,sha256=MFcB5S0DEvfzHuUhyZqILR0O4ktugOG-fLnuCDUUewM,373
-triggerflow-0.2.4.dist-info/METADATA,sha256=wa26vICKVPibMc7wxqLiJiwn-apZoMxBxAFqKDGA-II,5535
-triggerflow-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-triggerflow-0.2.4.dist-info/entry_points.txt,sha256=5QSV9YDseB_FqgVh9q10BdL4b1I6t68rGwPLXgVL60g,53
-triggerflow-0.2.4.dist-info/top_level.txt,sha256=cX0jkuM9tfxGp002ZBQ1AYgx-6D_NgBtomgPL0WA9bE,43
-triggerflow-0.2.4.dist-info/RECORD,,
+triggerflow-0.2.6.dist-info/METADATA,sha256=T0U9b15Ix3bY5Y-MXPX9QY05JcUMKpVf2plxeIQwtMo,5535
+triggerflow-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+triggerflow-0.2.6.dist-info/entry_points.txt,sha256=5QSV9YDseB_FqgVh9q10BdL4b1I6t68rGwPLXgVL60g,53
+triggerflow-0.2.6.dist-info/top_level.txt,sha256=cX0jkuM9tfxGp002ZBQ1AYgx-6D_NgBtomgPL0WA9bE,43
+triggerflow-0.2.6.dist-info/RECORD,,