diff --git a/paddle/fluid/operators/bilateral_slice_op.cc b/paddle/fluid/operators/bilateral_slice_op.cc index cfa16d851e9be31936084c9fd5afdcf67936d37d..8b7968d2a8839500db906990ef8b2484262a3d8d 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 cbd06ec042c48397241345f133d52fc1177dd6d9..5587b595cd4705c75d57c1f90b656e4a0fb033f2 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 92ed40018971197f5b24be4a7b5a562723214b9d..1627f533492373639dec9dac9a8fb0972f1fe3c0 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 d7e5d236359bd5831e6b9f3e6d170810a7a35541..f8aab994cb3719bcda84bb5c6f6945467269c4df 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 396c4f2d038b7dd877eac2b1e1e7d541436fb836..e5a066fdc6539794511d7645c253654a1a1b0261 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 65fdb4700964a6f98eb987b3aabefb12f89518b0..551dba6d839ed4534db60be78524ecadbee32d63 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 0856645ad67e36073db70c8697753b6208ad01e9..5e3424a552bf924b92622156e6d6abdc9dbe936d 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 ae1ad94d9f978ec4e9b537d6ed7bf7e886787ebe..ec2411bf1000542e71800fc6f5281716e5834cca 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; } };