Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
17862b72
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看板
未验证
提交
17862b72
编写于
3月 19, 2021
作者:
O
OleNet
提交者:
GitHub
3月 19, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[NPU] Support mean npu kernel (#31729)
上级
342252c9
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
208 addition
and
0 deletion
+208
-0
paddle/fluid/operators/CMakeLists.txt
paddle/fluid/operators/CMakeLists.txt
+2
-0
paddle/fluid/operators/mean_op_npu.cc
paddle/fluid/operators/mean_op_npu.cc
+117
-0
python/paddle/fluid/tests/unittests/npu/test_mean_op_npu.py
python/paddle/fluid/tests/unittests/npu/test_mean_op_npu.py
+89
-0
未找到文件。
paddle/fluid/operators/CMakeLists.txt
浏览文件 @
17862b72
...
@@ -187,4 +187,6 @@ endif()
...
@@ -187,4 +187,6 @@ endif()
if
(
WITH_ASCEND_CL
)
if
(
WITH_ASCEND_CL
)
cc_test
(
gelu_op_npu_test SRCS gelu_op_npu_test.cc DEPS op_registry gelu_op scope device_context enforce executor
)
cc_test
(
gelu_op_npu_test SRCS gelu_op_npu_test.cc DEPS op_registry gelu_op scope device_context enforce executor
)
cc_test
(
mean_op_npu_test SRCS mean_op_npu_test.cc DEPS op_registry mean_op scope device_context enforce executor
)
endif
()
endif
()
paddle/fluid/operators/mean_op_npu.cc
0 → 100644
浏览文件 @
17862b72
/* Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/fluid/operators/mean_op.h"
#include "paddle/fluid/platform/float16.h"
#include "paddle/fluid/operators/npu_op_runner.h"
namespace
paddle
{
namespace
operators
{
template
<
typename
DeviceContext
,
typename
T
>
class
MeanNPUKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
auto
*
x
=
ctx
.
Input
<
framework
::
LoDTensor
>
(
"X"
);
auto
*
out
=
ctx
.
Output
<
framework
::
LoDTensor
>
(
"Out"
);
std
::
vector
<
int
>
axes
;
framework
::
NPUAttributeMap
attr_input
=
{
{
"keep_dims"
,
false
},
{
"axes"
,
axes
}};
out
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
auto
runner
=
NpuOpRunner
(
"ReduceMeanD"
,
{
*
x
},
{
*
out
},
attr_input
);
auto
stream
=
ctx
.
template
device_context
<
paddle
::
platform
::
NPUDeviceContext
>()
.
stream
();
runner
.
Run
(
stream
);
}
};
template
<
typename
DeviceContext
,
typename
T
>
class
MeanGradNPUKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
stream
=
context
.
template
device_context
<
paddle
::
platform
::
NPUDeviceContext
>()
.
stream
();
auto
grad
=
context
.
Input
<
Tensor
>
(
framework
::
GradVarName
(
"Out"
));
PADDLE_ENFORCE_EQ
(
grad
->
numel
(),
1
,
platform
::
errors
::
InvalidArgument
(
"Mean Gradient Input Tensor len should be 1. But "
"received Out@Grad's elements num is %d."
,
grad
->
numel
()));
auto
IG
=
context
.
Output
<
Tensor
>
(
framework
::
GradVarName
(
"X"
));
IG
->
mutable_data
<
T
>
(
context
.
GetPlace
());
// ones
Tensor
ones
(
grad
->
type
());
ones
.
mutable_data
<
T
>
(
IG
->
dims
(),
context
.
GetPlace
());
auto
runner_ones
=
NpuOpRunner
(
"OnesLike"
,
{
*
IG
},
{
ones
},
{});
runner_ones
.
Run
(
stream
);
// means
Tensor
mean_tensor
(
grad
->
type
());
mean_tensor
.
Resize
({
1
});
mean_tensor
.
mutable_data
<
T
>
(
context
.
GetPlace
());
std
::
vector
<
float
>
mean_vec
;
mean_vec
.
push_back
(
1.0
/
static_cast
<
float
>
(
IG
->
numel
()));
framework
::
TensorFromVector
(
mean_vec
,
context
.
device_context
(),
&
mean_tensor
);
// means mul ones
Tensor
mean_ma
(
grad
->
type
());
mean_ma
.
Resize
(
IG
->
dims
());
mean_ma
.
mutable_data
<
T
>
(
context
.
GetPlace
());
auto
runner_mul_1
=
NpuOpRunner
(
"Mul"
,
{
mean_tensor
,
ones
},
{
mean_ma
},
{});
runner_mul_1
.
Run
(
stream
);
// and mul grad
auto
runner_mul_2
=
NpuOpRunner
(
"Mul"
,
{
mean_ma
,
*
grad
},
{
*
IG
},
{});
runner_mul_2
.
Run
(
stream
);
}
};
}
// namespace operators
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_NPU_KERNEL
(
mean
,
ops
::
MeanNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
int
>
,
ops
::
MeanNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
float
>
,
ops
::
MeanNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
double
>
,
ops
::
MeanNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
plat
::
float16
>
)
REGISTER_OP_NPU_KERNEL
(
mean_grad
,
ops
::
MeanGradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
int
>
,
ops
::
MeanGradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
float
>
,
ops
::
MeanGradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
double
>
,
ops
::
MeanGradNPUKernel
<
paddle
::
platform
::
NPUDeviceContext
,
plat
::
float16
>
)
python/paddle/fluid/tests/unittests/npu/test_mean_op_npu.py
0 → 100644
浏览文件 @
17862b72
# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from
__future__
import
print_function
import
numpy
as
np
import
unittest
import
sys
sys
.
path
.
append
(
".."
)
from
op_test
import
OpTest
import
paddle
import
paddle.fluid
as
fluid
from
paddle.fluid
import
core
paddle
.
enable_static
()
SEED
=
2021
@
unittest
.
skipIf
(
not
paddle
.
is_compiled_with_npu
(),
"core is not compiled with NPU"
)
class
TestMean
(
OpTest
):
def
setUp
(
self
):
self
.
set_npu
()
self
.
place
=
paddle
.
NPUPlace
(
0
)
self
.
op_type
=
"mean"
self
.
init_dtype
()
x
=
np
.
random
.
random
([
1
,
100
]).
astype
(
self
.
dtype
)
self
.
inputs
=
{
'X'
:
x
}
self
.
attrs
=
{}
np_out
=
np
.
mean
(
x
)
self
.
outputs
=
{
'Out'
:
np_out
}
def
set_npu
(
self
):
self
.
__class__
.
use_npu
=
True
def
init_dtype
(
self
):
self
.
dtype
=
np
.
float32
def
test_check_output
(
self
):
self
.
check_output_with_place
(
self
.
place
,
check_dygraph
=
False
)
def
test_check_grad
(
self
):
self
.
check_grad_with_place
(
self
.
place
,
[
'X'
],
'Out'
,
check_dygraph
=
False
)
@
unittest
.
skipIf
(
not
paddle
.
is_compiled_with_npu
(),
"core is not compiled with NPU"
)
class
TestMeanFP16
(
OpTest
):
def
setUp
(
self
):
self
.
set_npu
()
self
.
place
=
paddle
.
NPUPlace
(
0
)
self
.
op_type
=
"mean"
self
.
init_dtype
()
x
=
np
.
random
.
random
([
3
,
200
]).
astype
(
self
.
dtype
)
self
.
inputs
=
{
'X'
:
x
}
self
.
attrs
=
{}
np_out
=
np
.
mean
(
x
)
self
.
outputs
=
{
'Out'
:
np_out
}
def
set_npu
(
self
):
self
.
__class__
.
use_npu
=
True
self
.
__class__
.
no_need_check_grad
=
True
def
init_dtype
(
self
):
self
.
dtype
=
np
.
float16
def
test_check_output
(
self
):
self
.
check_output_with_place
(
self
.
place
,
check_dygraph
=
False
)
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录