triggerflow 0.3.1__tar.gz → 0.3.3__tar.gz

{triggerflow-0.3.1 → triggerflow-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.3.1
+Version: 0.3.3
 Summary: Utilities for ML models targeting hardware triggers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: cookiecutter>=2.3
 Requires-Dist: PyYAML>=6
 Requires-Dist: Jinja2>=3
-Requires-Dist: mlflow>=2.0
+Requires-Dist: mlflow==2.21.0
 Requires-Dist: kedro==1.0.0
 Provides-Extra: dev
 Requires-Dist: pytest-cov~=3.0; extra == "dev"

{triggerflow-0.3.1 → triggerflow-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "triggerflow"
-version = "0.3.1"
+version = "0.3.3"
 description = "Utilities for ML models targeting hardware triggers"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ dependencies = [
     "cookiecutter>=2.3",
     "PyYAML>=6",
     "Jinja2>=3",
-    "mlflow>=2.0",
+    "mlflow==2.21.0",
     "kedro==1.0.0"
 ]
 classifiers = [

{triggerflow-0.3.1 → triggerflow-0.3.3}/src/triggerflow/core.py

@@ -105,7 +105,6 @@ class HLS4MLStrategy(CompilerStrategy):
         )
 
         firmware_model.compile()
-        firmware_model.save(workspace / "firmware_model.fml")
         return firmware_model
 
         
@@ -356,7 +355,15 @@ class ModelSerializer:
                 tf_keras = importlib.import_module("keras.models")
             except ModuleNotFoundError:
                 tf_keras = importlib.import_module("tensorflow.keras.models")
-            return tf_keras.load_model(workspace / "keras_model")
+            try:
+                return tf_keras.load_model(workspace / "keras_model.h5")
+            except:
+                try:
+                    from qkeras.utils import _add_supported_quantized_objects
+                    co = {}; _add_supported_quantized_objects(co)
+                    return tf_keras.load_model(workspace / "keras_model.h5", custom_objects=co)
+                except:
+                    print("Native model could not be loaded")
         elif ml_backend == "xgboost":
             import xgboost as xgb
             model = xgb.Booster()

{triggerflow-0.3.1 → triggerflow-0.3.3}/src/triggerflow/interfaces/uGT.py

@@ -74,7 +74,7 @@ def build_ugt_model(
     else:
         header_content = header_path.read_text(encoding='utf-8')
         layer_pattern = re.compile(
-            r'result_t\s+(\w+)\[\d+\]\s*\)', 
+            r'result_t\s+(\w+)\[[\w\d_]+\]', 
             re.DOTALL
         )
         match = layer_pattern.search(header_content)

{triggerflow-0.3.1 → triggerflow-0.3.3}/src/triggerflow/mlflow_wrapper.py

@@ -260,10 +260,9 @@ def load_model(model_uri: str) -> mlflow.pyfunc.PyFuncModel:
 
 def load_full_model(model_uri: str) -> TriggerModel:
     local_path = mlflow.artifacts.download_artifacts(model_uri)
-    archive_path = Path(local_path) / "triggerflow" / "triggermodel.tar.xz"
+    archive_path = Path(local_path) / "artifacts" / "triggermodel.tar.xz"
     return TriggerModel.load(archive_path)
 
-
 def get_model_info(model_uri: str) -> dict[str, Any]:
     model = mlflow.pyfunc.load_model(model_uri)
     if hasattr(model._model_impl, "get_model_info"):

{triggerflow-0.3.1 → triggerflow-0.3.3}/src/triggerflow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.3.1
+Version: 0.3.3
 Summary: Utilities for ML models targeting hardware triggers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: cookiecutter>=2.3
 Requires-Dist: PyYAML>=6
 Requires-Dist: Jinja2>=3
-Requires-Dist: mlflow>=2.0
+Requires-Dist: mlflow==2.21.0
 Requires-Dist: kedro==1.0.0
 Provides-Extra: dev
 Requires-Dist: pytest-cov~=3.0; extra == "dev"

{triggerflow-0.3.1 → triggerflow-0.3.3}/src/triggerflow.egg-info/requires.txt

@@ -1,7 +1,7 @@
 cookiecutter>=2.3
 PyYAML>=6
 Jinja2>=3
-mlflow>=2.0
+mlflow==2.21.0
 kedro==1.0.0
 
 [dev]