Skip to content

Commit aabfe0f

Browse files
gouzilgouzil
authored
[CodeStyle] black -> ruff format migration - part 18 (#74672)
1 parent 534c59a commit aabfe0f

18 files changed

+420
-263
lines changed

‎test/ir/inference/test_trt_convert_anchor_generator.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,27 +111,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
111111
if not run_pir:
112112
self.trt_param.precision = paddle_infer.PrecisionType.Float32
113113
program_config.set_input_type(np.float32)
114-
yield self.create_inference_config(), generate_trt_nodes_num(
115-
attrs, False
116-
), 1e-5
114+
yield (
115+
self.create_inference_config(),
116+
generate_trt_nodes_num(attrs, False),
117+
1e-5,
118+
)
117119
self.trt_param.precision = paddle_infer.PrecisionType.Half
118120
# NOTE(tizheng): This config will fall back to paddle native OP,
119121
# which only supports FP32 input.
120122
program_config.set_input_type(np.float32)
121-
yield self.create_inference_config(), generate_trt_nodes_num(
122-
attrs, False
123-
), 1e-3
123+
yield (
124+
self.create_inference_config(),
125+
generate_trt_nodes_num(attrs, False),
126+
1e-3,
127+
)
124128

125129
# for dynamic_shape
126130
self.generate_dynamic_shape(attrs)
127131
self.trt_param.precision = paddle_infer.PrecisionType.Float32
128-
yield self.create_inference_config(), generate_trt_nodes_num(
129-
attrs, True
130-
), 1e-5
132+
yield (
133+
self.create_inference_config(),
134+
generate_trt_nodes_num(attrs, True),
135+
1e-5,
136+
)
131137
self.trt_param.precision = paddle_infer.PrecisionType.Half
132-
yield self.create_inference_config(), generate_trt_nodes_num(
133-
attrs, True
134-
), 1e-3
138+
yield (
139+
self.create_inference_config(),
140+
generate_trt_nodes_num(attrs, True),
141+
1e-3,
142+
)
135143

136144
def test(self):
137145
self.run_test(run_pir=True)

‎test/ir/inference/test_trt_convert_arg_max.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
119119
clear_dynamic_shape()
120120
self.trt_param.precision = paddle_infer.PrecisionType.Float32
121121
program_config.set_input_type(np.float32)
122-
yield self.create_inference_config(), generate_trt_nodes_num(
123-
attrs, False
124-
), 1e-5
122+
yield (
123+
self.create_inference_config(),
124+
generate_trt_nodes_num(attrs, False),
125+
1e-5,
126+
)
125127
self.trt_param.precision = paddle_infer.PrecisionType.Half
126128
program_config.set_input_type(np.float16)
127-
yield self.create_inference_config(), generate_trt_nodes_num(
128-
attrs, False
129-
), 1e-3
129+
yield (
130+
self.create_inference_config(),
131+
generate_trt_nodes_num(attrs, False),
132+
1e-3,
133+
)
130134

131135
# for dynamic_shape
132136
generate_dynamic_shape(attrs)
133137
self.trt_param.precision = paddle_infer.PrecisionType.Float32
134138
program_config.set_input_type(np.float32)
135-
yield self.create_inference_config(), generate_trt_nodes_num(
136-
attrs, True
137-
), 1e-5
139+
yield (
140+
self.create_inference_config(),
141+
generate_trt_nodes_num(attrs, True),
142+
1e-5,
143+
)
138144
self.trt_param.precision = paddle_infer.PrecisionType.Half
139145
program_config.set_input_type(np.float16)
140-
yield self.create_inference_config(), generate_trt_nodes_num(
141-
attrs, True
142-
), 1e-3
146+
yield (
147+
self.create_inference_config(),
148+
generate_trt_nodes_num(attrs, True),
149+
1e-3,
150+
)
143151

144152
def test(self):
145153
self.run_test()

‎test/ir/inference/test_trt_convert_arg_min.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
119119
clear_dynamic_shape()
120120
self.trt_param.precision = paddle_infer.PrecisionType.Float32
121121
program_config.set_input_type(np.float32)
122-
yield self.create_inference_config(), generate_trt_nodes_num(
123-
attrs, False
124-
), 1e-5
122+
yield (
123+
self.create_inference_config(),
124+
generate_trt_nodes_num(attrs, False),
125+
1e-5,
126+
)
125127
self.trt_param.precision = paddle_infer.PrecisionType.Half
126128
program_config.set_input_type(np.float16)
127-
yield self.create_inference_config(), generate_trt_nodes_num(
128-
attrs, False
129-
), 1e-3
129+
yield (
130+
self.create_inference_config(),
131+
generate_trt_nodes_num(attrs, False),
132+
1e-3,
133+
)
130134

131135
# for dynamic_shape
132136
generate_dynamic_shape(attrs)
133137
self.trt_param.precision = paddle_infer.PrecisionType.Float32
134138
program_config.set_input_type(np.float32)
135-
yield self.create_inference_config(), generate_trt_nodes_num(
136-
attrs, True
137-
), 1e-5
139+
yield (
140+
self.create_inference_config(),
141+
generate_trt_nodes_num(attrs, True),
142+
1e-5,
143+
)
138144
self.trt_param.precision = paddle_infer.PrecisionType.Half
139145
program_config.set_input_type(np.float16)
140-
yield self.create_inference_config(), generate_trt_nodes_num(
141-
attrs, True
142-
), 1e-3
146+
yield (
147+
self.create_inference_config(),
148+
generate_trt_nodes_num(attrs, True),
149+
1e-3,
150+
)
143151

144152
def test(self):
145153
self.run_test()

‎test/ir/inference/test_trt_convert_assign.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,27 +128,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
128128
clear_dynamic_shape()
129129
self.trt_param.precision = paddle_infer.PrecisionType.Float32
130130
program_config.set_input_type(np.float32)
131-
yield self.create_inference_config(), generate_trt_nodes_num(
132-
attrs, False
133-
), 1e-5
131+
yield (
132+
self.create_inference_config(),
133+
generate_trt_nodes_num(attrs, False),
134+
1e-5,
135+
)
134136
self.trt_param.precision = paddle_infer.PrecisionType.Half
135137
program_config.set_input_type(np.float16)
136-
yield self.create_inference_config(), generate_trt_nodes_num(
137-
attrs, False
138-
), 1e-2
138+
yield (
139+
self.create_inference_config(),
140+
generate_trt_nodes_num(attrs, False),
141+
1e-2,
142+
)
139143

140144
# for dynamic_shape
141145
self.generate_dynamic_shape(attrs)
142146
self.trt_param.precision = paddle_infer.PrecisionType.Float32
143147
program_config.set_input_type(np.float32)
144-
yield self.create_inference_config(), generate_trt_nodes_num(
145-
attrs, True
146-
), 1e-5
148+
yield (
149+
self.create_inference_config(),
150+
generate_trt_nodes_num(attrs, True),
151+
1e-5,
152+
)
147153
self.trt_param.precision = paddle_infer.PrecisionType.Half
148154
program_config.set_input_type(np.float16)
149-
yield self.create_inference_config(), generate_trt_nodes_num(
150-
attrs, True
151-
), 1e-2
155+
yield (
156+
self.create_inference_config(),
157+
generate_trt_nodes_num(attrs, True),
158+
1e-2,
159+
)
152160

153161
def test(self):
154162
# test for old ir

‎test/ir/inference/test_trt_convert_batch_norm.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,27 +221,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
221221
clear_dynamic_shape()
222222
self.trt_param.precision = paddle_infer.PrecisionType.Float32
223223
program_config.set_input_type(np.float32)
224-
yield self.create_inference_config(), generate_trt_nodes_num(
225-
attrs, False
226-
), 1e-5
224+
yield (
225+
self.create_inference_config(),
226+
generate_trt_nodes_num(attrs, False),
227+
1e-5,
228+
)
227229
self.trt_param.precision = paddle_infer.PrecisionType.Half
228230
program_config.set_input_type(np.float16)
229-
yield self.create_inference_config(), generate_trt_nodes_num(
230-
attrs, False
231-
), (1e-3, 1e-3)
231+
yield (
232+
self.create_inference_config(),
233+
generate_trt_nodes_num(attrs, False),
234+
(1e-3, 1e-3),
235+
)
232236

233237
# for dynamic_shape
234238
generate_dynamic_shape(attrs)
235239
self.trt_param.precision = paddle_infer.PrecisionType.Float32
236240
program_config.set_input_type(np.float32)
237-
yield self.create_inference_config(), generate_trt_nodes_num(
238-
attrs, True
239-
), 1e-5
241+
yield (
242+
self.create_inference_config(),
243+
generate_trt_nodes_num(attrs, True),
244+
1e-5,
245+
)
240246
self.trt_param.precision = paddle_infer.PrecisionType.Half
241247
program_config.set_input_type(np.float16)
242-
yield self.create_inference_config(), generate_trt_nodes_num(
243-
attrs, True
244-
), (1e-3, 1e-3)
248+
yield (
249+
self.create_inference_config(),
250+
generate_trt_nodes_num(attrs, True),
251+
(1e-3, 1e-3),
252+
)
245253

246254
def add_skip_trt_case(self):
247255
def teller1(program_config, predictor_config):

‎test/ir/inference/test_trt_convert_bilinear_interp_v2.py‎

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,34 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
121121
clear_dynamic_shape()
122122
self.trt_param.precision = paddle_infer.PrecisionType.Float32
123123
program_config.set_input_type(np.float32)
124-
yield self.create_inference_config(), generate_trt_nodes_num(
125-
attrs, False
126-
), 1e-5
124+
yield (
125+
self.create_inference_config(),
126+
generate_trt_nodes_num(attrs, False),
127+
1e-5,
128+
)
127129
self.trt_param.precision = paddle_infer.PrecisionType.Half
128130
program_config.set_input_type(np.float16)
129-
yield self.create_inference_config(), generate_trt_nodes_num(
130-
attrs, False
131-
), 1e-2
131+
yield (
132+
self.create_inference_config(),
133+
generate_trt_nodes_num(attrs, False),
134+
1e-2,
135+
)
132136

133137
# for dynamic_shape
134138
generate_dynamic_shape(attrs)
135139
self.trt_param.precision = paddle_infer.PrecisionType.Float32
136140
program_config.set_input_type(np.float32)
137-
yield self.create_inference_config(), generate_trt_nodes_num(
138-
attrs, True
139-
), (1e-5, 1e-5)
141+
yield (
142+
self.create_inference_config(),
143+
generate_trt_nodes_num(attrs, True),
144+
(1e-5, 1e-5),
145+
)
140146
self.trt_param.precision = paddle_infer.PrecisionType.Half
141-
yield self.create_inference_config(), generate_trt_nodes_num(
142-
attrs, True
143-
), 1e-2
147+
yield (
148+
self.create_inference_config(),
149+
generate_trt_nodes_num(attrs, True),
150+
1e-2,
151+
)
144152

145153
def test(self):
146154
self.run_test()
@@ -239,25 +247,33 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
239247
# for static_shape
240248
clear_dynamic_shape()
241249
self.trt_param.precision = paddle_infer.PrecisionType.Float32
242-
yield self.create_inference_config(), generate_trt_nodes_num(
243-
attrs, False
244-
), 1e-5
250+
yield (
251+
self.create_inference_config(),
252+
generate_trt_nodes_num(attrs, False),
253+
1e-5,
254+
)
245255
self.trt_param.precision = paddle_infer.PrecisionType.Half
246256
program_config.set_input_type(np.float16)
247-
yield self.create_inference_config(), generate_trt_nodes_num(
248-
attrs, False
249-
), 1e-2
257+
yield (
258+
self.create_inference_config(),
259+
generate_trt_nodes_num(attrs, False),
260+
1e-2,
261+
)
250262

251263
# for dynamic_shape
252264
generate_dynamic_shape(attrs)
253265
self.trt_param.precision = paddle_infer.PrecisionType.Float32
254-
yield self.create_inference_config(), generate_trt_nodes_num(
255-
attrs, True
256-
), (1e-5, 1e-5)
266+
yield (
267+
self.create_inference_config(),
268+
generate_trt_nodes_num(attrs, True),
269+
(1e-5, 1e-5),
270+
)
257271
self.trt_param.precision = paddle_infer.PrecisionType.Half
258-
yield self.create_inference_config(), generate_trt_nodes_num(
259-
attrs, True
260-
), 1e-2
272+
yield (
273+
self.create_inference_config(),
274+
generate_trt_nodes_num(attrs, True),
275+
1e-2,
276+
)
261277

262278
def test(self):
263279
self.run_test()

‎test/ir/inference/test_trt_convert_bitwise_and.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ def generate_dynamic_shape(self, attrs):
113113
def sample_predictor_configs(
114114
self, program_config, run_pir=False
115115
) -> tuple[paddle_infer.Config, list[int], float]:
116-
117116
def clear_dynamic_shape():
118117
self.dynamic_shape.min_input_shape = {}
119118
self.dynamic_shape.max_input_shape = {}
@@ -137,13 +136,17 @@ def generate_trt_nodes_num(attrs, dynamic_shape):
137136
# for dynamic_shape
138137
self.generate_dynamic_shape(attrs)
139138
self.trt_param.precision = paddle_infer.PrecisionType.Float32
140-
yield self.create_inference_config(), generate_trt_nodes_num(
141-
attrs, True
142-
), 1e-5
139+
yield (
140+
self.create_inference_config(),
141+
generate_trt_nodes_num(attrs, True),
142+
1e-5,
143+
)
143144
self.trt_param.precision = paddle_infer.PrecisionType.Half
144-
yield self.create_inference_config(), generate_trt_nodes_num(
145-
attrs, True
146-
), 1e-3
145+
yield (
146+
self.create_inference_config(),
147+
generate_trt_nodes_num(attrs, True),
148+
1e-3,
149+
)
147150

148151
def test(self):
149152
self.run_test(run_pir=True)

0 commit comments

Comments
 (0)