Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
50bc1162
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
50bc1162
编写于
3月 18, 2021
作者:
L
Leo Chen
提交者:
GitHub
3月 18, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[NPU] fix reshape npu op kernel (#31726)
* rename npu op file * fix reshape
上级
c8729f2a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
24 deletion
+13
-24
paddle/fluid/operators/reshape_op_npu.cc
paddle/fluid/operators/reshape_op_npu.cc
+13
-24
python/paddle/fluid/tests/unittests/npu/test_reshape_op_npu.py
...n/paddle/fluid/tests/unittests/npu/test_reshape_op_npu.py
+0
-0
未找到文件。
paddle/fluid/operators/reshape
2
_op_npu.cc
→
paddle/fluid/operators/reshape_op_npu.cc
浏览文件 @
50bc1162
...
@@ -15,6 +15,7 @@ limitations under the License. */
...
@@ -15,6 +15,7 @@ limitations under the License. */
#include <memory>
#include <memory>
#include <string>
#include <string>
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/operators/npu_op_runner.h"
#include "paddle/fluid/operators/npu_op_runner.h"
namespace
paddle
{
namespace
paddle
{
...
@@ -25,34 +26,22 @@ class Reshape2NPUKernel : public framework::OpKernel<T> {
...
@@ -25,34 +26,22 @@ class Reshape2NPUKernel : public framework::OpKernel<T> {
public:
public:
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
auto
*
x
=
ctx
.
Input
<
framework
::
Tensor
>
(
"X"
);
auto
*
x
=
ctx
.
Input
<
framework
::
Tensor
>
(
"X"
);
auto
*
shape
=
ctx
.
Attr
<
std
::
vector
<
int
>>>
(
"shape"
);
auto
*
out
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
*
out
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
org_shape
=
framework
::
vectorize
(
x
->
dims
());
auto
list_new_shape_tensor
=
// reshape
ctx
.
MultiInput
<
framework
::
Tensor
>
(
"ShapeTensor"
);
int64_t
shape_all
=
1
;
if
(
list_new_shape_tensor
.
size
()
>
0
)
{
int64_t
org_shape_all
=
1
;
PADDLE_THROW
(
platform
::
errors
::
Unimplemented
(
int
index
=
-
1
;
"Input(ShapeTensor) is not supported on NPU."
));
for
(
int
i
=
0
;
i
<
shape
.
size
();
i
++
)
{
if
(
shape
[
i
]
==
0
)
{
shape
[
i
]
=
org_shape
[
i
];
}
if
(
shape
[
i
]
==
-
1
)
{
index
=
i
;
}
else
{
shape_all
*=
shape
[
i
];
}
org_shape_all
*=
org_shape
[
i
];
}
}
PADDLE_ENFORCE_EQ
(
ctx
.
Input
<
framework
::
LoDTensor
>
(
"Shape"
),
nullptr
,
if
(
index
>=
0
)
{
platform
::
errors
::
Unimplemented
(
shape
[
index
]
=
org_shape_all
/
shape_all
;
"Input(Shape) is not supported on NPU."
));
}
auto
shape
=
out
->
dims
();
out
.
Resize
(
framework
::
make_ddim
(
shape
));
out
->
mutable_data
(
ctx
.
GetPlace
(),
x
->
type
());
out
->
mutable_data
(
ctx
.
GetPlace
(),
x
->
type
());
framework
::
TensorCopy
(
framework
::
TensorCopy
(
*
x
,
ctx
.
GetPlace
(),
*
x
,
ctx
.
GetPlace
(),
ctx
.
template
device_context
<
platform
::
DeviceContext
>(),
out
);
ctx
.
template
device_context
<
platform
::
DeviceContext
>(),
out
);
out
.
Resize
(
framework
::
make_ddim
(
shape
)
);
out
->
Resize
(
shape
);
}
}
};
};
...
@@ -77,11 +66,11 @@ class Reshape2GradNPUKernel : public framework::OpKernel<T> {
...
@@ -77,11 +66,11 @@ class Reshape2GradNPUKernel : public framework::OpKernel<T> {
namespace
ops
=
paddle
::
operators
;
namespace
ops
=
paddle
::
operators
;
REGISTER_OP_NPU_KERNEL
(
REGISTER_OP_NPU_KERNEL
(
reshpe2
,
ops
::
Reshape2NPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
float
>
,
resh
a
pe2
,
ops
::
Reshape2NPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
float
>
,
ops
::
Reshape2NPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
ops
::
Reshape2NPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
paddle
::
platform
::
float16
>
);
paddle
::
platform
::
float16
>
);
REGISTER_OP_NPU_KERNEL
(
REGISTER_OP_NPU_KERNEL
(
reshpe2_grad
,
resh
a
pe2_grad
,
ops
::
Reshape2GradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
float
>
,
ops
::
Reshape2GradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
float
>
,
ops
::
Reshape2GradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
ops
::
Reshape2GradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
paddle
::
platform
::
float16
>
);
paddle
::
platform
::
float16
>
);
python/paddle/fluid/tests/unittests/npu/test_reshape
2
_op_npu.py
→
python/paddle/fluid/tests/unittests/npu/test_reshape_op_npu.py
浏览文件 @
50bc1162
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录