-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
[NPU] Add size npu op #34636
Merged
Merged
[NPU] Add size npu op #34636
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
57e6cdd
add size npu op
0x45f 8dc7291
modify support data type
0x45f a7e1350
no longer use NPU size OP
0x45f 855eb18
remove useless comments, add test case
0x45f 66bafec
Merge branch 'develop' into add_size_op_npu
0x45f bcdd990
fix copyright, remove useless include
0x45f File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
// 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 <memory> | ||
#include <string> | ||
|
||
#include "paddle/fluid/operators/mul_op.h" | ||
#include "paddle/fluid/operators/npu_op_runner.h" | ||
|
||
namespace paddle { | ||
namespace operators { | ||
|
||
template <typename DeviceContext, typename T> | ||
class SizeNPUKernel : public framework::OpKernel<T> { | ||
public: | ||
void Compute(const framework::ExecutionContext& ctx) const override { | ||
auto* x = ctx.Input<framework::Tensor>("Input"); | ||
auto* out = ctx.Output<framework::Tensor>("Out"); | ||
out->mutable_data<T>(ctx.GetPlace()); | ||
|
||
Tensor cpu_tensor; | ||
auto cpu_data = | ||
cpu_tensor.mutable_data<int64_t>(out->dims(), platform::CPUPlace()); | ||
cpu_data[0] = x->numel(); | ||
TensorCopy(cpu_tensor, ctx.GetPlace(), | ||
ctx.template device_context<platform::DeviceContext>(), out); | ||
ctx.template device_context<paddle::platform::NPUDeviceContext>().Wait(); | ||
} | ||
}; | ||
|
||
} // namespace operators | ||
} // namespace paddle | ||
|
||
namespace ops = paddle::operators; | ||
|
||
REGISTER_OP_NPU_KERNEL( | ||
size, ops::SizeNPUKernel<paddle::platform::NPUDeviceContext, int>, | ||
ops::SizeNPUKernel<paddle::platform::NPUDeviceContext, int64_t>, | ||
ops::SizeNPUKernel<paddle::platform::NPUDeviceContext, | ||
paddle::platform::float16>, | ||
ops::SizeNPUKernel<paddle::platform::NPUDeviceContext, float>, | ||
ops::SizeNPUKernel<paddle::platform::NPUDeviceContext, double>, | ||
ops::SizeNPUKernel<paddle::platform::NPUDeviceContext, bool>); |
141 changes: 141 additions & 0 deletions
141
python/paddle/fluid/tests/unittests/npu/test_size_op_npu.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved. | ||
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. 2019 -> 2021 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. done |
||
# | ||
# 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. | ||
|
||
import unittest | ||
import numpy as np | ||
import sys | ||
sys.path.append("..") | ||
import paddle | ||
import paddle.fluid as fluid | ||
from op_test import OpTest | ||
|
||
paddle.enable_static() | ||
|
||
|
||
class TestSizeOp(OpTest): | ||
def setUp(self): | ||
self.set_npu() | ||
self.place = paddle.NPUPlace(0) | ||
self.op_type = "size" | ||
|
||
self.config() | ||
input = np.zeros(self.shape, dtype=self.dtype) | ||
self.inputs = {'Input': input} | ||
self.outputs = {'Out': np.array([np.size(input)], dtype=np.int64)} | ||
|
||
def config(self): | ||
self.shape = [1, 2] | ||
self.dtype = np.int32 | ||
|
||
def test_check_output(self): | ||
self.check_output_with_place(self.place) | ||
|
||
def set_npu(self): | ||
self.__class__.use_npu = True | ||
|
||
|
||
class TestSizeOp1(TestSizeOp): | ||
def config(self): | ||
self.shape = [2] | ||
self.dtype = np.float64 | ||
|
||
|
||
class TestSizeOp2(TestSizeOp): | ||
def config(self): | ||
self.shape = [2, 3] | ||
self.dtype = np.float32 | ||
|
||
|
||
class TestSizeOp3(TestSizeOp): | ||
def config(self): | ||
self.shape = [2, 3, 100] | ||
self.dtype = np.float16 | ||
|
||
|
||
class TestSizeOp4(TestSizeOp): | ||
def config(self): | ||
self.shape = [2**10] | ||
self.dtype = np.bool | ||
|
||
|
||
class TestSizeOp5(TestSizeOp): | ||
def config(self): | ||
self.shape = [7, 8, 9, 10] | ||
self.dtype = np.int64 | ||
|
||
|
||
class TestSizeOp6(TestSizeOp): | ||
def config(self): | ||
self.shape = [] | ||
self.dtype = np.int64 | ||
|
||
|
||
class TestSizeAPI(unittest.TestCase): | ||
def setUp(self): | ||
self.set_npu() | ||
self.place = paddle.NPUPlace(0) | ||
|
||
def set_npu(self): | ||
self.__class__.use_npu = True | ||
|
||
def test_size_static(self): | ||
main_program = fluid.Program() | ||
startup_program = fluid.Program() | ||
with fluid.program_guard(main_program, startup_program): | ||
shape1 = [2, 1, 4, 5] | ||
shape2 = [1, 4, 5] | ||
x_1 = paddle.fluid.data(shape=shape1, dtype='int32', name='x_1') | ||
x_2 = paddle.fluid.data(shape=shape2, dtype='int32', name='x_2') | ||
input_1 = np.random.random(shape1).astype("int32") | ||
input_2 = np.random.random(shape2).astype("int32") | ||
out_1 = paddle.fluid.layers.size(x_1) | ||
out_2 = paddle.fluid.layers.size(x_2) | ||
exe = paddle.static.Executor(place=self.place) | ||
res_1, res_2 = exe.run(feed={ | ||
"x_1": input_1, | ||
"x_2": input_2, | ||
}, | ||
fetch_list=[out_1, out_2]) | ||
assert (np.array_equal( | ||
res_1, np.array([np.size(input_1)]).astype("int64"))) | ||
assert (np.array_equal( | ||
res_2, np.array([np.size(input_2)]).astype("int64"))) | ||
|
||
def test_size_imperative(self): | ||
paddle.disable_static(self.place) | ||
input_1 = np.random.random([2, 1, 4, 5]).astype("int32") | ||
input_2 = np.random.random([1, 4, 5]).astype("int32") | ||
x_1 = paddle.to_tensor(input_1) | ||
x_2 = paddle.to_tensor(input_2) | ||
out_1 = paddle.fluid.layers.size(x_1) | ||
out_2 = paddle.fluid.layers.size(x_2) | ||
assert (np.array_equal(out_1.numpy().item(0), np.size(input_1))) | ||
assert (np.array_equal(out_2.numpy().item(0), np.size(input_2))) | ||
paddle.enable_static() | ||
|
||
def test_error(self): | ||
main_program = fluid.Program() | ||
startup_program = fluid.Program() | ||
with fluid.program_guard(main_program, startup_program): | ||
|
||
def test_x_type(): | ||
shape = [1, 4, 5] | ||
input_1 = np.random.random(shape).astype("int32") | ||
out_1 = paddle.fluid.layers.size(input_1) | ||
|
||
self.assertRaises(TypeError, test_x_type) | ||
|
||
|
||
if __name__ == '__main__': | ||
unittest.main() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
wny we need #include <string> ?
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.
removed