Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
23b9a98f
MegEngine
项目概览
MegEngine 天元
/
MegEngine
1 年多 前同步成功
通知
403
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看板
提交
23b9a98f
编写于
1月 08, 2021
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(mge): fix sublnear cuda and mem leak
GitOrigin-RevId: 82091ec9a6d9a00ecffad9505b59d54e3127c783
上级
c70a49ed
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
21 addition
and
10 deletion
+21
-10
imperative/python/megengine/jit/tracing.py
imperative/python/megengine/jit/tracing.py
+7
-2
imperative/python/src/tensor.cpp
imperative/python/src/tensor.cpp
+9
-2
imperative/python/src/trace.cpp
imperative/python/src/trace.cpp
+2
-3
imperative/python/src/trace_info.h
imperative/python/src/trace_info.h
+3
-3
未找到文件。
imperative/python/megengine/jit/tracing.py
浏览文件 @
23b9a98f
...
...
@@ -350,12 +350,16 @@ class trace:
self
.
_lazy_eval_links
=
()
def
_take_escaped_tensors
(
self
):
escaped_tensors
=
tuple
(
filter
(
lambda
x
:
x
()
is
not
None
,
self
.
_active_tensors
.
values
()))
escaped_tensors
=
tuple
(
filter
(
lambda
x
:
x
()
is
not
None
,
self
.
_active_tensors
.
values
())
)
self
.
_active_tensors
.
clear
()
return
escaped_tensors
def
_lazy_eval
(
self
,
lazy_eval_graph
,
lazy_eval_tensors
,
lazy_eval_links
):
lazy_eval_tensors
=
list
(
filter
(
lambda
x
:
x
()
is
not
None
,
lazy_eval_tensors
.
values
()))
lazy_eval_tensors
=
list
(
filter
(
lambda
x
:
x
()
is
not
None
,
lazy_eval_tensors
.
values
())
)
readers
=
[
G
.
OutputNode
(
x
().
_varnode
).
outputs
[
0
]
for
x
in
lazy_eval_tensors
]
self
.
_apply_graph_options
(
lazy_eval_graph
)
# FIXME
...
...
@@ -443,6 +447,7 @@ class trace:
x
().
_reset_varnode
()
x
().
mixin_handle
=
-
1
x
().
recording
=
False
x
().
_trace_mixin_info
=
None
try
:
do_enter
()
...
...
imperative/python/src/tensor.cpp
浏览文件 @
23b9a98f
...
...
@@ -294,8 +294,13 @@ PyObject* TensorWrapper::copied() {
return m_tensor->m_trace_info.member; \
} \
void TensorWrapper::set_##member(PyObject* dest) { \
if (dest == Py_None) { \
Py_XDECREF(m_tensor->m_trace_info.member); \
m_tensor->m_trace_info.member = nullptr; \
} else { \
Py_INCREF(dest); \
m_tensor->m_trace_info.member = dest; \
} \
}
REGISTE_TENSORWRAPPER_PYOBJECT_FUNC
(
compiled_info
)
...
...
@@ -463,6 +468,8 @@ PyObject* TensorWrapper::_dev_tensor(){
auto
py_dev_tensor
=
py
::
reinterpret_borrow
<
py
::
object
>
(
dev_tensor
);
auto
sh
=
interpreter_for_py
->
put
(
py_dev_tensor
.
cast
<
DeviceTensorND
>
());
m_tensor
->
m_handle
=
std
::
move
(
SharedHandle
(
sh
));
Py_DECREF
(
m_tensor
->
m_trace_info
.
compiled_info
);
m_tensor
->
m_trace_info
.
compiled_info
=
nullptr
;
return
dev_tensor
;
}
...
...
imperative/python/src/trace.cpp
浏览文件 @
23b9a98f
...
...
@@ -55,10 +55,9 @@ apply_result_t apply_trace(ApplyContext& ctx) {
auto
args
=
py
::
tuple
(
ctx
.
nargs
+
1
);
args
[
0
]
=
py
::
cast
(
ctx
.
op
);
py
::
tuple
args
(
ctx
.
nargs
);
for
(
size_t
i
=
0
;
i
<
ctx
.
nargs
;
i
++
)
{
args
[
i
+
1
]
=
TensorWrapper
::
make
(
std
::
move
(
std
::
shared_ptr
<
Tensor
>
(
ctx
.
args
[
i
])))
.
release
();
args
[
i
+
1
]
=
TensorWrapper
::
make
(
ctx
.
args
[
i
]
->
shared_from_this
());
}
auto
ret
=
py
::
reinterpret_steal
<
py
::
object
>
(
PyObject_Call
(
pyf
,
args
.
ptr
(),
nullptr
));
...
...
imperative/python/src/trace_info.h
浏览文件 @
23b9a98f
...
...
@@ -28,10 +28,10 @@ struct TraceInfo {
mixin_handle
=
that
.
mixin_handle
;
recording
=
that
.
recording
;
compiled_info
=
that
.
compiled_info
;
Py_XINCREF
(
compiled_info
);
trace_mixin_info
=
that
.
trace_mixin_info
;
Py_XINCREF
(
trace_mixin_info
);
compiled_info
=
that
.
compiled_info
;
Py_XINCREF
(
compiled_info
);
copied
=
true
;
return
*
this
;
...
...
@@ -39,7 +39,7 @@ struct TraceInfo {
~
TraceInfo
()
{
Py_XDECREF
(
trace_mixin_info
);
//
Py_XDECREF(compiled_info);
Py_XDECREF
(
compiled_info
);
}
private:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录