Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
2d20f937
MegEngine
项目概览
MegEngine 天元
/
MegEngine
大约 1 年 前同步成功
通知
399
Star
4705
Fork
582
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MegEngine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2d20f937
编写于
11月 15, 2021
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(mge/traced_module): fix merge GetAttr failure when qualname is incorrect
GitOrigin-RevId: 46241e5b4f02ee09dd361c1fe4ea1d85acf49ef9
上级
e6c271ae
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
16 deletion
+28
-16
imperative/python/megengine/traced_module/node.py
imperative/python/megengine/traced_module/node.py
+1
-1
imperative/python/megengine/traced_module/traced_module.py
imperative/python/megengine/traced_module/traced_module.py
+27
-15
未找到文件。
imperative/python/megengine/traced_module/node.py
浏览文件 @
2d20f937
...
@@ -74,7 +74,7 @@ class Node:
...
@@ -74,7 +74,7 @@ class Node:
r
"""Set a new name to this Node."""
r
"""Set a new name to this Node."""
graph
=
self
.
top_graph
graph
=
self
.
top_graph
assert
graph
is
not
None
,
"The parent graph of this Node cannot be None."
assert
graph
is
not
None
,
"The parent graph of this Node cannot be None."
assert
new_name
not
in
graph
.
_namespace
.
used_names
,
(
assert
graph
.
_namespace
.
used_names
.
get
(
new_name
,
None
)
is
None
,
(
"The name(%s) is already in use. Please try a different one again."
"The name(%s) is already in use. Please try a different one again."
%
(
new_name
)
%
(
new_name
)
)
)
...
...
imperative/python/megengine/traced_module/traced_module.py
浏览文件 @
2d20f937
...
@@ -544,11 +544,11 @@ class InternalGraph:
...
@@ -544,11 +544,11 @@ class InternalGraph:
graph
=
self
.
top_graph
graph
=
self
.
top_graph
assert
graph
is
not
None
or
mod
.
_is_top
,
"The parent graph cannot be None."
assert
graph
is
not
None
or
mod
.
_is_top
,
"The parent graph cannot be None."
if
graph
is
not
None
:
if
graph
is
not
None
:
assert
new_name
not
in
self
.
_namespace
.
used_names
,
(
assert
graph
.
_namespace
.
used_names
.
get
(
new_name
,
None
)
is
None
,
(
"The name(%s) is already in use. Please try a different one again."
"The name(%s) is already in use. Please try a different one again."
%
(
new_name
)
%
(
new_name
)
)
)
new_name
=
self
.
_namespace
.
create_unique_name
(
new_name
,
self
)
new_name
=
graph
.
_namespace
.
create_unique_name
(
new_name
,
self
)
self
.
_name
=
new_name
self
.
_name
=
new_name
@
property
@
property
...
@@ -1032,21 +1032,33 @@ class InternalGraph:
...
@@ -1032,21 +1032,33 @@ class InternalGraph:
n
.
inputs
[
idx
]
=
repl_node
n
.
inputs
[
idx
]
=
repl_node
def
_merge_getattr_expr
(
self
):
def
_merge_getattr_expr
(
self
):
getattr_nodes_map
=
dict
()
getattr_nodes_map
=
dict
()
# Dcit[(Node, str), Node]
for
expr
in
self
.
_exprs
:
node_to_attrname
=
dict
()
# Dict[Node, (Node, Str)]
if
not
isinstance
(
expr
,
GetAttr
):
for
expr
in
filter
(
lambda
x
:
isinstance
(
x
,
GetAttr
),
self
.
_exprs
):
continue
base_node
,
attr_name
=
expr
.
inputs
[
0
],
expr
.
name
attr_name
=
get_suffix_name
(
self
.
qualname
,
expr
.
outputs
[
0
].
qualname
)
if
expr
.
inputs
[
0
]
in
node_to_attrname
:
assert
attr_name
,
'"{}" is not a prefix of "{}"'
.
format
(
base_node
,
base_name
=
node_to_attrname
[
expr
.
inputs
[
0
]]
self
.
qualname
,
expr
.
outputs
[
0
].
qualname
attr_name
=
"{}.{}"
.
format
(
base_name
,
expr
.
name
)
)
if
attr_name
in
getattr_nodes_map
:
if
get_suffix_name
(
self
.
qualname
,
expr
.
outputs
[
0
].
qualname
)
!=
attr_name
:
base_node
=
getattr_nodes_map
[
attr_name
]
expected_qualname
=
base_node
.
qualname
+
"."
+
attr_name
logger
.
warning
(
"{}.qualname expects {}, got {} actually. You can re-trace this "
"TracedModel to make the name correct."
.
format
(
expr
.
outputs
[
0
],
expected_qualname
,
expr
.
outputs
[
0
].
qualname
)
)
expr
.
outputs
[
0
].
_qualname
=
expected_qualname
key
=
(
base_node
,
attr_name
)
node_to_attrname
[
expr
.
outputs
[
0
]]
=
key
if
key
in
getattr_nodes_map
:
existed_node
=
getattr_nodes_map
[
key
]
repl_node
=
expr
.
outputs
[
0
]
repl_node
=
expr
.
outputs
[
0
]
for
expr
in
repl_node
.
users
:
for
expr
in
repl_node
.
users
:
base
_node
.
users
.
append
(
expr
)
existed
_node
.
users
.
append
(
expr
)
idx
=
expr
.
inputs
.
index
(
repl_node
)
idx
=
expr
.
inputs
.
index
(
repl_node
)
expr
.
inputs
[
idx
]
=
base
_node
expr
.
inputs
[
idx
]
=
existed
_node
repl_node
.
users
=
[]
repl_node
.
users
=
[]
else
:
else
:
if
attr_name
!=
expr
.
name
:
if
attr_name
!=
expr
.
name
:
...
@@ -1054,7 +1066,7 @@ class InternalGraph:
...
@@ -1054,7 +1066,7 @@ class InternalGraph:
expr
.
inputs
[
0
].
users
.
remove
(
expr
)
expr
.
inputs
[
0
].
users
.
remove
(
expr
)
self
.
inputs
[
0
].
users
.
append
(
expr
)
self
.
inputs
[
0
].
users
.
append
(
expr
)
expr
.
inputs
[
0
]
=
self
.
inputs
[
0
]
expr
.
inputs
[
0
]
=
self
.
inputs
[
0
]
getattr_nodes_map
[
attr_name
]
=
expr
.
outputs
[
0
]
getattr_nodes_map
[
key
]
=
expr
.
outputs
[
0
]
def
compile
(
self
):
def
compile
(
self
):
r
"""Delete unused expr."""
r
"""Delete unused expr."""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录