From 8144a730309d83a1672d3457e2aa5ce7ddb80d6e Mon Sep 17 00:00:00 2001 From: YuanRisheng Date: Thu, 5 Aug 2021 12:42:24 +0800 Subject: [PATCH] [NPU] Support npu op flatten2 (#34579) --- paddle/fluid/operators/flatten_op_npu.cc | 47 +++++++++++ .../unittests/npu/test_flatten2_op_npu.py | 79 +++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 paddle/fluid/operators/flatten_op_npu.cc create mode 100644 python/paddle/fluid/tests/unittests/npu/test_flatten2_op_npu.py diff --git a/paddle/fluid/operators/flatten_op_npu.cc b/paddle/fluid/operators/flatten_op_npu.cc new file mode 100644 index 00000000000..3fe1f041919 --- /dev/null +++ b/paddle/fluid/operators/flatten_op_npu.cc @@ -0,0 +1,47 @@ +// 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/flatten_op.h" +#include "paddle/fluid/operators/npu_op_runner.h" + +namespace paddle { +namespace operators { + +template +class Flatten2NPUKernel : public framework::OpKernel { + public: + void Compute(const framework::ExecutionContext &context) const override { + auto *in = context.Input("X"); + auto *out = context.Output("Out"); + auto &axis = context.Attr("axis"); + out->mutable_data(context.GetPlace(), in->type()); + framework::NPUAttributeMap attr_input = {{"axis", axis}}; + + auto stream = + context.template device_context() + .stream(); + const auto &runner = NpuOpRunner("FlattenV2", {*in}, {*out}, attr_input); + runner.Run(stream); + } +}; +} // namespace operators +} // namespace paddle + +namespace ops = paddle::operators; + +REGISTER_OP_NPU_KERNEL(flatten2, ops::Flatten2NPUKernel, + ops::Flatten2NPUKernel, + ops::Flatten2NPUKernel, + ops::Flatten2NPUKernel, + ops::Flatten2NPUKernel, + ops::Flatten2NPUKernel); diff --git a/python/paddle/fluid/tests/unittests/npu/test_flatten2_op_npu.py b/python/paddle/fluid/tests/unittests/npu/test_flatten2_op_npu.py new file mode 100644 index 00000000000..0fc0d1b7ac4 --- /dev/null +++ b/python/paddle/fluid/tests/unittests/npu/test_flatten2_op_npu.py @@ -0,0 +1,79 @@ +# 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 unittest +import sys +sys.path.append("..") +import numpy as np +import paddle +import paddle.fluid as fluid +from op_test import OpTest +paddle.enable_static() + + +class TestFlatten2Op(OpTest): + def setUp(self): + self.set_npu() + self.op_type = "flatten2" + self.place = paddle.NPUPlace(0) + self.init_test_case() + self.inputs = {"X": np.random.random(self.in_shape).astype("float64")} + self.init_attrs() + self.outputs = { + "Out": self.inputs["X"].reshape(self.new_shape), + "XShape": np.random.random(self.in_shape).astype("float32") + } + + def set_npu(self): + self.__class__.use_npu = True + + def test_check_output(self): + self.check_output_with_place(self.place, no_check_set=["XShape"]) + + def init_test_case(self): + self.in_shape = (3, 2, 4, 5) + self.axis = 1 + self.new_shape = (3, 40) + + def init_attrs(self): + self.attrs = {"axis": self.axis} + + +class TestFlatten2OpWithCornerAxis(TestFlatten2Op): + def init_test_case(self): + self.in_shape = (3, 2, 5, 4) + self.axis = 0 + self.new_shape = (1, 120) + + +class TestFlatten2OpWithDefaultAxis(TestFlatten2Op): + def init_test_case(self): + self.in_shape = (10, 2, 2, 3) + self.new_shape = (10, 12) + + def init_attrs(self): + self.attrs = {} + + +class TestFlatten2OpSixDims(TestFlatten2Op): + def init_test_case(self): + self.in_shape = (3, 2, 3, 2, 4, 4) + self.axis = 4 + self.new_shape = (36, 16) + + +if __name__ == "__main__": + unittest.main() -- GitLab