triggerflow 0.2.4__tar.gz → 0.2.6__tar.gz

{triggerflow-0.2.4/src/triggerflow.egg-info → triggerflow-0.2.6}/PKG-INFO

@@ -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 → triggerflow-0.2.6}/pyproject.toml

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

{triggerflow-0.2.4 → triggerflow-0.2.6}/src/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-0.2.4 → triggerflow-0.2.6}/src/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-0.2.4 → triggerflow-0.2.6}/src/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 → triggerflow-0.2.6/src/triggerflow.egg-info}/PKG-INFO

@@ -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