-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Support npu kernel for eye op #34543
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 9 commits
16d0076
2632fad
067ef66
0c2d8a1
7e88219
aedd7eb
cbd6850
dd2a6f9
a79dd78
16b15cc
97ecbc3
a6531aa
2cbf6c8
43f7643
c0c10bb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* 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/crop_op.h" | ||
| #include "paddle/fluid/operators/npu_op_runner.h" | ||
|
|
||
| namespace paddle { | ||
| namespace operators { | ||
|
|
||
| using Tensor = framework::Tensor; | ||
|
|
||
| template <typename DeviceContext, typename T> | ||
| class EyeNPUKernel : public framework::OpKernel<T> { | ||
| public: | ||
| void Compute(const framework::ExecutionContext& ctx) const override { | ||
| auto num_rows = ctx.Attr<int64_t>("num_rows"); | ||
| PADDLE_ENFORCE_EQ( | ||
| num_rows >= 0, true, | ||
| platform::errors::InvalidArgument( | ||
| "The value of Input(num_rows) should be non-negative int.")); | ||
|
||
|
|
||
| auto d_nums = ctx.Attr<int>("dtype"); | ||
| auto dtype = | ||
| ConvertToNpuDtype(static_cast<framework::proto::VarType::Type>(d_nums)); | ||
|
|
||
| auto num_columns = num_rows; | ||
| PADDLE_ENFORCE_EQ( | ||
| num_columns >= 0, true, | ||
| platform::errors::InvalidArgument( | ||
| "The value of Input(num_columns) should be non-negative int.")); | ||
|
|
||
|
||
| if (ctx.HasAttr("num_columns")) { | ||
| num_columns = ctx.Attr<int64_t>("num_columns"); | ||
| } | ||
|
||
|
|
||
| framework::NPUAttributeMap attr_input = { | ||
| {"num_rows", num_rows}, {"num_columns", num_columns}, {"dtype", dtype}}; | ||
|
|
||
| auto* out = ctx.Output<framework::Tensor>("Out"); | ||
| out->mutable_data<T>(ctx.GetPlace()); | ||
|
|
||
| const auto& runner = NpuOpRunner("Eye", {}, {*out}, attr_input); | ||
| auto stream = | ||
| ctx.template device_context<paddle::platform::NPUDeviceContext>() | ||
| .stream(); | ||
| runner.Run(stream); | ||
| } | ||
| }; | ||
|
|
||
| } // namespace operators | ||
| } // namespace paddle | ||
|
|
||
| namespace ops = paddle::operators; | ||
|
|
||
| REGISTER_OP_NPU_KERNEL( | ||
| eye, ops::EyeNPUKernel<paddle::platform::NPUDeviceContext, float>, | ||
| ops::EyeNPUKernel<paddle::platform::NPUDeviceContext, int>, | ||
| ops::EyeNPUKernel<paddle::platform::NPUDeviceContext, | ||
| paddle::platform::float16>); | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| # 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 | ||
| import paddle.fluid.framework as framework | ||
|
|
||
| paddle.enable_static() | ||
| np.random.seed(10) | ||
|
|
||
|
|
||
| class TestEyeOp(OpTest): | ||
| def setUp(self): | ||
| ''' | ||
| Test eye op with specified shape | ||
| ''' | ||
| self.set_npu() | ||
| self.place = paddle.NPUPlace(0) | ||
| self.op_type = "eye" | ||
| self.inputs = {} | ||
|
|
||
| self.num_rows = 0 | ||
| self.num_columns = 0 | ||
| self.dtype = np.float32 | ||
|
|
||
| self.initTestCase() | ||
|
|
||
| if self.num_columns == 0: | ||
| self.attrs = { | ||
| 'num_rows': self.num_rows, | ||
| 'dtype': framework.convert_np_dtype_to_dtype_(self.dtype) | ||
| } | ||
| self.outputs = {'Out': np.eye(self.num_rows, dtype=self.dtype)} | ||
| else: | ||
| self.attrs = { | ||
| 'num_rows': self.num_rows, | ||
| 'num_columns': self.num_columns, | ||
| 'dtype': framework.convert_np_dtype_to_dtype_(self.dtype) | ||
| } | ||
| self.outputs = { | ||
| 'Out': np.eye(self.num_rows, self.num_columns, dtype=self.dtype) | ||
| } | ||
|
|
||
| def initTestCase(self): | ||
| self.num_rows = 219 | ||
| self.num_columns = 319 | ||
| self.dtype = np.int32 | ||
|
|
||
| def set_npu(self): | ||
| self.__class__.use_npu = True | ||
|
|
||
| def test_check_output(self): | ||
| self.check_output_with_place(self.place) | ||
|
|
||
|
|
||
| class TestEyeOp1(TestEyeOp): | ||
| def initTestCase(self): | ||
| self.num_rows = 50 | ||
|
|
||
|
|
||
| class TestEyeOp2(TestEyeOp): | ||
| def initTestCase(self): | ||
| self.num_rows = 50 | ||
| self.dtype = np.int32 | ||
|
|
||
|
|
||
| class TestEyeOp3(TestEyeOp): | ||
| def initTestCase(self): | ||
| self.num_rows = 50 | ||
| self.dtype = np.float16 | ||
|
|
||
|
|
||
| class TestEyeOp4(TestEyeOp): | ||
| def initTestCase(self): | ||
| self.num_rows = 1 | ||
| self.num_columns = 99 | ||
|
|
||
|
|
||
| class TestEyeOp5(TestEyeOp): | ||
| def initTestCase(self): | ||
| self.num_rows = 100 | ||
| self.num_columns = 100 | ||
|
|
||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 少了一个dtype是fp32的单测,另外参考 test_eye_op.py 的 class API_TestTensorEye(unittest.TestCase),增加关于静态图API和动态图API的测试。
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| if __name__ == "__main__": | ||
| unittest.main() | ||

There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个头文件应该是 eye_op.h?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done