Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
caf3680b
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
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看板
未验证
提交
caf3680b
编写于
1月 28, 2021
作者:
T
taixiurong
提交者:
GitHub
1月 28, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bugs in transformer predict in xpu place (#30730)
* transformer predict * trans bug fix
上级
a87d78f1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
37 deletion
+37
-37
paddle/fluid/operators/array_operator.h
paddle/fluid/operators/array_operator.h
+3
-1
paddle/fluid/operators/concat_op_xpu.cc
paddle/fluid/operators/concat_op_xpu.cc
+20
-31
paddle/fluid/operators/reshape_op.cc
paddle/fluid/operators/reshape_op.cc
+14
-5
未找到文件。
paddle/fluid/operators/array_operator.h
浏览文件 @
caf3680b
...
@@ -20,6 +20,7 @@ limitations under the License. */
...
@@ -20,6 +20,7 @@ limitations under the License. */
namespace
paddle
{
namespace
paddle
{
namespace
operators
{
namespace
operators
{
class
ArrayOp
:
public
framework
::
OperatorBase
{
class
ArrayOp
:
public
framework
::
OperatorBase
{
public:
public:
ArrayOp
(
const
std
::
string
&
type
,
const
framework
::
VariableNameMap
&
inputs
,
ArrayOp
(
const
std
::
string
&
type
,
const
framework
::
VariableNameMap
&
inputs
,
...
@@ -45,7 +46,8 @@ class ArrayOp : public framework::OperatorBase {
...
@@ -45,7 +46,8 @@ class ArrayOp : public framework::OperatorBase {
auto
&
dev_ctx
=
*
pool
.
Get
(
place
);
auto
&
dev_ctx
=
*
pool
.
Get
(
place
);
size_t
offset
;
size_t
offset
;
if
(
platform
::
is_gpu_place
(
i_tensor
.
place
()))
{
if
(
platform
::
is_gpu_place
(
i_tensor
.
place
())
||
platform
::
is_xpu_place
(
i_tensor
.
place
()))
{
// FIXME: Avoid copy from GPU to CPU
// FIXME: Avoid copy from GPU to CPU
framework
::
Tensor
t
;
framework
::
Tensor
t
;
framework
::
TensorCopy
(
i_tensor
,
platform
::
CPUPlace
(),
dev_ctx
,
&
t
);
framework
::
TensorCopy
(
i_tensor
,
platform
::
CPUPlace
(),
dev_ctx
,
&
t
);
...
...
paddle/fluid/operators/concat_op_xpu.cc
浏览文件 @
caf3680b
...
@@ -47,19 +47,6 @@ class ConcatXPUKernel : public framework::OpKernel<T> {
...
@@ -47,19 +47,6 @@ class ConcatXPUKernel : public framework::OpKernel<T> {
"size is %d."
,
"size is %d."
,
axis
,
ins
[
0
]
->
dims
().
size
()));
axis
,
ins
[
0
]
->
dims
().
size
()));
auto
place
=
ctx
.
GetPlace
();
out
->
mutable_data
<
T
>
(
place
);
std
::
vector
<
int
>
choose_idx
;
int
n
=
0
;
for
(
unsigned
int
i
=
0
;
i
<
ins
.
size
();
++
i
)
{
if
(
ins
[
i
]
&&
ins
[
i
]
->
numel
()
>
0
)
{
choose_idx
.
push_back
(
i
);
n
++
;
}
}
PADDLE_ENFORCE_GT
(
n
,
0
,
platform
::
errors
::
InvalidArgument
(
"No tensor need concat?"
));
// If axis is 0, the lod of the output is not the same as inputs.
// If axis is 0, the lod of the output is not the same as inputs.
if
(
axis
==
0
&&
ins
[
0
]
->
lod
().
size
()
>
0
)
{
if
(
axis
==
0
&&
ins
[
0
]
->
lod
().
size
()
>
0
)
{
size_t
lod_size_0
=
ins
[
0
]
->
lod
().
size
();
size_t
lod_size_0
=
ins
[
0
]
->
lod
().
size
();
...
@@ -87,30 +74,32 @@ class ConcatXPUKernel : public framework::OpKernel<T> {
...
@@ -87,30 +74,32 @@ class ConcatXPUKernel : public framework::OpKernel<T> {
}
}
}
}
}
}
auto
place
=
ctx
.
GetPlace
();
auto
input_dims
=
ins
[
0
]
->
dims
();
out
->
mutable_data
<
T
>
(
place
);
std
::
vector
<
std
::
vector
<
int
>>
xdims_list
(
n
);
std
::
vector
<
std
::
vector
<
int
>>
xdims_list
;
for
(
int
i
=
0
;
i
<
n
;
++
i
)
{
std
::
vector
<
const
T
*>
ptrs
;
std
::
vector
<
int
>
tmp_dims
(
input_dims
.
size
());
for
(
unsigned
int
i
=
0
;
i
<
ins
.
size
();
++
i
)
{
for
(
int
j
=
0
;
j
<
input_dims
.
size
();
++
j
)
{
if
(
ins
[
i
]
&&
ins
[
i
]
->
numel
()
>
0
)
{
tmp_dims
[
j
]
=
ins
[
i
]
->
dims
()[
j
];
ptrs
.
push_back
(
ins
[
i
]
->
data
<
T
>
());
int
size
=
ins
[
i
]
->
dims
().
size
();
std
::
vector
<
int
>
tmp_dims
(
size
);
for
(
int
j
=
0
;
j
<
size
;
++
j
)
{
tmp_dims
[
j
]
=
ins
[
i
]
->
dims
()[
j
];
}
xdims_list
.
push_back
(
tmp_dims
);
}
}
xdims_list
[
i
]
=
tmp_dims
;
}
}
PADDLE_ENFORCE_GT
(
xdims_list
.
size
(),
0
,
platform
::
errors
::
InvalidArgument
(
"No tensor need concat"
));
auto
&
dev_ctx
=
ctx
.
template
device_context
<
DeviceContext
>();
auto
&
dev_ctx
=
ctx
.
template
device_context
<
DeviceContext
>();
std
::
vector
<
const
T
*>
ptrs
;
for
(
int
i
=
0
;
i
<
n
;
++
i
)
{
ptrs
.
push_back
(
ins
[
choose_idx
[
i
]]
->
data
<
T
>
());
}
int
r
=
xpu
::
concat
<
T
>
(
dev_ctx
.
x_context
(),
ptrs
,
out
->
data
<
T
>
(),
int
r
=
xpu
::
concat
<
T
>
(
dev_ctx
.
x_context
(),
ptrs
,
out
->
data
<
T
>
(),
xdims_list
,
axis
);
xdims_list
,
axis
);
PADDLE_ENFORCE_EQ
(
PADDLE_ENFORCE_EQ
(
r
,
XPU_SUCCESS
,
r
,
XPU_SUCCESS
,
platform
::
errors
::
External
(
platform
::
errors
::
External
(
"XPU concat kernel return wrong value[%d %s]"
,
r
,
"XPU API return wrong value[%d], please check whether "
XPUAPIErrorMsg
[
r
]));
"Baidu Kunlun Card is properly installed."
,
r
));
}
}
};
};
...
...
paddle/fluid/operators/reshape_op.cc
浏览文件 @
caf3680b
...
@@ -380,11 +380,20 @@ class ReshapeKernel {
...
@@ -380,11 +380,20 @@ class ReshapeKernel {
#ifdef PADDLE_WITH_XPU
#ifdef PADDLE_WITH_XPU
if
(
platform
::
is_xpu_place
(
ctx
.
GetPlace
()))
{
if
(
platform
::
is_xpu_place
(
ctx
.
GetPlace
()))
{
auto
&
dev_ctx
=
void
*
out_ptr
=
out
->
data
<
void
>
();
ctx
.
template
device_context
<
paddle
::
platform
::
XPUDeviceContext
>();
const
void
*
in_ptr
=
in
->
data
<
void
>
();
xpu
::
memcpy_device
(
if
((
out_ptr
!=
nullptr
)
&&
(
in_ptr
!=
nullptr
)
&&
dev_ctx
.
x_context
(),
out
->
data
<
void
>
(),
in
->
data
<
void
>
(),
(
paddle
::
framework
::
SizeOfType
(
in
->
type
())
>
0
))
{
in
->
numel
()
*
paddle
::
framework
::
SizeOfType
(
in
->
type
()));
auto
&
dev_ctx
=
ctx
.
template
device_context
<
paddle
::
platform
::
XPUDeviceContext
>();
int
r
=
xpu
::
memcpy_device
(
dev_ctx
.
x_context
(),
out_ptr
,
in_ptr
,
in
->
numel
()
*
paddle
::
framework
::
SizeOfType
(
in
->
type
()));
PADDLE_ENFORCE_EQ
(
r
,
XPU_SUCCESS
,
platform
::
errors
::
External
(
"XPU memcpy_device return wrong value[%d %s]"
,
r
,
XPUAPIErrorMsg
[
r
]));
}
}
else
{
}
else
{
#endif
#endif
framework
::
TensorCopy
(
framework
::
TensorCopy
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录