triggerflow 0.3.4__tar.gz → 0.3.6__tar.gz

{triggerflow-0.3.4/src/triggerflow.egg-info → triggerflow-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.3.4
+Version: 0.3.6
 Summary: Utilities for ML models targeting hardware triggers
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{triggerflow-0.3.4 → triggerflow-0.3.6}/pyproject.toml

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

{triggerflow-0.3.4 → triggerflow-0.3.6}/src/triggerflow/core.py

@@ -10,6 +10,7 @@ import shutil, warnings
 import importlib.resources as pkg_resources
 import triggerflow.templates 
 from importlib import import_module
+from datetime import datetime
 
 
 class ModelConverter(ABC):
@@ -265,21 +266,19 @@ class WorkspaceManager:
     def __init__(self):
         self.workspace = self.BASE_WORKSPACE
         self.artifacts = {"firmware": None}
-        self.metadata = {
-            "name": None,
-            "ml_backend": None,
-            "compiler": None,
-            "versions": []
-        }
+        self.metadata = {}
     
-    def setup_workspace(self, name: str, ml_backend: str, compiler: str):
-        """Initialize workspace and metadata"""
+    def setup_workspace(self, config: Dict):
+        """Initialize workspace and save metadata"""
         self.workspace.mkdir(parents=True, exist_ok=True)
-        self.metadata.update({
-            "name": name,
-            "ml_backend": ml_backend,
-            "compiler": compiler,
-        })
+        
+        # Store config + timestamp as metadata
+        self.metadata = {
+            "config": config,
+            "created_at": datetime.now().isoformat()
+        }
+        
+        self.save_metadata()
     
     def save_native_model(self, model, ml_backend: str):
         """Save the native model to workspace"""
@@ -292,18 +291,10 @@ class WorkspaceManager:
         """Add artifact to tracking"""
         self.artifacts[key] = value
     
-    def add_version(self, version_info: Dict):
-        """Add version information"""
-        self.metadata["versions"].append(version_info)
-    
     def save_metadata(self):
         """Save metadata to file"""
         with open(self.workspace / "metadata.json", "w") as f:
-            json.dump({
-                "name": self.metadata["name"],
-                "ml_backend": self.metadata["ml_backend"],
-                "compiler": self.metadata["compiler"],
-            }, f, indent=2)
+            json.dump(self.metadata, f, indent=2)
 
 
 class ModelSerializer:
@@ -394,6 +385,7 @@ class TriggerModel:
 
         self.native_model = native_model
         self.scales = scales
+        self.config = config  # Store the full config
 
         self.compiler_cfg  = config.get("compiler", {})
         self.subsystem_cfg = config.get("subsystem", {})
@@ -418,13 +410,8 @@ class TriggerModel:
         self.model_qonnx = None
         self.input_name = None
         
-        
-        self.workspace_manager.setup_workspace(
-            self.name, 
-            self.ml_backend, 
-            self.compiler
-        )
-    
+        self.workspace_manager.setup_workspace(self.config)
+
     @property
     def workspace(self) -> Path:
         """Get workspace path"""
@@ -457,7 +444,6 @@ class TriggerModel:
             qonnx_path, self.model_qonnx = conversion_result
             self.input_name = self.model_qonnx.graph.input[0].name
             self.workspace_manager.add_artifact("qonnx", qonnx_path)
-            self.workspace_manager.add_version({"qonnx": str(qonnx_path)})
 
         
         # Compile model

{triggerflow-0.3.4 → triggerflow-0.3.6}/src/triggerflow/templates/model_template.cpp

@@ -15,16 +15,23 @@ private:
     static const int N_INPUT_SIZE  = {{N_INPUTS}};
     static const int N_OUTPUT_SIZE = {{N_OUTPUTS}};
 
+    // Use input_layer_t if it exists, otherwise fall back to input_t
+    #ifdef input_layer_t
+        typedef input_layer_t scaled_input_t;
+    #else
+        typedef input_t scaled_input_t;
+    #endif
+
     unscaled_t _unscaled_input[N_INPUT_SIZE];
-    input_t  _scaled_input[N_INPUT_SIZE];
+    scaled_input_t _scaled_input[N_INPUT_SIZE];
     result_t _result[N_OUTPUT_SIZE];
 
     virtual void _scaleNNInputs(unscaled_t unscaled[N_INPUT_SIZE],
-                                input_t scaled[N_INPUT_SIZE])
+                                scaled_input_t scaled[N_INPUT_SIZE])
     {
         for (int i = 0; i < N_INPUT_SIZE; i++) {
             unscaled_t tmp0 = unscaled[i] - ad_offsets[i];
-            input_t tmp1 = tmp0 >> ad_shift[i];
+            scaled_input_t tmp1 = tmp0 >> ad_shift[i];
             scaled[i] = tmp1;
         }
     }
@@ -60,4 +67,4 @@ extern "C" hls4mlEmulator::Model* create_model() {
 
 extern "C" void destroy_model(hls4mlEmulator::Model* m) {
     delete m;
-}
+}

{triggerflow-0.3.4 → triggerflow-0.3.6}/src/triggerflow/templates/scales.h

@@ -3,7 +3,7 @@
 
 #include "NN/{{MODEL_NAME}}_project.h"
 
-namespace hls4ml_{{MODEL_NAME}} {
+namespace {{NAMESPACE}} {
 
 typedef ap_fixed<5,5> ad_shift_t;
 typedef ap_fixed<10,10> ad_offset_t;
@@ -16,5 +16,5 @@ const ad_offset_t ad_offsets[{{N_INPUTS}}] = {
     {{AD_OFFSETS}}
 };
 
-} // namespace hls4ml_{{MODEL_NAME}}
+} // namespace {{NAMESPACE}}
 #endif

{triggerflow-0.3.4 → triggerflow-0.3.6/src/triggerflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.3.4
+Version: 0.3.6
 Summary: Utilities for ML models targeting hardware triggers
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown