Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
bb2e7f0b
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bb2e7f0b
编写于
12月 08, 2018
作者:
T
tangwei12
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add scope in prefetch
上级
527946df
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
9 deletion
+11
-9
paddle/fluid/operators/distributed/parameter_prefetch.cc
paddle/fluid/operators/distributed/parameter_prefetch.cc
+4
-4
paddle/fluid/operators/distributed/parameter_prefetch.h
paddle/fluid/operators/distributed/parameter_prefetch.h
+2
-1
paddle/fluid/operators/nce_op.h
paddle/fluid/operators/nce_op.h
+5
-4
未找到文件。
paddle/fluid/operators/distributed/parameter_prefetch.cc
浏览文件 @
bb2e7f0b
...
...
@@ -104,7 +104,7 @@ static void MergeMultipleVarsIntoOneBySection(
const
std
::
vector
<
std
::
vector
<
int64_t
>>&
splited_ids
,
const
framework
::
ExecutionContext
&
context
,
const
framework
::
Scope
&
actual_scope
,
framework
::
Scope
*
scope
,
platform
::
DeviceContext
*
actual_ctx
,
)
{
platform
::
DeviceContext
*
actual_ctx
)
{
PADDLE_ENFORCE_EQ
(
out_var_names
.
size
(),
height_section
.
size
(),
""
);
auto
cpu_place
=
platform
::
CPUPlace
();
...
...
@@ -175,7 +175,7 @@ void prefetch(const std::string& id_name, const std::string& out_name,
const
std
::
vector
<
int
>&
height_sections
,
const
framework
::
ExecutionContext
&
context
,
const
framework
::
Scope
&
scope
)
{
auto
&
local_scope
=
scope
.
NewScope
();
auto
&
local_scope
=
context
.
scope
()
.
NewScope
();
platform
::
DeviceContextPool
&
pool
=
platform
::
DeviceContextPool
::
Instance
();
auto
&
cpu_ctx
=
*
pool
.
Get
(
platform
::
CPUPlace
());
...
...
@@ -192,7 +192,7 @@ void prefetch(const std::string& id_name, const std::string& out_name,
out_var_names
.
push_back
(
out_name
+
"@"
+
epmap
[
i
]);
}
auto
&
id_tensor
=
local_
scope
.
FindVar
(
id_name
)
->
Get
<
framework
::
LoDTensor
>
();
auto
&
id_tensor
=
scope
.
FindVar
(
id_name
)
->
Get
<
framework
::
LoDTensor
>
();
std
::
vector
<
int64_t
>
ids_vector
;
if
(
platform
::
is_cpu_place
(
id_tensor
.
place
()))
{
auto
*
id_data
=
id_tensor
.
data
<
int64_t
>
();
...
...
@@ -248,7 +248,7 @@ void prefetch(const std::string& id_name, const std::string& out_name,
MergeMultipleVarsIntoOneBySection
(
id_name
,
ids_vector
,
out_name
,
out_var_names
,
height_sections
,
splited_ids
,
context
,
scope
,
&
local_scope
,
&
actual_ctx
);
scope
.
DeleteScope
(
&
local_scope
);
context
.
scope
()
.
DeleteScope
(
&
local_scope
);
}
};
// namespace distributed
...
...
paddle/fluid/operators/distributed/parameter_prefetch.h
浏览文件 @
bb2e7f0b
...
...
@@ -27,7 +27,8 @@ void prefetch(const std::string& id_name, const std::string& out_name,
const
std
::
vector
<
std
::
string
>&
table_names
,
const
std
::
vector
<
std
::
string
>&
epmap
,
const
std
::
vector
<
int
>&
height_sections
,
const
framework
::
ExecutionContext
&
context
);
const
framework
::
ExecutionContext
&
context
,
const
framework
::
Scope
&
scope
);
};
// namespace distributed
};
// namespace operators
...
...
paddle/fluid/operators/nce_op.h
浏览文件 @
bb2e7f0b
...
...
@@ -180,7 +180,7 @@ class NCEKernel : public framework::OpKernel<T> {
labels
.
size
()
*
sizeof
(
int64_t
));
local_scope
.
Var
(
"Weight@Local"
)
->
GetMutable
<
framework
::
Tensor
>
()
->
GetMutable
<
framework
::
LoD
Tensor
>
()
->
mutable_data
<
T
>
(
context
.
GetPlace
());
#ifdef PADDLE_WITH_DISTRIBUTE
...
...
@@ -194,7 +194,7 @@ class NCEKernel : public framework::OpKernel<T> {
#endif
auto
weight_mat
=
EigenMatrix
<
T
>::
From
(
(
local_scope
.
Var
(
"Weight@Local"
)
->
Get
<
framework
::
Tensor
>
()));
(
local_scope
.
Var
(
"Weight@Local"
)
->
Get
<
framework
::
LoD
Tensor
>
()));
for
(
int64_t
i
=
0
;
i
<
sample_labels
->
numel
();
++
i
)
{
std
::
vector
<
int64_t
>::
iterator
it
=
std
::
find
(
labels
.
begin
(),
labels
.
end
(),
sample_labels_data
[
i
]);
...
...
@@ -208,8 +208,9 @@ class NCEKernel : public framework::OpKernel<T> {
sample_out_data
[
i
]
=
(
1.
/
(
1.
+
exp
(
-
sample_out_data
[
i
])));
}
context
.
scope
().
DeleteScope
(
&
local_scope
);
if
(
context
.
scope
().
HasKid
(
&
local_scope
))
{
context
.
scope
().
DeleteScope
(
&
local_scope
);
}
}
else
{
auto
weight_mat
=
EigenMatrix
<
T
>::
From
(
*
(
context
.
Input
<
Tensor
>
(
"Weight"
)));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录