Skip to content

Commit 101ea9c

Browse files
authored
update tensorrt impls (#78833)
1 parent 04b3ca3 commit 101ea9c

14 files changed

Lines changed: 74 additions & 118 deletions

File tree

python/paddle/tensorrt/impls/activation.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
}
3939

4040

41-
@converter_registry.register("pd_op.relu", trt_version="trt_version_ge=8.0")
42-
@converter_registry.register("pd_op.tanh", trt_version="trt_version_ge=8.0")
43-
@converter_registry.register("pd_op.sigmoid", trt_version="trt_version_ge=8.0")
41+
@converter_registry.register("pd_op.relu")
42+
@converter_registry.register("pd_op.tanh")
43+
@converter_registry.register("pd_op.sigmoid")
4444
def activation_converter(network, paddle_op, inputs):
4545
layer = network.add_activation(
4646
inputs[0], activation_type_map[paddle_op.name()]
@@ -49,9 +49,7 @@ def activation_converter(network, paddle_op, inputs):
4949
return layer.get_output(0)
5050

5151

52-
@converter_registry.register(
53-
"pd_op.logsigmoid", trt_version="trt_version_ge=8.0"
54-
)
52+
@converter_registry.register("pd_op.logsigmoid")
5553
def logsigmoid_converter(network, paddle_op, inputs):
5654
sigmoid_layer = network.add_activation(
5755
inputs[0], trt.ActivationType.SIGMOID
@@ -64,7 +62,7 @@ def logsigmoid_converter(network, paddle_op, inputs):
6462
return layer.get_output(0)
6563

6664

67-
@converter_registry.register("pd_op.relu6", trt_version="trt_version_ge=8.0")
65+
@converter_registry.register("pd_op.relu6")
6866
def relu6_converter(network, paddle_op, inputs):
6967
layer = network.add_activation(inputs[0], trt.ActivationType.CLIP)
7068
layer.alpha = 0.0
@@ -73,7 +71,7 @@ def relu6_converter(network, paddle_op, inputs):
7371
return layer.get_output(0)
7472

7573

76-
@converter_registry.register("pd_op.softmax", trt_version="trt_version_ge=8.0")
74+
@converter_registry.register("pd_op.softmax")
7775
def softmax_converter(network, paddle_op, inputs):
7876
from paddle.tensorrt.util import support_fp32_mix_precision
7977

@@ -126,7 +124,7 @@ def softmax_converter(network, paddle_op, inputs):
126124
return layer.get_output(0)
127125

128126

129-
@converter_registry.register("pd_op.gelu", trt_version="trt_version_ge=8.0")
127+
@converter_registry.register("pd_op.gelu")
130128
def gelu_converter(network, paddle_op, inputs):
131129
input_val = inputs[0]
132130
approximate = paddle_op.attrs()["approximate"]
@@ -261,9 +259,7 @@ def gelu_converter(network, paddle_op, inputs):
261259
return y
262260

263261

264-
@converter_registry.register(
265-
"pd_op.hardsigmoid", trt_version="trt_version_ge=8.0"
266-
)
262+
@converter_registry.register("pd_op.hardsigmoid")
267263
def hardsigmoid_converter(network, paddle_op, inputs):
268264
x = inputs[0]
269265
slope = paddle_op.attrs()["slope"]
@@ -277,9 +273,7 @@ def hardsigmoid_converter(network, paddle_op, inputs):
277273
return hardsigmoid_layer.get_output(0)
278274

279275

280-
@converter_registry.register(
281-
"pd_op.hardswish", trt_version="trt_version_ge=8.0"
282-
)
276+
@converter_registry.register("pd_op.hardswish")
283277
def hardswish_converter(network, paddle_op, inputs):
284278
x = inputs[0]
285279
threshold = 6.0

python/paddle/tensorrt/impls/attribute.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
from paddle.tensorrt.register import converter_registry
1717

1818

19-
@converter_registry.register("pd_op.shape", trt_version="trt_version_ge=8.0")
19+
@converter_registry.register("pd_op.shape")
2020
def shape_converter(network, paddle_op, inputs):
2121
return trt_shape(network, inputs[0], name=[paddle_op.name(), 'trt_shape'])
2222

2323

24-
@converter_registry.register("pd_op.shape64", trt_version="trt_version_ge=8.0")
24+
@converter_registry.register("pd_op.shape64")
2525
def shape64_converter(network, paddle_op, inputs):
2626
input_tensor = inputs[0]
2727
shape_layer = network.add_shape(input_tensor)

python/paddle/tensorrt/impls/common.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ def dropout_converter(network, paddle_op, inputs):
5858
return scale_layer.get_output(0)
5959

6060

61-
@converter_registry.register(
62-
"pd_op.bilinear_interp", trt_version="trt_version_ge=8.0"
63-
)
61+
@converter_registry.register("pd_op.bilinear_interp")
6462
def bilinear_interp_converter(network, paddle_op, inputs):
6563
input_tensor = inputs[0]
6664
input_shape_tensor = network.add_shape(input_tensor)
@@ -275,9 +273,7 @@ def bilinear_interp_converter(network, paddle_op, inputs):
275273
return resize_layer.get_output(0)
276274

277275

278-
@converter_registry.register(
279-
"pd_op.embedding", trt_version="trt_version_ge=8.0"
280-
)
276+
@converter_registry.register("pd_op.embedding")
281277
def embedding_converter(network, paddle_op, inputs):
282278
x = inputs[0]
283279
weight = inputs[1]
@@ -286,7 +282,7 @@ def embedding_converter(network, paddle_op, inputs):
286282
return gather_layer.get_output(0)
287283

288284

289-
@converter_registry.register("pd_op.unbind", trt_version="trt_version_ge=8.0")
285+
@converter_registry.register("pd_op.unbind")
290286
def unbind_converter(network, paddle_op, inputs):
291287
x = inputs[0]
292288
input_shape = x.shape
@@ -361,9 +357,7 @@ def unbind_converter(network, paddle_op, inputs):
361357
return outputs
362358

363359

364-
@converter_registry.register(
365-
"pd_op.nearest_interp", trt_version="trt_version_ge=8.0"
366-
)
360+
@converter_registry.register("pd_op.nearest_interp")
367361
def nearest_interp_converter(network, paddle_op, inputs):
368362
input_tensor = inputs[0]
369363
input_shape_tensor = network.add_shape(input_tensor)
@@ -468,9 +462,7 @@ def nearest_interp_converter(network, paddle_op, inputs):
468462
return resize_layer.get_output(0)
469463

470464

471-
@converter_registry.register(
472-
"pd_op.linear_interp", trt_version="trt_version_ge=8.0"
473-
)
465+
@converter_registry.register("pd_op.linear_interp")
474466
def linear_interp_converter(network, paddle_op, inputs):
475467
input_tensor = inputs[0]
476468
data_layout = paddle_op.attrs().get("data_format")

python/paddle/tensorrt/impls/conv.py

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,16 @@
2020
from paddle.tensorrt.register import converter_registry
2121

2222

23-
@converter_registry.register(
24-
"pd_op.depthwise_conv2d", trt_version="trt_version_ge=8.0"
25-
)
26-
@converter_registry.register("pd_op.conv2d", trt_version="trt_version_ge=8.0")
27-
@converter_registry.register(
28-
"pd_op.fused_conv2d_add_act", trt_version="trt_version_ge=8.0"
29-
)
30-
@converter_registry.register(
31-
"pd_op.conv2d_transpose", trt_version="trt_version_ge=8.0"
32-
)
33-
@converter_registry.register(
34-
"pd_op.depthwise_conv2d_transpose", trt_version="trt_version_ge=8.0"
35-
)
23+
@converter_registry.register("pd_op.depthwise_conv2d")
24+
@converter_registry.register("pd_op.conv2d")
25+
@converter_registry.register("pd_op.fused_conv2d_add_act")
26+
@converter_registry.register("pd_op.conv2d_transpose")
27+
@converter_registry.register("pd_op.depthwise_conv2d_transpose")
3628
def conv2d_converter(network, paddle_op, inputs):
3729
return convert_conv2d(network, paddle_op, inputs)
3830

3931

40-
@converter_registry.register(
41-
"pd_op.conv3d_transpose", trt_version="trt_version_ge=8.0"
42-
)
43-
@converter_registry.register("pd_op.conv3d", trt_version="trt_version_ge=8.0")
32+
@converter_registry.register("pd_op.conv3d_transpose")
33+
@converter_registry.register("pd_op.conv3d")
4434
def conv3d_converter(network, paddle_op, inputs):
4535
return convert_conv3d(network, paddle_op, inputs)

python/paddle/tensorrt/impls/creation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
from paddle.tensorrt.register import converter_registry
3636

3737

38-
@converter_registry.register(
39-
"pd_op.full_int_array", trt_version="trt_version_ge=8.0"
40-
)
38+
@converter_registry.register("pd_op.full_int_array")
4139
def full_int_array_converter(network, paddle_op, inputs):
4240
value = paddle_op.attrs()["value"]
4341
if len(value) == 0:
@@ -48,7 +46,7 @@ def full_int_array_converter(network, paddle_op, inputs):
4846
return full_int_array_layer.get_output(0)
4947

5048

51-
@converter_registry.register("pd_op.full", trt_version="trt_version_ge=8.0")
49+
@converter_registry.register("pd_op.full")
5250
def full_converter(network, paddle_op, inputs):
5351
shape = paddle_op.attrs()["shape"]
5452
value = paddle_op.attrs().get("value", 1.0)

python/paddle/tensorrt/impls/linalg.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from paddle.tensorrt.util import support_fp32_mix_precision
2828

2929

30-
@converter_registry.register("pd_op.matmul", trt_version="trt_version_ge=8.0")
30+
@converter_registry.register("pd_op.matmul")
3131
def matmul_converter(network, paddle_op, inputs):
3232
weight_shape = paddle_op.operands()[1].source().shape
3333
transpose_x = paddle_op.attrs()["transpose_x"]
@@ -71,9 +71,7 @@ def matmul_converter(network, paddle_op, inputs):
7171
return out.get_output(0)
7272

7373

74-
@converter_registry.register(
75-
"pd_op.transpose", trt_version="trt_version_ge=8.0"
76-
)
74+
@converter_registry.register("pd_op.transpose")
7775
def transpose_converter(network, paddle_op, inputs):
7876
perm = paddle_op.attrs()["perm"]
7977
transposed_tensor = network.add_shuffle(inputs[0])

python/paddle/tensorrt/impls/manipulation.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
from ..util import get_trt_version_list
4848

4949

50-
@converter_registry.register("pd_op.reshape", trt_version="trt_version_ge=8.0")
50+
@converter_registry.register("pd_op.reshape")
5151
def reshape_converter(network, paddle_op, inputs):
5252
x = inputs[0]
5353
is_constant_shape = False
@@ -112,7 +112,7 @@ def gather_nd_converter(network, paddle_op, inputs):
112112
return non_zero_layer.get_output(0)
113113

114114

115-
@converter_registry.register("pd_op.flatten", trt_version="trt_version_ge=8.0")
115+
@converter_registry.register("pd_op.flatten")
116116
def flatten_converter(network, paddle_op, inputs):
117117
input_val = inputs[0]
118118
input_val_shape = paddle_op.operands()[0].source().shape
@@ -199,7 +199,7 @@ def flatten_converter(network, paddle_op, inputs):
199199

200200

201201
# In the converter, pd_op.concat has three inputs, because builtin.combine has two inputs.
202-
@converter_registry.register("pd_op.concat", trt_version="trt_version_ge=8.0")
202+
@converter_registry.register("pd_op.concat")
203203
def concat_converter(network, paddle_op, inputs):
204204
input_tensors = inputs[0]
205205
axis_tensor = inputs[1]
@@ -215,12 +215,8 @@ def concat_converter(network, paddle_op, inputs):
215215
return concat_layer.get_output(0)
216216

217217

218-
@converter_registry.register(
219-
"pd_op.unsqueeze", trt_version="trt_version_ge=8.0"
220-
)
221-
@converter_registry.register(
222-
"pd_op.unsqueeze_", trt_version="trt_version_ge=8.0"
223-
)
218+
@converter_registry.register("pd_op.unsqueeze")
219+
@converter_registry.register("pd_op.unsqueeze_")
224220
def unsqueeze_converter(network, paddle_op, inputs):
225221
x = inputs[0]
226222
input_dims = x.shape
@@ -277,8 +273,8 @@ def unsqueeze_converter(network, paddle_op, inputs):
277273
return layer.get_output(0)
278274

279275

280-
@converter_registry.register("pd_op.squeeze", trt_version="trt_version_ge=8.0")
281-
@converter_registry.register("pd_op.squeeze_", trt_version="trt_version_ge=8.0")
276+
@converter_registry.register("pd_op.squeeze")
277+
@converter_registry.register("pd_op.squeeze_")
282278
def squeeze_converter(network, paddle_op, inputs):
283279
input_val = inputs[0]
284280
input_shape = input_val.shape
@@ -342,7 +338,7 @@ def squeeze_converter(network, paddle_op, inputs):
342338
return layer.get_output(0)
343339

344340

345-
@converter_registry.register("pd_op.expand", trt_version="trt_version_ge=8.0")
341+
@converter_registry.register("pd_op.expand")
346342
def expand_converter(network, paddle_op, inputs):
347343
input = inputs[0]
348344
input_dims = input.shape
@@ -374,9 +370,7 @@ def expand_converter(network, paddle_op, inputs):
374370
)
375371

376372

377-
@converter_registry.register(
378-
"pd_op.expand_as", trt_version="trt_version_ge=8.0"
379-
)
373+
@converter_registry.register("pd_op.expand_as")
380374
def expand_as_converter(network, paddle_op, inputs):
381375
input = inputs[0]
382376
input_dims = input.shape
@@ -434,7 +428,7 @@ def cast_converter(network, paddle_op, inputs):
434428
return cast_layer.get_output(0)
435429

436430

437-
@converter_registry.register("pd_op.slice", trt_version="trt_version_ge=8.0")
431+
@converter_registry.register("pd_op.slice")
438432
def slice_converter(network, paddle_op, inputs):
439433
input_tensor = inputs[0]
440434
axes = paddle_op.attrs()["axes"]

python/paddle/tensorrt/impls/math.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
from paddle.tensorrt.register import converter_registry
4141

4242

43-
@converter_registry.register("pd_op.add", trt_version="trt_version_ge=8.0")
44-
@converter_registry.register("pd_op.add_", trt_version="trt_version_ge=8.0")
43+
@converter_registry.register("pd_op.add")
44+
@converter_registry.register("pd_op.add_")
4545
def add_converter(network, paddle_op, inputs):
4646
return add_elementwise_layer(
4747
network, paddle_op, inputs, trt.ElementWiseOperation.SUM
4848
)
4949

5050

51-
@converter_registry.register("pd_op.scale", trt_version="trt_version_ge=8.0")
51+
@converter_registry.register("pd_op.scale")
5252
def scale_converter(network, paddle_op, inputs):
5353
x = inputs[0]
5454
bias = paddle_op.attrs().get("bias", 0.0)
@@ -152,7 +152,7 @@ def scale_converter(network, paddle_op, inputs):
152152
return layer.get_output(0)
153153

154154

155-
@converter_registry.register("pd_op.max", trt_version="trt_version_ge=8.0")
155+
@converter_registry.register("pd_op.max")
156156
def max_converter(network, paddle_op, inputs):
157157
input_tensor = inputs[0]
158158
axis = get_input_constant_value(paddle_op, inputs, 1)
@@ -178,21 +178,21 @@ def max_converter(network, paddle_op, inputs):
178178
return layer.get_output(0)
179179

180180

181-
@converter_registry.register("pd_op.divide", trt_version="trt_version_ge=8.0")
181+
@converter_registry.register("pd_op.divide")
182182
def divide_converter(network, paddle_op, inputs):
183183
return add_elementwise_layer(
184184
network, paddle_op, inputs, trt.ElementWiseOperation.DIV
185185
)
186186

187187

188-
@converter_registry.register("pd_op.subtract", trt_version="trt_version_ge=8.0")
188+
@converter_registry.register("pd_op.subtract")
189189
def subtract_converter(network, paddle_op, inputs):
190190
return add_elementwise_layer(
191191
network, paddle_op, inputs, trt.ElementWiseOperation.SUB
192192
)
193193

194194

195-
@converter_registry.register("pd_op.multiply", trt_version="trt_version_ge=8.0")
195+
@converter_registry.register("pd_op.multiply")
196196
def multiply_converter(network, paddle_op, inputs):
197197
return add_elementwise_layer(
198198
network, paddle_op, inputs, trt.ElementWiseOperation.PROD
@@ -257,7 +257,7 @@ def _get_constant_or_expand_tensor(
257257
return layer.get_output(0)
258258

259259

260-
@converter_registry.register("pd_op.pow", trt_version="trt_version_ge=8.0")
260+
@converter_registry.register("pd_op.pow")
261261
def pow_converter(network, paddle_op, inputs):
262262
from paddle.tensorrt.util import support_fp32_mix_precision
263263

python/paddle/tensorrt/impls/norm.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,8 @@ def layernorm_converter(network, paddle_op, inputs):
9494
return layer_norm.get_output(0)
9595

9696

97-
@converter_registry.register(
98-
"pd_op.batch_norm", trt_version="trt_version_ge=8.0"
99-
)
100-
@converter_registry.register(
101-
"pd_op.batch_norm_", trt_version="trt_version_ge=8.0"
102-
)
97+
@converter_registry.register("pd_op.batch_norm")
98+
@converter_registry.register("pd_op.batch_norm_")
10399
def batch_norm_converter(network, paddle_op, inputs):
104100
constant_manager = TensorRTConstantManager()
105101
refit_manager = RefitManager()
@@ -207,9 +203,7 @@ def batch_norm_converter(network, paddle_op, inputs):
207203
return batch_norm_layer.get_output(0)
208204

209205

210-
@converter_registry.register(
211-
"pd_op.instance_norm", trt_version="trt_version_ge=8.0"
212-
)
206+
@converter_registry.register("pd_op.instance_norm")
213207
def instance_norm_converter(network, paddle_op, inputs):
214208
eps = paddle_op.attrs().get("epsilon", 1e-8)
215209
instance_norm_inputs = [inputs[0], inputs[1], inputs[2]]

0 commit comments

Comments
 (0)