diff --git a/paddle/fluid/operators/conv_op.cc b/paddle/fluid/operators/conv_op.cc index e7189e569ef790e52e01dc1a143693f30794e46c..14ad48616c8087d1172014cac8c3959bf5fe83dd 100644 --- a/paddle/fluid/operators/conv_op.cc +++ b/paddle/fluid/operators/conv_op.cc @@ -227,15 +227,6 @@ framework::OpKernelType ConvOp::GetExpectedKernelType( } #endif // PADDLE_WITH_CUDA || PADDLE_WITH_HIP -#ifdef PADDLE_WITH_MKLDNN - if (this->CanMKLDNNBeUsed(ctx, input_data_type)) { - return framework::OpKernelType(input_data_type, - ctx.GetPlace(), - phi::DataLayout::kMKLDNN, - framework::LibraryType::kMKLDNN); - } -#endif - return framework::OpKernelType(input_data_type, ctx.GetPlace()); } @@ -494,14 +485,6 @@ framework::OpKernelType ConvOpGrad::GetExpectedKernelType( framework::LibraryType::kCUDNN); } #endif -#ifdef PADDLE_WITH_MKLDNN - if (this->CanMKLDNNBeUsed(ctx, data_type)) { - return framework::OpKernelType(data_type, - ctx.GetPlace(), - phi::DataLayout::kMKLDNN, - framework::LibraryType::kMKLDNN); - } -#endif return framework::OpKernelType(data_type, ctx.GetPlace()); } @@ -673,24 +656,16 @@ void ConvOpDoubleGrad::InferShape(framework::InferShapeContext* ctx) const { framework::OpKernelType ConvOpDoubleGrad::GetExpectedKernelType( const framework::ExecutionContext& ctx) const { - int customized_type_value = - framework::OpKernelType::kDefaultCustomizedTypeValue; - framework::LibraryType library_{framework::LibraryType::kPlain}; - std::string data_format = "AnyLayout"; - phi::DataLayout layout_ = phi::StringToDataLayout(data_format); - + auto data_type = OperatorWithKernel::IndicateVarDataType(ctx, "Input"); #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) if (platform::CanCUDNNBeUsed(ctx)) { - library_ = framework::LibraryType::kCUDNN; + return framework::OpKernelType(data_type, + ctx.GetPlace(), + framework::DataLayout::kAnyLayout, + framework::LibraryType::kCUDNN); } #endif - auto type = framework::OpKernelType( - OperatorWithKernel::IndicateVarDataType(ctx, "Input"), - ctx.GetPlace(), - layout_, - library_, - customized_type_value); - return type; + return framework::OpKernelType(data_type, ctx.GetPlace()); } } // namespace operators diff --git a/paddle/fluid/platform/mkldnn_op_list.h b/paddle/fluid/platform/mkldnn_op_list.h index 376aa35f2bb8d11fc43d416dd25c7a2561f4a901..b9fab4a699c533dddd625b9f92010c0aaba799a7 100644 --- a/paddle/fluid/platform/mkldnn_op_list.h +++ b/paddle/fluid/platform/mkldnn_op_list.h @@ -69,12 +69,6 @@ static const std::unordered_set mkldnn_white_list = { "reduce_sum_grad", // NOTE(jiahongyu): Below ops register kernel with customized_type_value, we // need to analysis and solve them one-by-one. - "conv2d", - "conv2d_grad", - "depthwise_conv2d", - "depthwise_conv2d_grad", - "conv3d", - "conv3d_grad", "prior_box", "fc", "mul",