Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
494cb36d
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 2 年 前同步成功
通知
2325
Star
20933
Fork
5424
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
494cb36d
编写于
7月 01, 2020
作者:
A
Aurelius84
提交者:
GitHub
7月 01, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Modify tmp var name prefix in dygraph (#25280)
* Modify tmp var name prefix in dygraph test=develop * refine comment test=develop
上级
82ec247a
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
29 addition
and
2 deletion
+29
-2
paddle/fluid/imperative/tests/test_tracer.cc
paddle/fluid/imperative/tests/test_tracer.cc
+5
-0
paddle/fluid/imperative/tracer.h
paddle/fluid/imperative/tracer.h
+8
-1
paddle/fluid/pybind/imperative.cc
paddle/fluid/pybind/imperative.cc
+1
-1
python/paddle/fluid/tests/unittests/test_unique_name.py
python/paddle/fluid/tests/unittests/test_unique_name.py
+15
-0
未找到文件。
paddle/fluid/imperative/tests/test_tracer.cc
浏览文件 @
494cb36d
...
...
@@ -285,6 +285,11 @@ TEST(test_tracer, test_unique_name_generator) {
auto
fc_2
=
tracer
.
GenerateUniqueName
(
"fc"
);
ASSERT_STREQ
(
"fc_0"
,
fc_1
.
c_str
());
ASSERT_STREQ
(
"fc_1"
,
fc_2
.
c_str
());
// use `eager_tmp` as key if not specify it.
auto
tmp_var_2
=
tracer
.
GenerateUniqueName
();
ASSERT_STREQ
(
"eager_tmp_2"
,
tmp_var_2
.
c_str
());
auto
tmp_var_3
=
tracer
.
GenerateUniqueName
(
"eager_tmp"
);
ASSERT_STREQ
(
"eager_tmp_3"
,
tmp_var_3
.
c_str
());
}
TEST
(
test_tracer
,
test_current_tracer
)
{
...
...
paddle/fluid/imperative/tracer.h
浏览文件 @
494cb36d
...
...
@@ -76,7 +76,14 @@ class Tracer {
return
program_desc_tracer_
.
get
();
}
std
::
string
GenerateUniqueName
(
std
::
string
key
=
"tmp"
)
{
// Note(Aurelius84): The `tmp` is used as prefix key while naming a temporary
// intermediate var both in imperative and static mode. But the
// `UniqueNameGenerator` in C++ and `unique_name.py` in Python doesn't share
// the same auto-increment id. It will create a variable repeatedly with same
// name like `tmp_0` in some cases when transform dygraph into static layers.
// So we modify the default prefix key into `eager_tmp` to distinguish with
// static graph.
std
::
string
GenerateUniqueName
(
std
::
string
key
=
"eager_tmp"
)
{
return
generator_
->
Generate
(
key
);
}
...
...
paddle/fluid/pybind/imperative.cc
浏览文件 @
494cb36d
...
...
@@ -873,7 +873,7 @@ void BindImperative(py::module *m_ptr) {
&
imperative
::
Tracer
::
GetProgramDescTracer
,
py
::
return_value_policy
::
reference
)
.
def
(
"_generate_unique_name"
,
&
imperative
::
Tracer
::
GenerateUniqueName
,
py
::
arg
(
"key"
)
=
"tmp"
)
py
::
arg
(
"key"
)
=
"
eager_
tmp"
)
.
def
(
"trace"
,
[](
imperative
::
Tracer
&
self
,
const
std
::
string
&
type
,
const
PyNameVarBaseMap
&
ins
,
const
PyNameVarBaseMap
&
outs
,
...
...
python/paddle/fluid/tests/unittests/test_unique_name.py
浏览文件 @
494cb36d
...
...
@@ -43,3 +43,18 @@ class TestUniqueName(unittest.TestCase):
name3
=
fluid
.
unique_name
.
generate
(
'tmp'
)
self
.
assertNotEqual
(
name1
,
name2
)
self
.
assertEqual
(
name1
[
-
2
:],
name3
[
-
2
:])
class
TestImperativeUniqueName
(
unittest
.
TestCase
):
def
test_name_generator
(
self
):
with
fluid
.
dygraph
.
guard
():
tracer
=
fluid
.
framework
.
_dygraph_tracer
()
tmp_var_0
=
tracer
.
_generate_unique_name
()
self
.
assertEqual
(
tmp_var_0
,
"eager_tmp_0"
)
tmp_var_1
=
tracer
.
_generate_unique_name
(
"eager_tmp"
)
self
.
assertEqual
(
tmp_var_1
,
"eager_tmp_1"
)
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录