Browse Source

fix(module): fix module dumped in old version without _short_name attr

GitOrigin-RevId: a1c815f613
tags/v1.8.0
Megvii Engine Team 3 years ago
parent
commit
1d2510b6d7
2 changed files with 7 additions and 3 deletions
  1. +5
    -1
      imperative/python/megengine/module/module.py
  2. +2
    -2
      imperative/python/megengine/traced_module/utils.py

+ 5
- 1
imperative/python/megengine/module/module.py View File

@@ -138,7 +138,11 @@ class Module(metaclass=ABCMeta):
return HookHandler(self._forward_hooks, hook) return HookHandler(self._forward_hooks, hook)


def __call__(self, *inputs, **kwargs): def __call__(self, *inputs, **kwargs):
AutoNaming.push_scope(self.name if self.name is not None else self._short_name)
AutoNaming.push_scope(
self.name
if self.name is not None
else (self._short_name if hasattr(self, "_short_name") else self._name)
)
for hook in self._forward_pre_hooks.values(): for hook in self._forward_pre_hooks.values():
modified_inputs = hook(self, inputs) modified_inputs = hook(self, inputs)
if modified_inputs is not None: if modified_inputs is not None:


+ 2
- 2
imperative/python/megengine/traced_module/utils.py View File

@@ -222,7 +222,7 @@ class _ModuleList(Module, MutableSequence):
def __setattr__(self, key, value): def __setattr__(self, key, value):
# clear mod name to avoid warning in Module's setattr # clear mod name to avoid warning in Module's setattr
if isinstance(value, Module): if isinstance(value, Module):
value._name = None
value._short_name = None
super().__setattr__(key, value) super().__setattr__(key, value)


def __setitem__(self, idx: int, mod: Module): def __setitem__(self, idx: int, mod: Module):
@@ -291,7 +291,7 @@ class _ModuleDict(Module, MutableMapping):
def __setattr__(self, key, value): def __setattr__(self, key, value):
# clear mod name to avoid warning in Module's setattr # clear mod name to avoid warning in Module's setattr
if isinstance(value, Module): if isinstance(value, Module):
value._name = None
value._short_name = None
super().__setattr__(key, value) super().__setattr__(key, value)


def __setitem__(self, key, value): def __setitem__(self, key, value):


Loading…
Cancel
Save