Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
9af54c9e
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
1 年多 前同步成功
通知
696
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9af54c9e
编写于
6月 29, 2017
作者:
Q
qiaolongfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
do not use default argument in Scope
上级
cfdfa89b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
16 deletion
+31
-16
paddle/framework/scope.h
paddle/framework/scope.h
+28
-13
paddle/framework/scope_test.cc
paddle/framework/scope_test.cc
+3
-3
未找到文件。
paddle/framework/scope.h
浏览文件 @
9af54c9e
...
...
@@ -24,24 +24,31 @@ namespace paddle {
namespace
framework
{
/**
* @brief Scope that manage all variables.
*
* Scope is an association of a name to Variable. All variables belong to
* Scope. You need to specify a scope to run a Net, i.e., `net.Run(&scope)`.
* One net can run in different scopes and update different variable in the
* scope.
*/
class
Scope
{
private:
explicit
Scope
(
const
std
::
shared_ptr
<
Scope
>&
parent
=
nullptr
)
:
parent_
(
parent
)
{}
public:
static
std
::
shared_ptr
<
Scope
>
Create
(
const
std
::
shared_ptr
<
Scope
>&
parent
=
nullptr
)
{
return
std
::
make_shared
<
Scope
>
(
Scope
(
parent
));
}
/**
* @brief Initialize s Scope without parent.
*/
Scope
()
{}
/**
* @brief Initialize a Scope with parent.
*/
explicit
Scope
(
const
std
::
shared_ptr
<
Scope
>&
parent
)
:
parent_
(
parent
)
{}
/// Create Variable in this Scope. Failed if Variable already been
/// created.
/**
* @brief Create Variable
*
* Create Variable in this Scope. Return the exist one if Variable already
* been created.
*/
Variable
*
CreateVariable
(
const
std
::
string
&
name
)
{
auto
var
=
GetVariable
(
name
);
if
(
var
)
{
...
...
@@ -52,8 +59,12 @@ class Scope {
}
}
/// Get Variable from this Scope, this function will recursive find Variable
/// from it's parent scope. Return nullptr if not found.
/**
* @brief Get Variable.
*
* Get Variable from this Scope, this function will recursive find Variable
* from it's parent scope. Return nullptr if not found.
*/
Variable
*
GetVariable
(
const
std
::
string
&
name
)
const
{
auto
it
=
vars_
.
find
(
name
);
if
(
it
!=
vars_
.
end
())
{
...
...
@@ -65,7 +76,11 @@ class Scope {
}
}
/// Find if there is a Variable in this scope and it's parent scope
/**
* @brief If this scope has a Var named 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
()
||
(
parent_
&&
parent_
->
HasVariable
(
name
)));
...
...
paddle/framework/scope_test.cc
浏览文件 @
9af54c9e
...
...
@@ -19,7 +19,7 @@ TEST(Scope, Create) {
using
paddle
::
framework
::
Scope
;
using
paddle
::
framework
::
Variable
;
auto
scope
=
Scope
::
Create
();
auto
scope
=
std
::
make_shared
<
Scope
>
();
Variable
*
var0
=
scope
->
CreateVariable
(
""
);
EXPECT_NE
(
var0
,
nullptr
);
...
...
@@ -46,8 +46,8 @@ TEST(Scope, Parent) {
using
paddle
::
framework
::
Scope
;
using
paddle
::
framework
::
Variable
;
auto
parent_scope
=
Scope
::
Create
();
auto
scope
=
Scope
::
Create
(
parent_scope
);
auto
parent_scope
=
std
::
make_shared
<
Scope
>
();
auto
scope
=
std
::
make_shared
<
Scope
>
(
parent_scope
);
Variable
*
var0
=
parent_scope
->
CreateVariable
(
"a"
);
EXPECT_NE
(
var0
,
nullptr
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录