mlonmcu 0.6.dev0__tar.gz → 0.7.dev0__tar.gz

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlonmcu
-Version: 0.6.dev0
+Version: 0.7.dev0
 Summary: This project contains research code related to the deployment of inferenceor learning applications on tiny micro-controllers.
 Home-page: https://github.com/tum-ei-eda/mlonmcu
 Author: TUM Department of Electrical and Computer Engineering - Chair of Electronic Design Automation

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/artifact.py

@@ -121,7 +121,21 @@ class Artifact:
         else:
             raise NotImplementedError
 
-    def export(self, dest, extract=False):
+    def cache(self):
+        raise NotImplementedError
+
+    def uncache(self):
+        assert self.path is not None, "Can only uncache artifacts written to disk"
+        assert self.path.is_file(), f"Missing file: {self.path}"
+        if self.content:
+            self.content = None
+        if self.data:
+            self.data = None
+        if self.raw:
+            self.raw = None
+        # TODO: logging msg
+
+    def export(self, dest, extract=False, skip_exported: bool = True):
         """Export the artifact to a given path (file or directory) and update its path.
 
         Arguments
@@ -138,6 +152,12 @@ class Artifact:
             filename = dest / self.name
         else:
             filename = dest
+        if self.exported and not extract:
+            assert self.path is not None
+            if self.path == filename:
+                if self.path.is_file() or self.path.is_dir():
+                    if skip_exported:
+                        return
         if self.fmt in [ArtifactFormat.TEXT, ArtifactFormat.SOURCE]:
             assert not extract, "extract option is only available for ArtifactFormat.MLF"
             with open(filename, "w", encoding="utf-8") as handle:

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/environment/templates.py

@@ -57,10 +57,29 @@ def fill_template(name, data={}):
     return None
 
 
+def get_ubuntu_version():
+    name = ""
+    if Path("/etc/lsb-release").is_file():
+        with open("/etc/lsb-release", "r") as f:
+            lines = f.read().split("\n")
+        for line in lines:
+            if line.startswith("DISTRIB_RELEASE="):
+                name = line.split("=")[1]
+                if name[0] == '"' and name[-1] == '"':
+                    return name[1:-1]
+                return name
+    return None
+
+
 def fill_environment_yaml(template_name, home_dir, config=None):
     if not config:
         config = {}
-    return fill_template(template_name, {"home_dir": str(home_dir), "config_dir": str(get_config_dir()), **config})
+    ubuntu_version = get_ubuntu_version()
+    defaults = {"home_dir": str(home_dir), "config_dir": str(get_config_dir())}
+    if ubuntu_version is not None:
+        defaults["ubuntu_version"] = ubuntu_version
+    return fill_template(template_name, {**defaults, **config})
+    # return fill_template(template_name, {"home_dir": str(home_dir), "config_dir": str(get_config_dir()), **config})
 
 
 def write_environment_yaml_from_template(path, template_name, home_dir, config=None):

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/feature/feature.py

@@ -48,7 +48,7 @@ class FeatureBase(ABC):
     @property
     def enabled(self):
         value = self.config["enabled"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     def remove_config_prefix(self, config):  # TODO: move to different place
         def helper(key):

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/feature/features.py

@@ -127,7 +127,7 @@ class Validate(FrontendFeature, PlatformFeature):
     @property
     def allow_missing(self):
         value = self.config["allow_missing"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def fail_on_error(self):
@@ -172,8 +172,7 @@ class Muriscvnn(SetupFeature, FrameworkFeature, PlatformFeature):
         value = self.config["use_vext"]
         if value == "AUTO" or value is None:
             return value
-        if not isinstance(value, (bool, int)):
-            value = str2bool(value)
+        value = str2bool(value)
         return "ON" if value else "OFF"
 
     @property
@@ -181,8 +180,7 @@ class Muriscvnn(SetupFeature, FrameworkFeature, PlatformFeature):
         value = self.config["use_pext"]
         if value == "AUTO" or value is None:
             return value
-        if not isinstance(value, (bool, int)):
-            value = str2bool(value)
+        value = str2bool(value)
         return "ON" if value else "OFF"
 
     def add_framework_config(self, framework, config):
@@ -370,8 +368,7 @@ class MuriscvnnByoc(SetupFeature, BackendFeature, PlatformFeature):
         value = self.config["use_vext"]
         if value == "AUTO" or value is None:
             return value
-        if not isinstance(value, (bool, int)):
-            value = str2bool(value)
+        value = str2bool(value)
         return "ON" if value else "OFF"
 
     @property
@@ -379,8 +376,7 @@ class MuriscvnnByoc(SetupFeature, BackendFeature, PlatformFeature):
         value = self.config["use_pext"]
         if value == "AUTO" or value is None:
             return value
-        if not isinstance(value, (bool, int)):
-            value = str2bool(value)
+        value = str2bool(value)
         return "ON" if value else "OFF"
 
     def add_backend_config(self, backend, config):
@@ -563,22 +559,22 @@ class Bext(SetupFeature, TargetFeature, PlatformFeature):
     @property
     def zba(self):
         value = self.config["zba"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def zbb(self):
         value = self.config["zbb"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def zbc(self):
         value = self.config["zbc"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def zbs(self):
         value = self.config["zbs"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     def get_target_config(self, target):
         return filter_none(
@@ -636,7 +632,7 @@ class GdbServer(TargetFeature):
     @property
     def attach(self):
         value = self.config["attach"]
-        return str2bool(value, allow_none=True) if not isinstance(value, (bool, int)) else value
+        return str2bool(value, allow_none=True)
 
     @property
     def port(self):
@@ -677,7 +673,7 @@ class Trace(TargetFeature):
     @property
     def to_file(self):
         value = self.config["to_file"]
-        return str2bool(value, allow_none=True) if not isinstance(value, (bool, int)) else value
+        return str2bool(value, allow_none=True)
 
     def __init__(self, features=None, config=None):
         super().__init__("trace", features=features, config=config)
@@ -765,7 +761,7 @@ class Usmp(BackendFeature):
     @property
     def use_workspace_io(self):
         value = self.config["use_workspace_io"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     def add_backend_config(self, backend, config):
         assert backend in ["tvmaot"], f"Unsupported feature '{self.name}' for backend '{backend}'"
@@ -1286,7 +1282,7 @@ class CacheSim(TargetFeature):
     @property
     def ic_enable(self):
         value = self.config["ic_enable"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def ic_config(self):
@@ -1295,7 +1291,7 @@ class CacheSim(TargetFeature):
     @property
     def dc_enable(self):
         value = self.config["dc_enable"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def dc_config(self):
@@ -1304,7 +1300,7 @@ class CacheSim(TargetFeature):
     @property
     def l2_enable(self):
         value = self.config["l2_enable"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def l2_config(self):
@@ -1313,12 +1309,12 @@ class CacheSim(TargetFeature):
     @property
     def log_misses(self):
         value = self.config["log_misses"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def detailed(self):
         value = self.config["detailed"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     # def add_target_config(self, target, config, directory=None):
     def add_target_config(self, target, config):
@@ -1373,13 +1369,20 @@ class LogInstructions(TargetFeature):
 
     DEFAULTS = {**FeatureBase.DEFAULTS, "to_file": False}
 
+    OPTIONAL = {"etiss.experimental_print_to_file"}
+
     def __init__(self, features=None, config=None):
         super().__init__("log_instrs", features=features, config=config)
 
     @property
     def to_file(self):
         value = self.config["to_file"]
-        return str2bool(value, allow_none=True) if not isinstance(value, (bool, int)) else value
+        return str2bool(value, allow_none=True)
+
+    @property
+    def etiss_experimental_print_to_file(self):
+        value = self.config["etiss.experimental_print_to_file"]
+        return str2bool(value, allow_none=True)
 
     # def add_target_config(self, target, config, directory=None):
     def add_target_config(self, target, config):
@@ -1399,6 +1402,11 @@ class LogInstructions(TargetFeature):
             plugins_new = config.get("plugins", [])
             plugins_new.append("PrintInstruction")
             config.update({f"{target}.plugins": plugins_new})
+            if self.etiss_experimental_print_to_file:
+                extra_bool_config_new = config.get("extra_bool_config", {})
+                if self.to_file:
+                    extra_bool_config_new["plugin.printinstruction.print_to_file"] = True
+                config.update({f"{target}.extra_bool_config": extra_bool_config_new})
         elif target in ["ovpsim", "corev_ovpsim"]:
             extra_args_new = config.get("extra_args", [])
             extra_args_new.append("--trace")
@@ -1437,18 +1445,21 @@ class LogInstructions(TargetFeature):
                     new_lines = []
                     if self.to_file:
                         if target in ["etiss_pulpino", "etiss"]:
-                            # TODO: update stdout and remove log_instrs lines
-                            instrs = []
-                            for line in stdout.split("\n"):
-                                if target in ["etiss_pulpino", "etiss"]:
-                                    expr = re.compile(r"0x[a-fA-F0-9]+: .* \[.*\]")
-                                match = expr.match(line)
-                                if match is not None:
-                                    instrs.append(line)
-                                else:
-                                    new_lines.append(line)
-                            content = "\n".join(instrs)
-                            stdout = "\n".join(new_lines)
+                            if self.etiss_experimental_print_to_file:
+                                log_file = Path(directory) / "instr_trace.csv"
+                            else:
+                                # TODO: update stdout and remove log_instrs lines
+                                instrs = []
+                                for line in stdout.split("\n"):
+                                    if target in ["etiss_pulpino", "etiss"]:
+                                        expr = re.compile(r"0x[a-fA-F0-9]+: .* \[.*\]")
+                                    match = expr.match(line)
+                                    if match is not None:
+                                        instrs.append(line)
+                                    else:
+                                        new_lines.append(line)
+                                content = "\n".join(instrs)
+                                stdout = "\n".join(new_lines)
                         else:
                             assert target in ["spike", "ovpsim", "corev_ovpsim"]
                             log_file = Path(directory) / "instrs.txt"
@@ -1527,12 +1538,12 @@ class TargetOptimized(RunFeature):
     @property
     def layouts(self):
         value = self.config["layouts"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def schedules(self):
         value = self.config["schedules"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     def __init__(self, features=None, config=None):
         super().__init__("target_optimized", features=features, config=config)
@@ -1571,7 +1582,7 @@ class AutoVectorize(PlatformFeature):
     @property
     def verbose(self):
         value = self.config["verbose"]
-        # return str2bool(value) if not isinstance(value, (bool, int)) else value
+        # return str2bool(value)
         if value is None or not value:
             return "OFF"
         assert isinstance(value, str)
@@ -1582,12 +1593,12 @@ class AutoVectorize(PlatformFeature):
     @property
     def loop(self):
         value = self.config["loop"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def slp(self):
         value = self.config["slp"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def force_vector_width(self):
@@ -1618,7 +1629,7 @@ class AutoVectorize(PlatformFeature):
     @property
     def custom_unroll(self):
         value = self.config["custom_unroll"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     def get_platform_defs(self, platform):
         return {
@@ -1660,7 +1671,7 @@ class Benchmark(PlatformFeature, TargetFeature):
     @property
     def total(self):
         value = self.config["total"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def aggregate(self):
@@ -1848,37 +1859,37 @@ class XCoreV(TargetFeature, PlatformFeature, SetupFeature):
     @property
     def mac(self):
         value = self.config["mac"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def mem(self):
         value = self.config["mem"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def bi(self):
         value = self.config["bi"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def alu(self):
         value = self.config["alu"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def bitmanip(self):
         value = self.config["bitmanip"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def simd(self):
         value = self.config["simd"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def hwlp(self):
         value = self.config["hwlp"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     # def add_target_config(self, target, config, directory=None):
     def add_target_config(self, target, config):
@@ -1940,8 +1951,8 @@ class Xpulp(TargetFeature, PlatformFeature, SetupFeature):
 
     # Default getter functions:
     @staticmethod
-    def generalized_str2bool(input: Union[str, bool, int]) -> bool:
-        return str2bool(input) if isinstance(input, str) else input
+    def generalized_str2bool(inp: Union[str, bool, int]) -> bool:
+        return str2bool(inp)
 
     def getter_bool(self, key_name: Union[str, bool, int]) -> bool:
         return self.generalized_str2bool(self.config[key_name])

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/flow/tflm/backend/tflmc.py

@@ -50,7 +50,7 @@ class TFLMCBackend(TFLMBackend):
     @property
     def print_outputs(self):
         value = self.config["print_outputs"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     def __init__(self, features=None, config=None):
         super().__init__(features=features, config=config)

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/flow/tflm/backend/tflmi.py

@@ -20,7 +20,7 @@ import sys
 from typing import Tuple
 
 from .backend import TFLMBackend
-from mlonmcu.config import str2bool, str2list
+from mlonmcu.config import str2bool, str2list, str2dict
 from mlonmcu.flow.backend import main
 from mlonmcu.artifact import Artifact, ArtifactFormat
 
@@ -435,12 +435,12 @@ class TFLMIBackend(TFLMBackend):
     @property
     def legacy(self):
         value = self.config["legacy"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def debug_arena(self):
         value = self.config["debug_arena"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def arena_size(self):
@@ -449,17 +449,17 @@ class TFLMIBackend(TFLMBackend):
     @property
     def ops(self):
         value = self.config["ops"]
-        return str2list(value) if isinstance(value, str) else value
+        return str2list(value)
 
     @property
     def custom_ops(self):
         value = self.config["custom_ops"]
-        return str2list(value) if isinstance(value, str) else value
+        return str2list(value)
 
     @property
     def registrations(self):
         value = self.config["registrations"]
-        return str2list(value) if isinstance(value, str) else value
+        return str2dict(value)
 
     @property
     def ops_resolver(self):
@@ -468,7 +468,7 @@ class TFLMIBackend(TFLMBackend):
     @property
     def reporter(self):
         value = self.config["reporter"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     def generate(self) -> Tuple[dict, dict]:
         artifacts = []

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/flow/tvm/backend/backend.py

@@ -252,7 +252,7 @@ class TVMBackend(Backend):
     @property
     def use_tuning_results(self):
         value = self.config["use_tuning_results"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def tvmc_extra_args(self):
@@ -265,7 +265,7 @@ class TVMBackend(Backend):
     @property
     def disabled_passes(self):
         value = self.config["disabled_passes"]
-        return str2list(value) if isinstance(value, str) else value
+        return str2list(value)
 
     @property
     def tvm_pythonpath(self):
@@ -286,17 +286,17 @@ class TVMBackend(Backend):
     @property
     def print_outputs(self):
         value = self.config["print_outputs"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def use_tlcpack(self):
         value = self.config["tvm.use_tlcpack"]
-        return str2bool(value, allow_none=True) if not isinstance(value, (bool, int)) else value
+        return str2bool(value, allow_none=True)
 
     @property
     def custom_unroll(self):
         value = self.config["custom_unroll"]
-        return str2bool(value, allow_none=True) if not isinstance(value, (bool, int)) else value
+        return str2bool(value, allow_none=True)
 
     @property
     def dump(self):
@@ -318,7 +318,7 @@ class TVMBackend(Backend):
     @property
     def refresh_model_info(self):
         value = self.config["refresh_model_info"]
-        return str2bool(value, allow_none=True) if not isinstance(value, (bool, int)) else value
+        return str2bool(value, allow_none=True)
 
     @property
     def generate_wrapper(self):

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/flow/tvm/backend/tvmaot.py

@@ -67,12 +67,12 @@ class TVMAOTBackend(TVMBackend):
     @property
     def unpacked_api(self):
         value = self.config["unpacked_api"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def debug_arena(self):
         value = self.config["debug_arena"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
 
     @property
     def alignment_bytes(self):

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/flow/tvm/backend/tvmllvm.py

@@ -42,6 +42,7 @@ class TVMLLVMBackend(TVMBackend):
         **TVMBackend.DEFAULTS,
         "arena_size": 2**20,  # Can not be detemined automatically (Very large)
         "debug_arena": False,
+        "link_params": True,
     }
 
     name = "tvmllvm"
@@ -65,11 +66,18 @@ class TVMLLVMBackend(TVMBackend):
     @property
     def debug_arena(self):
         value = self.config["debug_arena"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
+
+    @property
+    def link_params(self):
+        value = self.config["link_params"]
+        return str2bool(value)
 
     def get_tvmc_compile_args(self, out, dump=None):
         return super().get_tvmc_compile_args(out, dump=dump) + get_tvmrt_tvmc_args(
-            self.runtime, system_lib=self.system_lib
+            self.runtime,
+            system_lib=self.system_lib,
+            link_params=self.link_params,
         )
 
     def get_graph_and_params_from_mlf(self, path):

{mlonmcu-0.6.dev0 → mlonmcu-0.7.dev0}/mlonmcu/flow/tvm/backend/tvmrt.py

@@ -36,6 +36,7 @@ class TVMRTBackend(TVMBackend):
     DEFAULTS = {
         **TVMBackend.DEFAULTS,
         "debug_arena": False,
+        "link_params": True,
         "arena_size": 2**20,  # Can not be detemined automatically (Very large)
         # TODO: arena size warning!
     }
@@ -55,10 +56,15 @@ class TVMRTBackend(TVMBackend):
     @property
     def debug_arena(self):
         value = self.config["debug_arena"]
-        return str2bool(value) if not isinstance(value, (bool, int)) else value
+        return str2bool(value)
+
+    @property
+    def link_params(self):
+        value = self.config["link_params"]
+        return str2bool(value)
 
     def get_tvmc_compile_args(self, out, dump=None):
-        return super().get_tvmc_compile_args(out, dump=dump) + get_tvmrt_tvmc_args(system_lib=self.system_lib)
+        return super().get_tvmc_compile_args(out, dump=dump) + get_tvmrt_tvmc_args(system_lib=self.system_lib, link_params=self.link_params)
 
     def generate(self) -> Tuple[dict, dict]:
         artifacts, metrics = super().generate()