From c551e55df986948324d08af4db6c80aad6ca58af Mon Sep 17 00:00:00 2001 From: HongyuJia Date: Wed, 9 Nov 2022 20:39:37 +0800 Subject: [PATCH] clean repetitious GetKernelTypeForVar (#47763) --- paddle/fluid/operators/bilateral_slice_op.cc | 8 -------- paddle/fluid/operators/correlation_op.cc | 8 -------- .../operators/fused/fused_bn_activation_op.cc | 8 -------- .../fluid/operators/fused/fused_bn_activation_op.h | 5 ----- paddle/fluid/operators/partial_concat_op.cc | 8 -------- paddle/fluid/operators/put_along_axis_op.cc | 14 -------------- paddle/fluid/operators/take_along_axis_op.cc | 14 -------------- paddle/fluid/operators/transfer_layout_op.cc | 4 +--- 8 files changed, 1 insertion(+), 68 deletions(-) diff --git a/paddle/fluid/operators/bilateral_slice_op.cc b/paddle/fluid/operators/bilateral_slice_op.cc index cfa16d851e9..8b7968d2a88 100644 --- a/paddle/fluid/operators/bilateral_slice_op.cc +++ b/paddle/fluid/operators/bilateral_slice_op.cc @@ -90,14 +90,6 @@ class BilateralSliceOp : public framework::OperatorWithKernel { return framework::OpKernelType( OperatorWithKernel::IndicateVarDataType(ctx, "X"), ctx.GetPlace()); } - - framework::OpKernelType GetKernelTypeForVar( - const std::string& var_name, - const phi::DenseTensor& tensor, - const framework::OpKernelType& expected_kernel_type) const override { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); - } }; class BilateralSliceOpMaker : public framework::OpProtoAndCheckerMaker { diff --git a/paddle/fluid/operators/correlation_op.cc b/paddle/fluid/operators/correlation_op.cc index cbd06ec042c..5587b595cd4 100644 --- a/paddle/fluid/operators/correlation_op.cc +++ b/paddle/fluid/operators/correlation_op.cc @@ -122,14 +122,6 @@ class CorrelationOp : public framework::OperatorWithKernel { "X and Y shoule have the same datatype")); return framework::OpKernelType(input_data_type, ctx.GetPlace()); } - - framework::OpKernelType GetKernelTypeForVar( - const std::string& var_name, - const phi::DenseTensor& tensor, - const framework::OpKernelType& expected_kernel_type) const override { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); - } }; template diff --git a/paddle/fluid/operators/fused/fused_bn_activation_op.cc b/paddle/fluid/operators/fused/fused_bn_activation_op.cc index 92ed4001897..1627f533492 100644 --- a/paddle/fluid/operators/fused/fused_bn_activation_op.cc +++ b/paddle/fluid/operators/fused/fused_bn_activation_op.cc @@ -196,14 +196,6 @@ framework::OpKernelType FusedBatchNormActOp::GetExpectedKernelType( input_data_type, ctx.GetPlace(), layout, library); } -framework::OpKernelType FusedBatchNormActOp::GetKernelTypeForVar( - const std::string &var_name, - const Tensor &tensor, - const framework::OpKernelType &expected_kernel_type) const { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); -} - void FusedBatchNormActOpMaker::Make() { AddAttr("momentum", "").SetDefault(0.9); AddAttr("epsilon", "") diff --git a/paddle/fluid/operators/fused/fused_bn_activation_op.h b/paddle/fluid/operators/fused/fused_bn_activation_op.h index d7e5d236359..f8aab994cb3 100644 --- a/paddle/fluid/operators/fused/fused_bn_activation_op.h +++ b/paddle/fluid/operators/fused/fused_bn_activation_op.h @@ -36,11 +36,6 @@ class FusedBatchNormActOp : public framework::OperatorWithKernel { protected: framework::OpKernelType GetExpectedKernelType( const framework::ExecutionContext& ctx) const override; - - framework::OpKernelType GetKernelTypeForVar( - const std::string& var_name, - const phi::DenseTensor& tensor, - const framework::OpKernelType& expected_kernel_type) const override; }; class FusedBatchNormActGradOp : public framework::OperatorWithKernel { diff --git a/paddle/fluid/operators/partial_concat_op.cc b/paddle/fluid/operators/partial_concat_op.cc index 396c4f2d038..e5a066fdc65 100644 --- a/paddle/fluid/operators/partial_concat_op.cc +++ b/paddle/fluid/operators/partial_concat_op.cc @@ -108,14 +108,6 @@ class PartialConcatOp : public framework::OperatorWithKernel { "All Inputs of PartialSum OP are Empty!")); return framework::OpKernelType(input_data_type, ctx.GetPlace()); } - - framework::OpKernelType GetKernelTypeForVar( - const std::string &var_name, - const Tensor &tensor, - const framework::OpKernelType &expected_kernel_type) const override { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); - } }; class PartialConcatGradOp : public framework::OperatorWithKernel { diff --git a/paddle/fluid/operators/put_along_axis_op.cc b/paddle/fluid/operators/put_along_axis_op.cc index 65fdb470096..551dba6d839 100644 --- a/paddle/fluid/operators/put_along_axis_op.cc +++ b/paddle/fluid/operators/put_along_axis_op.cc @@ -37,13 +37,6 @@ class PutAlongAxisOp : public framework::OperatorWithKernel { OperatorWithKernel::IndicateVarDataType(ctx, "Input"), ctx.device_context()); } - framework::OpKernelType GetKernelTypeForVar( - const std::string& var_name, - const phi::DenseTensor& tensor, - const framework::OpKernelType& expected_kernel_type) const override { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); - } }; class PutAlongAxisOpMaker : public framework::OpProtoAndCheckerMaker { @@ -78,13 +71,6 @@ class PutAlongAxisGradOp : public framework::OperatorWithKernel { ctx, framework::GradVarName("Result")), ctx.device_context()); } - framework::OpKernelType GetKernelTypeForVar( - const std::string& var_name, - const phi::DenseTensor& tensor, - const framework::OpKernelType& expected_kernel_type) const override { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); - } }; template diff --git a/paddle/fluid/operators/take_along_axis_op.cc b/paddle/fluid/operators/take_along_axis_op.cc index 0856645ad67..5e3424a552b 100644 --- a/paddle/fluid/operators/take_along_axis_op.cc +++ b/paddle/fluid/operators/take_along_axis_op.cc @@ -37,13 +37,6 @@ class TakeAlongAxisOp : public framework::OperatorWithKernel { OperatorWithKernel::IndicateVarDataType(ctx, "Input"), ctx.device_context()); } - framework::OpKernelType GetKernelTypeForVar( - const std::string& var_name, - const phi::DenseTensor& tensor, - const framework::OpKernelType& expected_kernel_type) const override { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); - } }; class TakeAlongAxisOpMaker : public framework::OpProtoAndCheckerMaker { @@ -77,13 +70,6 @@ class TakeAlongAxisGradOp : public framework::OperatorWithKernel { ctx, framework::GradVarName("Result")), ctx.device_context()); } - framework::OpKernelType GetKernelTypeForVar( - const std::string& var_name, - const phi::DenseTensor& tensor, - const framework::OpKernelType& expected_kernel_type) const override { - return framework::OpKernelType( - expected_kernel_type.data_type_, tensor.place(), tensor.layout()); - } }; template diff --git a/paddle/fluid/operators/transfer_layout_op.cc b/paddle/fluid/operators/transfer_layout_op.cc index ae1ad94d9f9..ec2411bf100 100644 --- a/paddle/fluid/operators/transfer_layout_op.cc +++ b/paddle/fluid/operators/transfer_layout_op.cc @@ -66,9 +66,7 @@ class TransferLayoutOp : public framework::OperatorWithKernel { const std::string &var_name, const phi::DenseTensor &tensor, const framework::OpKernelType &expected_kernel_type) const override { - return framework::OpKernelType(expected_kernel_type.data_type_, - expected_kernel_type.place_, - expected_kernel_type.data_layout_); + return expected_kernel_type; } }; -- GitLab