triggerflow 0.2.5__tar.gz → 0.2.7__tar.gz

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

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

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

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

{triggerflow-0.2.5 → triggerflow-0.2.7}/src/triggerflow/templates/model_template.cpp

@@ -2,8 +2,6 @@
 #include "emulator.h"
 #include "NN/nnet_utils/nnet_common.h"
 #include <any>
-#include <array>
-#include <utility>
 #include "ap_fixed.h"
 #include "ap_int.h"
 #include "scales.h"
@@ -14,40 +12,45 @@ 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_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++)
-        {
+        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;
         }
     }
 
 public:
-    virtual void prepare_input(std::any input) {
-        unscaled_t *unscaled_input_p = std::any_cast<unscaled_t*>(input);
+    virtual void prepare_input(std::any input) override {
+        unscaled_t* unscaled_input_p = std::any_cast<unscaled_t*>(input);
+
         for (int i = 0; i < N_INPUT_SIZE; i++) {
             _unscaled_input[i] = unscaled_input_p[i];
         }
+
         _scaleNNInputs(_unscaled_input, _scaled_input);
     }
 
-    virtual void predict() {
-        // Call the io_parallel model function; pass pointers
-        {{MODEL_NAME}}::{{MODEL_NAME}}_project(&_scaled_input, &_result);
+    virtual void predict() override {
+        {{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;
+    virtual void read_result(std::any result) override {
+        {{MODEL_NAME}}::result_t* result_p =
+            std::any_cast<{{MODEL_NAME}}::result_t*>(result);
+
+        for (int i = 0; i < N_OUTPUT_SIZE; i++) {
+            result_p[i] = _result[i];
+        }
     }
 };
 

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

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