Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
f12b3f36
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
694
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看板
体验新版 GitCode,发现更多精彩内容 >>
You need to sign in or sign up before continuing.
提交
f12b3f36
编写于
4月 18, 2018
作者:
Y
Yancey1989
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use memcpy
上级
13e7194e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
16 deletion
+11
-16
paddle/fluid/framework/selected_rows.cc
paddle/fluid/framework/selected_rows.cc
+10
-16
paddle/fluid/framework/selected_rows.h
paddle/fluid/framework/selected_rows.h
+1
-0
未找到文件。
paddle/fluid/framework/selected_rows.cc
浏览文件 @
f12b3f36
...
@@ -39,11 +39,10 @@ struct ReAllocateVisitor {
...
@@ -39,11 +39,10 @@ struct ReAllocateVisitor {
};
};
struct
TensorCopyVisitor
{
struct
TensorCopyVisitor
{
TensorCopyVisitor
(
const
platform
::
Place
&
place
,
framework
::
Tensor
*
dst
,
TensorCopyVisitor
(
framework
::
Tensor
*
dst
,
int64_t
dst_offset
,
int64_t
dst_offset
,
const
framework
::
Tensor
src
,
const
framework
::
Tensor
src
,
int64_t
src_offset
,
int64_t
src_offset
,
int64_t
size
)
int64_t
size
)
:
place_
(
place
),
:
dst_
(
dst
),
dst_
(
dst
),
dst_offset_
(
dst_offset
),
dst_offset_
(
dst_offset
),
src_
(
src
),
src_
(
src
),
src_offset_
(
src_offset
),
src_offset_
(
src_offset
),
...
@@ -51,12 +50,12 @@ struct TensorCopyVisitor {
...
@@ -51,12 +50,12 @@ struct TensorCopyVisitor {
template
<
typename
T
>
template
<
typename
T
>
void
operator
()()
const
{
void
operator
()()
const
{
std
::
copy
(
src_
.
data
<
T
>
()
+
src_offset_
,
// TODO(Yancey1989): support other place
src_
.
data
<
T
>
()
+
src_offset_
+
size_
,
platform
::
CPUPlace
cpu
;
dst_
->
mutable_data
<
T
>
(
place_
)
+
dst_offset_
);
memory
::
Copy
(
cpu
,
dst_
->
mutable_data
<
T
>
(
cpu
)
+
dst_offset_
,
cpu
,
src_
.
data
<
T
>
()
+
src_offset_
,
size_
*
sizeof
(
T
));
}
}
platform
::
Place
place_
;
framework
::
Tensor
*
dst_
;
framework
::
Tensor
*
dst_
;
int64_t
dst_offset_
;
int64_t
dst_offset_
;
framework
::
Tensor
src_
;
framework
::
Tensor
src_
;
...
@@ -125,16 +124,12 @@ std::vector<int64_t> SelectedRows::Get(std::vector<int64_t> keys,
...
@@ -125,16 +124,12 @@ std::vector<int64_t> SelectedRows::Get(std::vector<int64_t> keys,
framework
::
Tensor
*
value
)
const
{
framework
::
Tensor
*
value
)
const
{
PADDLE_ENFORCE
(
value
->
IsInitialized
(),
PADDLE_ENFORCE
(
value
->
IsInitialized
(),
"The value tensor should be initialized."
);
"The value tensor should be initialized."
);
std
::
vector
<
int64_t
>
non_keys
;
std
::
vector
<
int64_t
>
non_keys
;
int64_t
value_width
=
value_
->
numel
()
/
value_
->
dims
()[
0
];
int64_t
value_width
=
value_
->
numel
()
/
value_
->
dims
()[
0
];
PADDLE_ENFORCE_EQ
(
value_width
,
value
->
numel
()
/
value
->
dims
()[
0
],
PADDLE_ENFORCE_EQ
(
value_width
,
value
->
numel
()
/
value
->
dims
()[
0
],
"output tensor should have the same shape with table "
"output tensor should have the same shape with table "
"execpt the dims[0]."
);
"execpt the dims[0]."
);
// TODO(Yancey1989): support other place
platform
::
CPUPlace
cpu
;
for
(
size_t
i
=
0
;
i
<
keys
.
size
();
++
i
)
{
for
(
size_t
i
=
0
;
i
<
keys
.
size
();
++
i
)
{
int64_t
index
=
Index
(
keys
[
i
]);
int64_t
index
=
Index
(
keys
[
i
]);
if
(
index
==
-
1
)
{
if
(
index
==
-
1
)
{
...
@@ -142,7 +137,7 @@ std::vector<int64_t> SelectedRows::Get(std::vector<int64_t> keys,
...
@@ -142,7 +137,7 @@ std::vector<int64_t> SelectedRows::Get(std::vector<int64_t> keys,
}
else
{
}
else
{
framework
::
VisitDataType
(
framework
::
VisitDataType
(
framework
::
ToDataType
(
value_
->
type
()),
framework
::
ToDataType
(
value_
->
type
()),
TensorCopyVisitor
(
cpu
,
value
,
i
*
value_width
,
*
value_
.
get
(),
TensorCopyVisitor
(
value
,
i
*
value_width
,
*
value_
.
get
(),
index
*
value_width
,
value_width
));
index
*
value_width
,
value_width
));
}
}
}
}
...
@@ -159,7 +154,6 @@ bool SelectedRows::Set(int64_t key, const framework::Tensor& value) {
...
@@ -159,7 +154,6 @@ bool SelectedRows::Set(int64_t key, const framework::Tensor& value) {
PADDLE_ENFORCE_EQ
(
value
.
dims
()[
0
],
static_cast
<
size_t
>
(
1
),
PADDLE_ENFORCE_EQ
(
value
.
dims
()[
0
],
static_cast
<
size_t
>
(
1
),
"The first dim of value should be 1."
);
"The first dim of value should be 1."
);
auto
index
=
Index
(
key
);
auto
index
=
Index
(
key
);
platform
::
Place
cpu
=
platform
::
CPUPlace
();
bool
is_new_key
=
false
;
bool
is_new_key
=
false
;
if
(
index
==
-
1
)
{
if
(
index
==
-
1
)
{
rows_
.
push_back
(
key
);
rows_
.
push_back
(
key
);
...
@@ -176,7 +170,7 @@ bool SelectedRows::Set(int64_t key, const framework::Tensor& value) {
...
@@ -176,7 +170,7 @@ bool SelectedRows::Set(int64_t key, const framework::Tensor& value) {
framework
::
VisitDataType
(
framework
::
VisitDataType
(
framework
::
ToDataType
(
value
.
type
()),
framework
::
ToDataType
(
value
.
type
()),
TensorCopyVisitor
(
cpu
,
value_
.
get
(),
TensorCopyVisitor
(
value_
.
get
(),
index
*
value_
->
numel
()
/
value_
->
dims
()[
0
],
value
,
index
*
value_
->
numel
()
/
value_
->
dims
()[
0
],
value
,
static_cast
<
int64_t
>
(
0
),
value
.
numel
()));
static_cast
<
int64_t
>
(
0
),
value
.
numel
()));
return
is_new_key
;
return
is_new_key
;
...
...
paddle/fluid/framework/selected_rows.h
浏览文件 @
f12b3f36
...
@@ -19,6 +19,7 @@ limitations under the License. */
...
@@ -19,6 +19,7 @@ limitations under the License. */
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/memory/memcpy.h"
namespace
paddle
{
namespace
paddle
{
namespace
framework
{
namespace
framework
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录