Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
8775545a
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
未验证
提交
8775545a
编写于
10月 27, 2022
作者:
Z
zyfncg
提交者:
GitHub
10月 27, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support prepare_data for selected_rows in c++ api (#47380)
上级
2096448b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
54 addition
and
5 deletion
+54
-5
paddle/phi/api/lib/data_transform.cc
paddle/phi/api/lib/data_transform.cc
+42
-4
paddle/phi/api/lib/data_transform.h
paddle/phi/api/lib/data_transform.h
+11
-0
paddle/phi/api/yaml/generator/api_base.py
paddle/phi/api/yaml/generator/api_base.py
+1
-1
未找到文件。
paddle/phi/api/lib/data_transform.cc
浏览文件 @
8775545a
...
...
@@ -169,10 +169,6 @@ inline phi::DenseTensor TransDataPlace(const phi::DenseTensor& tensor,
VLOG
(
3
)
<<
"DeviceTransform in, src_place "
<<
tensor
.
place
()
<<
" dst_place: "
<<
dst_place
;
DefaultAllocator
alloc
(
dst_place
);
phi
::
DenseTensor
out
(
&
alloc
,
{
tensor
.
dtype
(),
tensor
.
dims
(),
tensor
.
layout
()});
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
auto
&
pool
=
paddle
::
platform
::
DeviceContextPool
::
Instance
();
// NOTE(yy): TransDataPlace should wait for computation of input.
...
...
@@ -191,6 +187,7 @@ inline phi::DenseTensor TransDataPlace(const phi::DenseTensor& tensor,
// the transforming is from CPU to GPU and the number of elements is little.
// But the embarrassment is that this solution this solution makes training
// slower.
phi
::
DenseTensor
out
;
paddle
::
framework
::
TensorCopySync
(
tensor
,
dst_place
,
&
out
);
return
out
;
}
...
...
@@ -305,6 +302,47 @@ paddle::optional<std::vector<phi::DenseTensor>> PrepareData(
return
paddle
::
none
;
}
std
::
shared_ptr
<
phi
::
SelectedRows
>
PrepareDataForSelectedRows
(
const
Tensor
&
input
,
const
phi
::
TensorArgDef
&
target_args_def
,
const
TransformFlag
&
transform_flag
)
{
const
auto
&
tensor_in
=
input
.
impl
();
if
(
tensor_in
)
{
phi
::
SelectedRows
&
selected_rows
=
*
static_cast
<
phi
::
SelectedRows
*>
(
tensor_in
.
get
());
if
(
!
transform_flag
.
NeedTransform
()
||
!
selected_rows
.
initialized
()
||
(
!
NeedTransformPlace
(
selected_rows
.
place
(),
target_args_def
.
backend
,
transform_flag
)))
{
return
std
::
static_pointer_cast
<
phi
::
SelectedRows
>
(
tensor_in
);
}
auto
dense_out
=
TransDataPlace
(
selected_rows
.
value
(),
phi
::
TransToPhiPlace
(
target_args_def
.
backend
));
if
(
selected_rows
.
place
().
GetType
()
==
AllocationType
::
GPUPINNED
)
{
selected_rows
.
mutable_value
()
->
ShareBufferWith
(
dense_out
);
return
std
::
static_pointer_cast
<
phi
::
SelectedRows
>
(
tensor_in
);
}
auto
out_new
=
std
::
make_shared
<
phi
::
SelectedRows
>
(
selected_rows
.
rows
(),
selected_rows
.
height
());
*
out_new
->
mutable_value
()
=
dense_out
;
return
out_new
;
}
PADDLE_THROW
(
phi
::
errors
::
InvalidArgument
(
"The impl() of input tensor is nullptr, it doesn't support for "
"selected_rows data transform now."
));
}
paddle
::
optional
<
phi
::
SelectedRows
>
PrepareDataForSelectedRows
(
const
paddle
::
optional
<
Tensor
>&
input
,
const
phi
::
TensorArgDef
&
target_args_def
,
const
TransformFlag
&
transform_flag
)
{
if
(
input
)
{
return
*
PrepareDataForSelectedRows
(
*
input
,
target_args_def
,
transform_flag
);
}
return
paddle
::
none
;
}
void
TransDataBackend
(
const
phi
::
DenseTensor
*
tensor
,
Backend
target_backend
,
phi
::
DenseTensor
*
out
)
{
...
...
paddle/phi/api/lib/data_transform.h
浏览文件 @
8775545a
...
...
@@ -82,6 +82,17 @@ paddle::optional<std::vector<phi::DenseTensor>> PrepareData(
const
phi
::
TensorArgDef
&
target_args_def
,
const
TransformFlag
&
transform_flag
);
// Only support transfering place for SelectedRows
std
::
shared_ptr
<
phi
::
SelectedRows
>
PrepareDataForSelectedRows
(
const
Tensor
&
input
,
const
phi
::
TensorArgDef
&
target_args_def
,
const
TransformFlag
&
transform_flag
);
paddle
::
optional
<
phi
::
SelectedRows
>
PrepareDataForSelectedRows
(
const
paddle
::
optional
<
Tensor
>&
input
,
const
phi
::
TensorArgDef
&
target_args_def
,
const
TransformFlag
&
transform_flag
);
void
TransDataBackend
(
const
phi
::
DenseTensor
*
tensor
,
Backend
target_backend
,
phi
::
DenseTensor
*
out
);
...
...
paddle/phi/api/yaml/generator/api_base.py
浏览文件 @
8775545a
...
...
@@ -715,7 +715,7 @@ PADDLE_API {self.get_return_type(inplace_flag=True)} {api_func_name}({self.get_d
input_tensor_code
=
(
input_tensor_code
+
f
"""
{
code_indent
}
auto
{
PREFIX_TENSOR_NAME
}{
input_name
}
=
TensorToSelectedRows(
{
input_name
}
);
{
code_indent
}
auto
{
PREFIX_TENSOR_NAME
}{
input_name
}
=
PrepareDataForSelectedRows(
{
input_name
}
, kernel.InputAt(
{
kernel_param
.
index
(
input_name
)
}
),
{
trans_flag
}
);
"""
)
return
input_tensor_code
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录