Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable exception proc_map, working with dataclasses, etc. #372

Merged
merged 4 commits into from
Sep 27, 2022
Merged

Enable exception proc_map, working with dataclasses, etc. #372

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60a2d94
Enable exception proc_map, working with dataclasses, etc.
GaboFGuerra Sep 26, 2022
e4fa910
Merge branch 'main' into optimization_features
mgkwill Sep 26, 2022
2200599
Merge branch 'main' into optimization_features
mgkwill Sep 27, 2022
e5cc75f
Fix lint issue and check if run_cfg has exception model map
joyeshmishra Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/lava/magma/compiler/compiler_graphs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ def _find_proc_models(proc: AbstractProcess) \
if not proc_module.__name__ == "__main__":
# Get the parent module.
module_spec = importlib.util.find_spec(proc_module.__name__)
if module_spec.parent:
if module_spec.parent != '':
parent_module = importlib.import_module(module_spec.parent)

# Get all the modules inside the parent (namespace) module.
Expand Down Expand Up @@ -992,16 +992,20 @@ def _map_proc_to_model(procs: ty.List[AbstractProcess],
proc_map = OrderedDict()
for proc in procs:
# Select a specific ProcessModel
models_cls = ProcGroupDiGraphs._find_proc_models(proc=proc)
model_cls = \
ProcGroupDiGraphs._select_proc_models(
proc, models_cls, run_cfg)
if proc in run_cfg.exception_proc_model_map:
model_cls = run_cfg.exception_proc_model_map[proc]
else:
models_cls = ProcGroupDiGraphs._find_proc_models(proc=proc)
model_cls = ProcGroupDiGraphs._select_proc_models(proc,
models_cls,
run_cfg)
if issubclass(model_cls, AbstractSubProcessModel):
# Recursively substitute SubProcModel by sub processes
sub_map = ProcGroupDiGraphs._expand_sub_proc_model(model_cls,
proc,
run_cfg)
proc_map.update(sub_map)
proc._model_class = model_cls
else:
# Just map current Process to selected ProcessModel
proc_map[proc] = model_cls
Expand Down
9 changes: 8 additions & 1 deletion src/lava/magma/core/model/sub/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from lava.magma.core.model.model import AbstractProcessModel
from lava.magma.core.process.process import AbstractProcess
from dataclasses import is_dataclass, fields


class AbstractSubProcessModel(AbstractProcessModel):
Expand Down Expand Up @@ -58,6 +59,12 @@ def find_sub_procs(self) -> ty.Dict[str, AbstractProcess]:
procs = OrderedDict()
for attr_name in dir(self):
attr = getattr(self, attr_name)
if isinstance(attr, AbstractProcess):
if isinstance(attr, AbstractProcess) and \
not attr is self.implements_process:
procs[attr_name] = attr
if is_dataclass(attr):
for data in fields(attr):
sub_attr = getattr(attr, data.name)
if isinstance(sub_attr, AbstractProcess):
procs[type(sub_attr).__name__] = sub_attr
return procs