mlonmcu 0.7.dev0__tar.gz → 0.8.dev0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlonmcu
-Version: 0.7.dev0
+Version: 0.8.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
@@ -189,7 +189,6 @@ with mlonmcu.context.MlonMcuContext() as context:
 Make sure to first install the additonal set of development Python packages into your virtual environment:
 
 ```
-pip install -r requirements_all.txt  # Install packages for every component (instead of using mlonmcu setup -g)
 pip install -r requirements_dev.txt  # Building distributions and running tests
 pip install -r docs/requirements.txt  # For working with the documentation
 ```

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/README.md

@@ -148,7 +148,6 @@ with mlonmcu.context.MlonMcuContext() as context:
 Make sure to first install the additonal set of development Python packages into your virtual environment:
 
 ```
-pip install -r requirements_all.txt  # Install packages for every component (instead of using mlonmcu setup -g)
 pip install -r requirements_dev.txt  # Building distributions and running tests
 pip install -r docs/requirements.txt  # For working with the documentation
 ```

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/cli/common.py

@@ -167,6 +167,13 @@ def add_flow_options(parser):
         default="",
         help="Label for the session (default: %(default)s)",
     )
+    flow_parser.add_argument(
+        "--dest",
+        type=str,
+        metavar="DEST",
+        default=None,
+        help="Custom destination for session artifacts",
+    )
 
 
 def add_common_options(parser):

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/cli/load.py

@@ -64,7 +64,7 @@ def _handle(args, context):
     config.update(new_config)
     frontends = extract_frontend_names(args, context=context)
     postprocesses = extract_postprocess_names(args, context=context)
-    session = context.get_session(label=args.label, resume=args.resume, config=config)
+    session = context.get_session(label=args.label, resume=args.resume, config=config, dest=args.dest)
     models = apply_modelgroups(args.models, context=context)
     for model in models:
         for f in gen_features:

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/config.py

@@ -18,6 +18,7 @@
 #
 """Collection of utilities to manage MLonMCU configs."""
 import distutils.util
+from typing import List
 import ast
 
 from mlonmcu.feature.type import FeatureType
@@ -244,3 +245,44 @@ def str2list(value, allow_none=False):
     if value.startswith("["):
         return list(ast.literal_eval(value))
     return value.split(",")
+
+
+def pick_first(
+    config: dict, candidates: List[str], allow_empty: bool = False, allow_none: bool = False, allow_fail: bool = False
+):
+    """Find first valid entry in config for given keys.
+
+    Arguments
+    ---------
+    config : dict
+        The configuration data.
+    candidates : List[str]
+        The candidate keys.
+    allow_empty : bool, optional
+        Do not fail an return None if list is empty.
+    allow_none : bool, optional
+        Allow config entries with value None.
+    allow_fail : bool, optional
+        Do not fail if no valiud entry is found.
+
+    Returns
+    -------
+    ret : any
+        The found value in the config dict or None.
+
+    """
+    if len(candidates) == 0:
+        assert allow_empty, "pick_first: got empty list"
+        return None
+    ret = None
+    found = False
+    for candidate in candidates:
+        if candidate in config.keys():
+            val = config[candidate]
+            if val is not None or allow_none:
+                ret = val
+                found = True
+                break
+    if not found:
+        assert allow_fail, f"pick_first: could not find valid candidate in config ({candidates})"
+    return ret

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/context/context.py

@@ -22,7 +22,7 @@ import sys
 import os
 import shutil
 import tempfile
-from typing import List, Union
+from typing import List, Union, Optional
 from pathlib import Path
 import filelock
 
@@ -190,7 +190,7 @@ def load_recent_sessions(env: Environment, count: int = None) -> List[Session]:
             run.archived = True
             run.dir = run_directory
             runs.append(run)
-        session = Session(idx=sid, archived=True, dir=session_directory)
+        session = Session(idx=sid, archived=True, dest=session_directory)
         session.runs = runs
         session.dir = session_directory
         sessions.append(session)
@@ -308,7 +308,7 @@ class MlonMcuContext:
         self.cache = TaskCache()
         self.export_paths = set()
 
-    def create_session(self, label="", config=None):
+    def create_session(self, label="", config=None, dest: Optional[Union[str, Path]] = None):
         try:
             lock = self.latest_session_link_lock.acquire(timeout=10)
         except filelock.Timeout as err:
@@ -323,7 +323,7 @@ class MlonMcuContext:
                 sessions_directory = temp_directory / "sessions"
                 sessions_directory.mkdir(exist_ok=True, parents=True)
                 session_dir = sessions_directory / str(idx)
-                session = Session(idx=idx, label=label, dir=session_dir, config=config)
+                session = Session(idx=idx, label=label, dest=dest if dest is not None else session_dir, config=config)
                 self.sessions.append(session)
                 self.session_idx = idx
                 # TODO: move this to a helper function
@@ -370,7 +370,7 @@ class MlonMcuContext:
                     plugins_dir = self.environment.paths["plugins"].path
                     _load(plugins_dir, hint="Environment")
 
-    def get_session(self, label="", resume=False, config=None) -> Session:
+    def get_session(self, label="", resume=False, config=None, dest=None) -> Session:
         """Get an active session if available, else create a new one.
 
         Returns
@@ -385,8 +385,9 @@ class MlonMcuContext:
             raise NotImplementedError
 
         if self.session_idx < 0 or not self.sessions[-1].active:
-            self.create_session(label=label, config=config)
-        return self.sessions[-1]
+            self.create_session(label=label, config=config, dest=dest)
+        ret = self.sessions[-1]
+        return ret
 
     def __enter__(self):
         logger.debug("Enter MlonMcuContext")

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

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-""" MLonMCU Features API"""
+"""MLonMCU Features API"""
 
 from abc import ABC
 

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

@@ -155,7 +155,9 @@ class Muriscvnn(SetupFeature, FrameworkFeature, PlatformFeature):
     DEFAULTS = {
         **FeatureBase.DEFAULTS,
         "use_vext": "AUTO",
+        "use_portable": "AUTO",
         "use_pext": "AUTO",
+        "use_corev": False,
     }
 
     REQUIRED = {"muriscvnn.src_dir"}
@@ -175,6 +177,14 @@ class Muriscvnn(SetupFeature, FrameworkFeature, PlatformFeature):
         value = str2bool(value)
         return "ON" if value else "OFF"
 
+    @property
+    def use_portable(self):
+        value = self.config["use_portable"]
+        if value == "AUTO" or value is None:
+            return value
+        value = str2bool(value)
+        return "ON" if value else "OFF"
+
     @property
     def use_pext(self):
         value = self.config["use_pext"]
@@ -182,6 +192,12 @@ class Muriscvnn(SetupFeature, FrameworkFeature, PlatformFeature):
             return value
         value = str2bool(value)
         return "ON" if value else "OFF"
+    
+    @property
+    def use_corev(self):
+        value = self.config["use_corev"]
+        value = str2bool(value)
+        return "ON" if value else "OFF"
 
     def add_framework_config(self, framework, config):
         assert framework == "tflm", f"Unsupported feature '{self.name}' for framework '{framework}'"
@@ -198,8 +214,10 @@ class Muriscvnn(SetupFeature, FrameworkFeature, PlatformFeature):
         return {
             "MURISCVNN": self.enabled,
             "MURISCVNN_DIR": self.muriscvnn_dir,
+            "MURISCVNN_PORTABLE": self.use_portable,
             "MURISCVNN_VEXT": self.use_vext,
             "MURISCVNN_PEXT": self.use_pext,
+            "MURISCVNN_COREV": self.use_corev,
         }
 
     def get_required_cache_flags(self):
@@ -339,6 +357,7 @@ class MuriscvnnByoc(SetupFeature, BackendFeature, PlatformFeature):
         "mattr": None,  # for +nodsp, +nomve
         "debug_last_error": False,
         "use_vext": "AUTO",
+        "use_portable": "AUTO",
         "use_pext": "AUTO",
     }
 
@@ -371,6 +390,14 @@ class MuriscvnnByoc(SetupFeature, BackendFeature, PlatformFeature):
         value = str2bool(value)
         return "ON" if value else "OFF"
 
+    @property
+    def use_portable(self):
+        value = self.config["use_portable"]
+        if value == "AUTO" or value is None:
+            return value
+        value = str2bool(value)
+        return "ON" if value else "OFF"
+
     @property
     def use_pext(self):
         value = self.config["use_pext"]
@@ -409,6 +436,7 @@ class MuriscvnnByoc(SetupFeature, BackendFeature, PlatformFeature):
         return {
             "MURISCVNN": self.enabled,
             "MURISCVNN_DIR": self.muriscvnn_dir,
+            "MURISCVNN_PORTABLE": self.use_portable,
             "MURISCVNN_VEXT": self.use_vext,
             "MURISCVNN_PEXT": self.use_pext,
         }
@@ -531,7 +559,11 @@ class Pext(SetupFeature, TargetFeature, PlatformFeature):
             "muriscvnn.lib": ["pext"],
             "tflmc.exe": ["pext"],
             "riscv_gcc.install_dir": ["pext"],
+            "riscv_gcc32.install_dir": ["pext"],
+            "riscv_gcc64.install_dir": ["pext"],
             "riscv_gcc.name": ["pext"],
+            "riscv_gcc32.name": ["pext"],
+            "riscv_gcc64.name": ["pext"],
         }
 
 

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

@@ -64,7 +64,9 @@ class TVMRTBackend(TVMBackend):
         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, link_params=self.link_params)
+        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()

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/models/lookup.py

@@ -55,10 +55,18 @@ def find_metadata(directory, model_name=None):
     return None
 
 
+MODELS_CACHE = {}
+
+
 def list_models(directory, depth=1, formats=None, config=None):  # TODO: get config from environment or cmdline!
     config = config if config is not None else {}
     formats = formats if formats else [ModelFormats.TFLITE]
     assert len(formats) > 0, "No formats provided for model lookup"
+    cache_key = (directory, depth, tuple(formats), tuple(config))  # TODO: hash!
+    if cache_key in MODELS_CACHE:
+        logger.debug("Model cache hit.")
+        return MODELS_CACHE[cache_key]
+    logger.debug("Model cache miss.")
     models = []
     for fmt in formats:
         if depth != 1:
@@ -125,10 +133,19 @@ def list_models(directory, depth=1, formats=None, config=None):  # TODO: get con
                         )
                     )
 
+    MODELS_CACHE[cache_key] = models
     return models
 
 
+MODELGROUPS_CACHE = {}
+
+
 def list_modelgroups(directory):
+    cache_key = (directory,)
+    if cache_key in MODELGROUPS_CACHE:
+        logger.info("Modelgroup cache hit.")
+        return MODELGROUPS_CACHE[cache_key]
+    logger.info("Modelgroup cache miss.")
     if not os.path.isdir(directory):
         logger.debug("Not a directory: %s", str(directory))
         return []
@@ -151,6 +168,7 @@ def list_modelgroups(directory):
                 except yaml.YAMLError as err:
                     raise RuntimeError("Could not open YAML file") from err
             break
+    MODELGROUPS_CACHE[cache_key] = groups
     return groups
 
 

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/models/model.py

@@ -331,7 +331,7 @@ class MathisProgram(Program):
     def size(self):
         value = self.config["size"]
         if isinstance(value, str):
-            value = str(value)
+            value = int(value)
         assert isinstance(value, int)
         assert value > 0
         return value

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/platform/_platform.py

@@ -29,7 +29,7 @@ PLATFORM_REGISTRY = {}
 
 
 def register_platform(platform_name, p, override=False):
-    global PLATFORM_REGISTRY
+    # global PLATFORM_REGISTRY
 
     if platform_name in PLATFORM_REGISTRY and not override:
         raise RuntimeError(f"Platform {platform_name} is already registered")

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/platform/espidf/espidf_target.py

@@ -50,7 +50,7 @@ ESPIDF_PLATFORM_TARGET_REGISTRY = {}
 
 
 def register_espidf_platform_target(target_name, t, override=False):
-    global ESPIDF_PLATFORM_TARGET_REGISTRY
+    # global ESPIDF_PLATFORM_TARGET_REGISTRY
 
     if target_name in ESPIDF_PLATFORM_TARGET_REGISTRY and not override:
         raise RuntimeError(f"ESP-IDF platform target {target_name} is already registered")

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/platform/microtvm/microtvm_backend.py

@@ -32,7 +32,7 @@ MICROTVM_PLATFORM_BACKEND_REGISTRY = {}
 
 
 def register_microtvm_platform_backend(backend_name, b, override=False):
-    global MICROTVM_PLATFORM_BACKEND_REGISTRY
+    # global MICROTVM_PLATFORM_BACKEND_REGISTRY
 
     if backend_name in MICROTVM_PLATFORM_BACKEND_REGISTRY and not override:
         raise RuntimeError(f"TVM platform backend  {backend_name} is already registered")

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/platform/microtvm/microtvm_target.py

@@ -45,7 +45,7 @@ MICROTVM_PLATFORM_TARGET_REGISTRY = {}
 
 
 def register_microtvm_platform_target(target_name, t, override=False):
-    global MICROTVM_PLATFORM_TARGET_REGISTRY
+    # global MICROTVM_PLATFORM_TARGET_REGISTRY
 
     if target_name in MICROTVM_PLATFORM_TARGET_REGISTRY and not override:
         raise RuntimeError(f"MicroTVM platform target {target_name} is already registered")

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/platform/tvm/tvm_backend.py

@@ -27,7 +27,7 @@ TVM_PLATFORM_BACKEND_REGISTRY = {}
 
 
 def register_tvm_platform_backend(backend_name, b, override=False):
-    global TVM_PLATFORM_BACKEND_REGISTRY
+    # global TVM_PLATFORM_BACKEND_REGISTRY
 
     if backend_name in TVM_PLATFORM_BACKEND_REGISTRY and not override:
         raise RuntimeError(f"TVM platform backend  {backend_name} is already registered")

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/platform/tvm/tvm_tune_platform.py

@@ -319,7 +319,8 @@ class TvmTunePlatform(TunePlatform, TvmTargetPlatform):
                         logger.debug(f"Created worker for task {i}")
 
                         def do_work(idx, prepend, task_len):
-                            nonlocal trials_single, trials_global, early_stopping
+                            # nonlocal trials_single, trials_global, early_stopping
+                            nonlocal trials_single, early_stopping
                             t0 = time.time()
                             with tempfile.TemporaryDirectory() as tmp_dir:
                                 out_file = Path(tmp_dir) / "tuning_results.log.txt"

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/session/postprocess/postprocesses.py

@@ -670,7 +670,9 @@ class AnalyseInstructionsPostprocess(RunPostprocess):
                 encodings = []
             if self.sequences:
                 names = []
-            with pd.read_csv(log_artifact.path, sep=":", names=["pc", "rest"], chunksize=2**22) as reader:  # TODO: expose chunksize
+            with pd.read_csv(
+                log_artifact.path, sep=":", names=["pc", "rest"], chunksize=2**22
+            ) as reader:  # TODO: expose chunksize
                 for chunk in reader:
                     df = transform_df(chunk)
 
@@ -1153,7 +1155,7 @@ class AnalyseDumpPostprocess(RunPostprocess):
         dump_artifact = lookup_artifacts(
             artifacts, name="generic_mlonmcu.dump", fmt=ArtifactFormat.TEXT, first_only=True
         )
-        assert len(dump_artifact) == 1, "To use analyse_dump postprocess, please set mlif.enable_asmdump=1"
+        assert len(dump_artifact) == 1, "Dump artifact not found!"
         dump_artifact = dump_artifact[0]
         is_llvm = "llvm" in dump_artifact.flags
         assert is_llvm, "Non-llvm objdump currently unsupported"
@@ -1167,10 +1169,25 @@ class AnalyseDumpPostprocess(RunPostprocess):
                 continue
             insn = splitted[1]
             args = splitted[2]
+            # stop = insn == "cv.lh" and args == "t2, (a0), 0x2"
+            if "seal5." in insn:
+                insn = insn.replace("seal5.", "")
             if "cv." in insn:
                 if "(" in args and ")" in args:
                     m = re.compile(r"(.*)\((.*)\)").match(args)
-                    if m:
+                    m2 = re.compile(r"(.*)\((.*)\),\s*(.*)").match(args)
+                    if m2:
+                        g = m2.groups()
+                        assert len(g) == 3
+                        _, base, offset = g
+                        fmt = "ri"
+                        try:
+                            offset = int(offset)
+                        except ValueError:
+                            fmt = "rr"
+                        insn += f"_{fmt}"
+                        insn += "_inc"
+                    elif m:
                         g = m.groups()
                         assert len(g) == 2
                         offset, base = g
@@ -1180,7 +1197,7 @@ class AnalyseDumpPostprocess(RunPostprocess):
                         except ValueError:
                             fmt = "rr"
                         insn += f"_{fmt}"
-                        if "!" in base:
+                        if "!" in base or ")," in base:
                             insn += "_inc"
             if insn in counts:
                 counts[insn] += 1

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/session/run.py

@@ -495,8 +495,7 @@ class Run:
         if model is None:
             if reasons:
                 logger.error("Lookup of model '%s' was not successfull. Reasons: %s", model_name, reasons)
-            else:
-                raise RuntimeError(f"Model with name '{model_name}' not found.")
+            raise RuntimeError(f"Model with name '{model_name}' not found.")
         self.add_model(model)
 
     def add_frontend_by_name(self, frontend_name, context=None):
@@ -516,12 +515,10 @@ class Run:
             except Exception as e:
                 reasons[name] = str(e)
                 continue
-        assert len(frontends) > 0, "No compatible frontend was found"
         if len(frontends) == 0:
             if reasons:
                 logger.error("Initialization of frontends was no successfull. Reasons: %s", reasons)
-            else:
-                raise RuntimeError("No compatible frontend was found.")
+            raise RuntimeError("No compatible frontend was found.")
         self.add_frontends(frontends)
 
     def add_backend_by_name(self, backend_name, context=None):
@@ -1039,12 +1036,12 @@ class Run:
         self.completed[RunStage.LOAD] = True
         self.unlock()
 
-    def process(self, until=RunStage.RUN, skip=None, export=False):
+    def process(self, until=RunStage.RUN, start=None, skip=None, export=False):
         """Process the run until a given stage."""
         skip = skip if skip is not None else []
         if until == RunStage.DONE:
             until = RunStage.DONE - 1
-        start = self.next_stage  # self.stage hold the max finished stage
+        start = self.next_stage if start is None else start
         if until < start:
             logger.debug("%s Nothing to do", self.prefix)
             return self.get_report()

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/session/session.py

@@ -56,10 +56,10 @@ class Session:
         "report_fmt": "csv",
     }
 
-    def __init__(self, label="", idx=None, archived=False, dir=None, config=None):
+    def __init__(self, label=None, idx=None, archived=False, dest=None, config=None):
         self.timestamp = datetime.now().strftime("%Y%m%dT%H%M%S")
         self.label = (
-            label if len(label) > 0 else ("unnamed" + "_" + self.timestamp)
+            label if isinstance(label, str) and len(label) > 0 else ("unnamed" + "_" + self.timestamp)
         )  # TODO: decide if named sessions should also get a timestamp?
         self.idx = idx
         self.config = config if config else {}
@@ -71,7 +71,7 @@ class Session:
         self.report = None
         self.next_run_idx = 0
         self.archived = archived
-        self.dir = dir
+        self.dir = Path(dest) if dest is not None else None
         self.tempdir = None
         self.session_lock = None
 
@@ -203,6 +203,9 @@ class Session:
         def _process(pbar, run, until, skip):
             """Helper function to invoke the run."""
             run.process(until=until, skip=skip, export=export)
+            if not per_stage and run.has_stage(RunStage.POSTPROCESS) and RunStage.POSTPROCESS not in skip:
+                # run.postprocess()
+                run.process(until=RunStage.POSTPROCESS, start=RunStage.POSTPROCESS, skip=skip, export=export)
             if progress:
                 _update_progress(pbar)
 
@@ -391,13 +394,16 @@ class Session:
         """Open this run."""
         self.status = SessionStatus.OPEN
         self.opened_at = datetime.now()
-        if dir is None:
+        if self.dir is None:
             assert not self.archived
             self.tempdir = tempfile.TemporaryDirectory()
             self.dir = Path(self.tempdir.name)
         else:
             if not self.dir.is_dir():
                 self.dir.mkdir(parents=True)
+        label_file = self.dir / "label.txt"
+        with open(label_file, "w") as f:
+            f.write(self.label)
         self.session_lock = filelock.FileLock(os.path.join(self.dir, ".lock"))
         try:
             self.session_lock.acquire(timeout=10)

{mlonmcu-0.7.dev0 → mlonmcu-0.8.dev0}/mlonmcu/setup/gen_requirements.py

@@ -254,7 +254,7 @@ CONSTRAINTS = [
     ("tornado", None),
     ("typing_extensions", None),
     ("xdg", None),
-    ("xgboost", ">=1.7.0"),
+    ("xgboost", ">=1.7.0,<2.0"),
     ("xlsxwriter", None),
     ("xlwt", None),
 ]