From 4c53647baf3ffaafa2b6484db73397f1d8de0f55 Mon Sep 17 00:00:00 2001 From: co63oc Date: Wed, 29 May 2024 14:47:34 +0800 Subject: [PATCH] Fix --- paddle/fluid/operators/channel_shuffle_op.cc | 103 ------------------ .../ops_signature/channel_shuffle_sig.cc | 30 ----- .../phi/ops/yaml/legacy/backward_exclude.yaml | 1 - paddle/phi/ops/yaml/legacy/ops_exclude.yaml | 1 - 4 files changed, 135 deletions(-) delete mode 100644 paddle/fluid/operators/channel_shuffle_op.cc delete mode 100644 paddle/fluid/operators/ops_signature/channel_shuffle_sig.cc diff --git a/paddle/fluid/operators/channel_shuffle_op.cc b/paddle/fluid/operators/channel_shuffle_op.cc deleted file mode 100644 index 69f75691a0318..0000000000000 --- a/paddle/fluid/operators/channel_shuffle_op.cc +++ /dev/null @@ -1,103 +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/infershape_utils.h" -#include "paddle/fluid/framework/op_registry.h" -#include "paddle/fluid/framework/op_version_registry.h" -#include "paddle/phi/core/infermeta_utils.h" -#include "paddle/phi/infermeta/backward.h" -#include "paddle/phi/infermeta/unary.h" - -namespace paddle { -namespace operators { - -class ChannelShuffleOp : public framework::OperatorWithKernel { - public: - using framework::OperatorWithKernel::OperatorWithKernel; -}; - -class ChannelShuffleOpMaker : public framework::OpProtoAndCheckerMaker { - public: - void Make() override { - AddInput("X", - "(Tensor, default Tensor), " - "the input feature data of ChannelShuffleOp, the layout is " - "[N, C, H, W] or [N, H, W, C]."); - AddOutput("Out", - "(Tensor, default Tensor), the output of " - "ChannelShuffleOp. The layout is also [N, C, " - "H, W] or [N, H, W, C]."); - AddAttr("groups", "number of groups to divide channels in."); - AddAttr( - "data_format", - "An optional string from: \"NHWC\", \"NCHW\". " - "Defaults to \"NHWC\", Specify the data format of the input data.") - .SetDefault("NCHW"); - - AddComment(R"DOC( - Channel Shuffle operator - This operator divides channels in a tensor of shape :math:`(*, C, H, W)` - into :math:`g` groups and rearranges them as :math:`(*, C/g, g, H, W)` - while keeping the original tensor shape. - - Please refer to the paper: - `ShuffleNet: An Extremely Efficient Convolutional Neural Network for - Mobile Devices `_ - by Zhang et. al (2017) for more details. - - )DOC"); - } -}; - -class ChannelShuffleGradOp : public framework::OperatorWithKernel { - public: - using framework::OperatorWithKernel::OperatorWithKernel; -}; - -template -class ChannelShuffleGradOpMaker : public framework::SingleGradOpMaker { - public: - using framework::SingleGradOpMaker::SingleGradOpMaker; - - protected: - void Apply(GradOpPtr op) const override { - op->SetType("channel_shuffle_grad"); - op->SetInput(framework::GradVarName("Out"), this->OutputGrad("Out")); - op->SetAttrMap(this->Attrs()); - op->SetOutput(framework::GradVarName("X"), this->InputGrad("X")); - } -}; - -} // namespace operators -} // namespace paddle - -namespace ops = paddle::operators; -DECLARE_INFER_SHAPE_FUNCTOR(channel_shuffle, - ChannelShuffleInferShapeFunctor, - PD_INFER_META(phi::ChannelShuffleInferMeta)); - -REGISTER_OPERATOR(channel_shuffle, - ops::ChannelShuffleOp, - ops::ChannelShuffleOpMaker, - ops::ChannelShuffleGradOpMaker, - ops::ChannelShuffleGradOpMaker, - ChannelShuffleInferShapeFunctor); - -DECLARE_INFER_SHAPE_FUNCTOR(channel_shuffle_grad, - ChannelShuffleGradInferShapeFunctor, - PD_INFER_META(phi::ChannelShuffleGradInferMeta)); - -REGISTER_OPERATOR(channel_shuffle_grad, - ops::ChannelShuffleGradOp, - ChannelShuffleGradInferShapeFunctor); diff --git a/paddle/fluid/operators/ops_signature/channel_shuffle_sig.cc b/paddle/fluid/operators/ops_signature/channel_shuffle_sig.cc deleted file mode 100644 index d3bf58bdec3c8..0000000000000 --- a/paddle/fluid/operators/ops_signature/channel_shuffle_sig.cc +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2022 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/phi/core/compat/op_utils.h" - -namespace phi { - -KernelSignature ChannelShuffleGradOpArgumentMapping( - const ArgumentMappingContext& ctx UNUSED) { - return KernelSignature("channel_shuffle_grad", - {"Out@GRAD"}, - {"groups", "data_format"}, - {"X@GRAD"}); -} - -} // namespace phi - -PD_REGISTER_ARG_MAPPING_FN(channel_shuffle_grad, - phi::ChannelShuffleGradOpArgumentMapping); diff --git a/paddle/phi/ops/yaml/legacy/backward_exclude.yaml b/paddle/phi/ops/yaml/legacy/backward_exclude.yaml index 9776b707fa1a2..3cded3e4aa1e9 100644 --- a/paddle/phi/ops/yaml/legacy/backward_exclude.yaml +++ b/paddle/phi/ops/yaml/legacy/backward_exclude.yaml @@ -4,7 +4,6 @@ - amax_grad - amin_grad -- channel_shuffle_grad - conv2d_transpose_double_grad - conv2d_transpose_grad - deformable_conv_grad diff --git a/paddle/phi/ops/yaml/legacy/ops_exclude.yaml b/paddle/phi/ops/yaml/legacy/ops_exclude.yaml index 6b6776fd91ce6..23dc1b22b8f6f 100644 --- a/paddle/phi/ops/yaml/legacy/ops_exclude.yaml +++ b/paddle/phi/ops/yaml/legacy/ops_exclude.yaml @@ -19,7 +19,6 @@ - c_reduce_sum - c_sync_calc_stream - c_sync_comm_stream -- channel_shuffle - conv2d_transpose - conv2d_transpose_bias - copy_to