diff --git a/paddle/fluid/inference/tensorrt/convert/conv2d_op.cc b/paddle/fluid/inference/tensorrt/convert/conv2d_op.cc index ba47358b147db234b4ad77ba88dec3f55d75c1e5..61199724bcfe30dfcfc0e044a54e49b62d3a0936 100644 --- a/paddle/fluid/inference/tensorrt/convert/conv2d_op.cc +++ b/paddle/fluid/inference/tensorrt/convert/conv2d_op.cc @@ -160,7 +160,7 @@ class Deconv2dOpConverter : public OpConverter { nvinfer1::DimsHW& ksize, TensorRTEngine::Weight& weight, TensorRTEngine::Weight& bias) -> nvinfer1::IDeconvolutionLayer* { auto* layer = - TRT_ENGINE_ADD_LAYER(engine_, Deconvolution, *inputs, n_input, + TRT_ENGINE_ADD_LAYER(engine_, Deconvolution, *inputs, n_output, ksize, weight.get(), bias.get()); return layer; }, diff --git a/paddle/fluid/inference/tensorrt/convert/op_converter.h b/paddle/fluid/inference/tensorrt/convert/op_converter.h index 8de16df0a2f610b30da389bc73e122074d66471e..f72ae2c3ec2d7e013247f294a6f3e6dd4572ae35 100644 --- a/paddle/fluid/inference/tensorrt/convert/op_converter.h +++ b/paddle/fluid/inference/tensorrt/convert/op_converter.h @@ -109,6 +109,12 @@ class OpConverter { it, platform::errors::Unimplemented("no OpConverter for optype [%s]", op_desc.Type())); } + if (op_desc.Type() == "depthwise_conv2d_transpose") { + it = Registry::Global().Lookup("conv2d_transpose"); + PADDLE_ENFORCE_NOT_NULL( + it, platform::errors::Unimplemented("no OpConverter for optype [%s]", + op_desc.Type())); + } if (op_desc.Type() == "transpose2") { it = Registry::Global().Lookup("transpose"); PADDLE_ENFORCE_NOT_NULL( diff --git a/paddle/fluid/inference/tensorrt/op_teller.cc b/paddle/fluid/inference/tensorrt/op_teller.cc index c8dfc169535da01ea7b2afb97f51a8d67b2dfa43..48c7b7fdd0d79dbacd705896aef1c12ac15ccf42 100644 --- a/paddle/fluid/inference/tensorrt/op_teller.cc +++ b/paddle/fluid/inference/tensorrt/op_teller.cc @@ -102,6 +102,7 @@ struct SimpleOpTypeSetTeller : public Teller { "dropout", "prelu", "conv2d_transpose", + "depthwise_conv2d_transpose", "leaky_relu", "fc", "shuffle_channel", @@ -172,7 +173,8 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8, } if (op_type == "conv2d" || op_type == "conv2d_transpose" || - op_type == "conv2d_fusion") { + op_type == "conv2d_fusion" || op_type == "depthwise_conv2d" || + op_type == "depthwise_conv2d_transpose") { std::vector paddings = BOOST_GET_CONST(std::vector, desc.GetAttr("paddings")); @@ -202,7 +204,8 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8, } } - if (op_type == "conv2d_transpose") { + if (op_type == "conv2d_transpose" || + op_type == "depthwise_conv2d_transpose") { if (!desc.HasAttr("dilations")) { return false; } else { diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_trt_conv_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_trt_conv_pass.py index 0821b390e5e6ae08c4791dcaa628c4a48e8d024f..ec3955a9ae1441cdaa4efa5b0e87ff8b74a0b689 100644 --- a/python/paddle/fluid/tests/unittests/ir/inference/test_trt_conv_pass.py +++ b/python/paddle/fluid/tests/unittests/ir/inference/test_trt_conv_pass.py @@ -96,6 +96,7 @@ class TensorRTSubgraphPassConvTransposeTest(InferencePassTest): groups=self.conv_groups, padding=self.conv_padding, bias_attr=False, + use_cudnn=self.use_cudnn, act=None) self.feeds = { "data": np.random.random([1, 6, 64, 64]).astype("float32"), @@ -110,6 +111,7 @@ class TensorRTSubgraphPassConvTransposeTest(InferencePassTest): self.conv_filter_size = 6 self.conv_groups = 1 self.conv_padding = [1, 1] + self.use_cudnn = True def test_check_output(self): if core.is_compiled_with_cuda(): @@ -126,6 +128,7 @@ class TensorRTSubgraphPassConvTransposeValidPaddingTest( self.conv_filter_size = 6 self.conv_groups = 1 self.conv_padding = 'VALID' + self.use_cudnn = True class TensorRTSubgraphPassConvTransposeSamePaddingTest( @@ -135,15 +138,27 @@ class TensorRTSubgraphPassConvTransposeSamePaddingTest( self.conv_filter_size = 6 self.conv_groups = 1 self.conv_padding = 'SAME' + self.use_cudnn = True -class TensorRTSubgraphPassDepthwiseConvTransposeTest( +class TensorRTSubgraphPassConvTransposeMultiGroupTest( TensorRTSubgraphPassConvTransposeTest): def set_params(self): self.conv_num_filters = 6 self.conv_filter_size = 6 - self.conv_groups = 1 + self.conv_groups = 2 + self.conv_padding = [1, 1] + self.use_cudnn = True + + +class TensorRTSubgraphPassDepthwiseConvTransposeTest( + TensorRTSubgraphPassConvTransposeTest): + def set_params(self): + self.conv_num_filters = 6 + self.conv_filter_size = 4 + self.conv_groups = 6 self.conv_padding = [1, 1] + self.use_cudnn = False if __name__ == "__main__":