diff --git a/paddle/fluid/operators/controlflow/compare_op_npu.cc b/paddle/fluid/operators/controlflow/compare_op_npu.cc deleted file mode 100644 index ae6fd8a6fb222f77b1ec01ad0376a5bacf75c7f8..0000000000000000000000000000000000000000 --- a/paddle/fluid/operators/controlflow/compare_op_npu.cc +++ /dev/null @@ -1,193 +0,0 @@ -/* 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/framework/op_registry.h" -#include "paddle/fluid/framework/op_version_registry.h" -#include "paddle/fluid/operators/elementwise/elementwise_op_function.h" - -namespace paddle { -namespace operators { - -template -class EqualNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - out->mutable_data(ctx.GetPlace()); - - const auto& runner = NpuOpRunner("Equal", {*x, *y}, {*out}, {}); - auto stream = - ctx.template device_context() - .stream(); - runner.Run(stream); - } -}; - -template -class NotEqualNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - out->mutable_data(ctx.GetPlace()); - - const auto& runner = NpuOpRunner("NotEqual", {*x, *y}, {*out}, {}); - auto stream = - ctx.template device_context() - .stream(); - runner.Run(stream); - } -}; - -template -class LessThanNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - out->mutable_data(ctx.GetPlace()); - - const auto& runner = NpuOpRunner("Less", {*x, *y}, {*out}, {}); - auto stream = - ctx.template device_context() - .stream(); - runner.Run(stream); - } -}; - -template -class LessEqualNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - out->mutable_data(ctx.GetPlace()); - - const auto& runner = NpuOpRunner("LessEqual", {*x, *y}, {*out}, {}); - auto stream = - ctx.template device_context() - .stream(); - runner.Run(stream); - } -}; - -template -class GreaterThanNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - - out->mutable_data(ctx.GetPlace()); - const auto& runner = NpuOpRunner("Greater", {*x, *y}, {*out}, {}); - auto stream = - ctx.template device_context() - .stream(); - runner.Run(stream); - } -}; - -template -class GreaterEqualNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - - out->mutable_data(ctx.GetPlace()); - const auto& runner = NpuOpRunner("GreaterEqual", {*x, *y}, {*out}, {}); - auto stream = - ctx.template device_context() - .stream(); - runner.Run(stream); - } -}; - -} // namespace operators -} // namespace paddle - -namespace ops = paddle::operators; -namespace plat = paddle::platform; - -REGISTER_OP_NPU_KERNEL( - equal, - ops::EqualNPUKernel, - ops::EqualNPUKernel, - ops::EqualNPUKernel, - ops::EqualNPUKernel, - ops::EqualNPUKernel, - ops::EqualNPUKernel, - ops::EqualNPUKernel, - ops::EqualNPUKernel, - ops::EqualNPUKernel); - -REGISTER_OP_NPU_KERNEL( - not_equal, - ops::NotEqualNPUKernel, - ops::NotEqualNPUKernel, - ops::NotEqualNPUKernel, - ops::NotEqualNPUKernel, - ops::NotEqualNPUKernel, - ops::NotEqualNPUKernel, - ops::NotEqualNPUKernel, - ops::NotEqualNPUKernel); - -REGISTER_OP_NPU_KERNEL( - less_than, - ops::LessThanNPUKernel, - ops::LessThanNPUKernel, - ops::LessThanNPUKernel, - ops::LessThanNPUKernel, - ops::LessThanNPUKernel, - ops::LessThanNPUKernel, - ops::LessThanNPUKernel, - ops::LessThanNPUKernel); - -REGISTER_OP_NPU_KERNEL( - less_equal, - ops::LessEqualNPUKernel, - ops::LessEqualNPUKernel, - ops::LessEqualNPUKernel, - ops::LessEqualNPUKernel, - ops::LessEqualNPUKernel, - ops::LessEqualNPUKernel, - ops::LessEqualNPUKernel, - ops::LessEqualNPUKernel); - -REGISTER_OP_NPU_KERNEL( - greater_than, - ops::GreaterThanNPUKernel, - ops::GreaterThanNPUKernel, - ops::GreaterThanNPUKernel, - ops::GreaterThanNPUKernel, - ops::GreaterThanNPUKernel, - ops::GreaterThanNPUKernel, - ops::GreaterThanNPUKernel, - ops::GreaterThanNPUKernel); - -REGISTER_OP_NPU_KERNEL( - greater_equal, - ops::GreaterEqualNPUKernel, - ops::GreaterEqualNPUKernel, - ops::GreaterEqualNPUKernel, - ops::GreaterEqualNPUKernel, - ops::GreaterEqualNPUKernel, - ops::GreaterEqualNPUKernel, - ops::GreaterEqualNPUKernel); diff --git a/paddle/fluid/operators/controlflow/logical_op_npu.cc b/paddle/fluid/operators/controlflow/logical_op_npu.cc deleted file mode 100644 index de29f3689cd84cd3565e9c3aa00dae5e83d0d2c5..0000000000000000000000000000000000000000 --- a/paddle/fluid/operators/controlflow/logical_op_npu.cc +++ /dev/null @@ -1,86 +0,0 @@ -/* 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/framework/op_registry.h" - -namespace paddle { -namespace operators { - -template -class LogicalNotNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* out = ctx.Output("Out"); - - out->mutable_data(ctx.GetPlace()); - - auto stream = - ctx.template device_context() - .stream(); - - const auto& runner = NpuOpRunner("LogicalNot", {*x}, {*out}, {}); - runner.Run(stream); - } -}; - -template -class LogicalOrNPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - - out->mutable_data(ctx.GetPlace()); - - auto stream = - ctx.template device_context() - .stream(); - - const auto& runner = NpuOpRunner("LogicalOr", {*x, *y}, {*out}, {}); - runner.Run(stream); - } -}; - -template -class LogicalAndPUKernel : public framework::OpKernel { - public: - void Compute(const framework::ExecutionContext& ctx) const override { - auto* x = ctx.Input("X"); - auto* y = ctx.Input("Y"); - auto* out = ctx.Output("Out"); - - out->mutable_data(ctx.GetPlace()); - - auto stream = - ctx.template device_context() - .stream(); - - const auto& runner = NpuOpRunner("LogicalAnd", {*x, *y}, {*out}, {}); - runner.Run(stream); - } -}; - -} // namespace operators -} // namespace paddle - -namespace ops = paddle::operators; -namespace plat = paddle::platform; - -REGISTER_OP_NPU_KERNEL(logical_not, - ops::LogicalNotNPUKernel); - -REGISTER_OP_NPU_KERNEL(logical_or, - ops::LogicalOrNPUKernel); - -REGISTER_OP_NPU_KERNEL(logical_and, - ops::LogicalAndPUKernel);