Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
马赛克医院
Paddle
提交
aabe1715
P
Paddle
项目概览
马赛克医院
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aabe1715
编写于
6月 29, 2017
作者:
Q
qiaolongfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
merge CreateVar and GetOrCreateVar
上级
1678ad7b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
18 deletion
+16
-18
paddle/framework/scope.h
paddle/framework/scope.h
+7
-14
paddle/framework/scope_test.cc
paddle/framework/scope_test.cc
+9
-4
未找到文件。
paddle/framework/scope.h
浏览文件 @
aabe1715
...
...
@@ -19,7 +19,6 @@ limitations under the License. */
#include <vector>
#include "paddle/framework/variable.h"
#include "paddle/platform/assert.h"
namespace
paddle
{
namespace
framework
{
...
...
@@ -44,9 +43,13 @@ class Scope {
/// Create Variable in this Scope. Failed if Variable already been
/// created.
Variable
*
CreateVariable
(
const
std
::
string
&
name
)
{
PADDLE_ASSERT
(
!
HasVariable
(
name
));
vars_
[
name
]
=
std
::
unique_ptr
<
Variable
>
(
new
Variable
());
return
GetVariable
(
name
);
auto
var
=
GetVariable
(
name
);
if
(
var
)
{
return
var
;
}
else
{
vars_
[
name
]
=
std
::
unique_ptr
<
Variable
>
(
new
Variable
());
return
GetVariable
(
name
);
}
}
/// Get Variable from this Scope, this function will recursive find Variable
...
...
@@ -62,16 +65,6 @@ class Scope {
}
}
/// Get Variable from scope, if Variable is not exist, creat one and return.
Variable
*
GetOrCreateVariable
(
const
std
::
string
&
name
)
{
auto
var
=
GetVariable
(
name
);
if
(
var
)
{
return
var
;
}
else
{
return
CreateVariable
(
name
);
}
}
/// Find if there is a Variable in this scope and it's parent scope
bool
HasVariable
(
const
std
::
string
&
name
)
const
{
return
(
vars_
.
find
(
name
)
!=
vars_
.
end
()
||
...
...
paddle/framework/scope_test.cc
浏览文件 @
aabe1715
...
...
@@ -24,18 +24,22 @@ TEST(Scope, Create) {
Variable
*
var0
=
scope
->
CreateVariable
(
""
);
EXPECT_NE
(
var0
,
nullptr
);
/// GetVariable will return nullptr if not exist.
Variable
*
var1
=
scope
->
GetVariable
(
"a"
);
EXPECT_EQ
(
var1
,
nullptr
);
/// CreateVariable will return one.
Variable
*
var2
=
scope
->
CreateVariable
(
"a"
);
EXPECT_NE
(
var2
,
nullptr
);
ASSERT_DEATH
({
scope
->
CreateVariable
(
"a"
);
},
""
);
/// Get the created variable.
Variable
*
var3
=
scope
->
GetVariable
(
"a"
);
EXPECT_EQ
(
var2
,
var3
);
Variable
*
var4
=
scope
->
GetOrCreateVariable
(
"a"
);
EXPECT_EQ
(
var2
,
var4
);
/// CreateVariable will just return the variable if it's
/// already exist.
Variable
*
var4
=
scope
->
CreateVariable
(
"a"
);
EXPECT_EQ
(
var4
,
var2
);
}
TEST
(
Scope
,
Parent
)
{
...
...
@@ -48,6 +52,7 @@ TEST(Scope, Parent) {
Variable
*
var0
=
parent_scope
->
CreateVariable
(
"a"
);
EXPECT_NE
(
var0
,
nullptr
);
/// GetVariable will get Variable from parent scope if exist.
Variable
*
var1
=
scope
->
GetVariable
(
"a"
);
EXPECT_EQ
(
var0
,
var1
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录