diff --git a/test/ir/inference/test_trt_convert_anchor_generator.py b/test/ir/inference/test_trt_convert_anchor_generator.py index f091893a8bd315..aa10d3513eecec 100644 --- a/test/ir/inference/test_trt_convert_anchor_generator.py +++ b/test/ir/inference/test_trt_convert_anchor_generator.py @@ -111,27 +111,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): if not run_pir: self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half # NOTE(tizheng): This config will fall back to paddle native OP, # which only supports FP32 input. program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-3, + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-3, + ) def test(self): self.run_test(run_pir=True) diff --git a/test/ir/inference/test_trt_convert_arg_max.py b/test/ir/inference/test_trt_convert_arg_max.py index 4ae4022aea977e..b3c52407fd0699 100644 --- a/test/ir/inference/test_trt_convert_arg_max.py +++ b/test/ir/inference/test_trt_convert_arg_max.py @@ -119,27 +119,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-3, + ) # for dynamic_shape generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-3, + ) def test(self): self.run_test() diff --git a/test/ir/inference/test_trt_convert_arg_min.py b/test/ir/inference/test_trt_convert_arg_min.py index ac4a3dd74f30eb..4897198baea076 100644 --- a/test/ir/inference/test_trt_convert_arg_min.py +++ b/test/ir/inference/test_trt_convert_arg_min.py @@ -119,27 +119,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-3, + ) # for dynamic_shape generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-3, + ) def test(self): self.run_test() diff --git a/test/ir/inference/test_trt_convert_assign.py b/test/ir/inference/test_trt_convert_assign.py index af75481c1f3891..58f998426f08e2 100644 --- a/test/ir/inference/test_trt_convert_assign.py +++ b/test/ir/inference/test_trt_convert_assign.py @@ -128,27 +128,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-2, + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-2, + ) def test(self): # test for old ir diff --git a/test/ir/inference/test_trt_convert_batch_norm.py b/test/ir/inference/test_trt_convert_batch_norm.py index 7d8383784d9e19..82a55abbee5a1e 100644 --- a/test/ir/inference/test_trt_convert_batch_norm.py +++ b/test/ir/inference/test_trt_convert_batch_norm.py @@ -221,27 +221,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # for dynamic_shape generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) def add_skip_trt_case(self): def teller1(program_config, predictor_config): diff --git a/test/ir/inference/test_trt_convert_bilinear_interp_v2.py b/test/ir/inference/test_trt_convert_bilinear_interp_v2.py index 4a6358bf6c2a62..d14da26bdb6c8f 100644 --- a/test/ir/inference/test_trt_convert_bilinear_interp_v2.py +++ b/test/ir/inference/test_trt_convert_bilinear_interp_v2.py @@ -121,26 +121,34 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-2, + ) # for dynamic_shape generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-5, 1e-5) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-5, 1e-5), + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-2, + ) def test(self): self.run_test() @@ -239,25 +247,33 @@ def generate_trt_nodes_num(attrs, dynamic_shape): # for static_shape clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-2, + ) # for dynamic_shape generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-5, 1e-5) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-5, 1e-5), + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-2, + ) def test(self): self.run_test() diff --git a/test/ir/inference/test_trt_convert_bitwise_and.py b/test/ir/inference/test_trt_convert_bitwise_and.py index b932cc4003aee9..b4c93bdea94bbc 100644 --- a/test/ir/inference/test_trt_convert_bitwise_and.py +++ b/test/ir/inference/test_trt_convert_bitwise_and.py @@ -113,7 +113,6 @@ def generate_dynamic_shape(self, attrs): def sample_predictor_configs( self, program_config, run_pir=False ) -> tuple[paddle_infer.Config, list[int], float]: - def clear_dynamic_shape(): self.dynamic_shape.min_input_shape = {} self.dynamic_shape.max_input_shape = {} @@ -137,13 +136,17 @@ def generate_trt_nodes_num(attrs, dynamic_shape): # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-3, + ) def test(self): self.run_test(run_pir=True) diff --git a/test/ir/inference/test_trt_convert_bitwise_not.py b/test/ir/inference/test_trt_convert_bitwise_not.py index a1c5c229201e37..53767f2ff4b15e 100644 --- a/test/ir/inference/test_trt_convert_bitwise_not.py +++ b/test/ir/inference/test_trt_convert_bitwise_not.py @@ -122,24 +122,32 @@ def generate_trt_nodes_num(attrs, dynamic_shape): # for static_shape clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) # for dynamic_shape generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) def test(self): self.run_test() diff --git a/test/ir/inference/test_trt_convert_bitwise_or.py b/test/ir/inference/test_trt_convert_bitwise_or.py index bc4e7904121d26..d85736d26efe20 100644 --- a/test/ir/inference/test_trt_convert_bitwise_or.py +++ b/test/ir/inference/test_trt_convert_bitwise_or.py @@ -114,7 +114,6 @@ def generate_dynamic_shape(self, attrs): def sample_predictor_configs( self, program_config, run_pir=False ) -> tuple[paddle_infer.Config, list[int], float]: - def clear_dynamic_shape(): self.dynamic_shape.min_input_shape = {} self.dynamic_shape.max_input_shape = {} @@ -138,13 +137,17 @@ def generate_trt_nodes_num(attrs, dynamic_shape): # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-3, + ) def test(self): self.run_test(run_pir=True) diff --git a/test/ir/inference/test_trt_convert_bmm.py b/test/ir/inference/test_trt_convert_bmm.py index e94dad88de6bb1..8a16a9c7b1f808 100644 --- a/test/ir/inference/test_trt_convert_bmm.py +++ b/test/ir/inference/test_trt_convert_bmm.py @@ -83,7 +83,6 @@ def generate_dynamic_shape(self, attrs): def sample_predictor_configs( self, program_config, run_pir=False ) -> tuple[paddle_infer.Config, list[int], float]: - def clear_dynamic_shape(): self.dynamic_shape.min_input_shape = {} self.dynamic_shape.max_input_shape = {} @@ -103,14 +102,18 @@ def generate_trt_nodes_num(attrs, dynamic_shape): if not run_pir: self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-2, 1e-2) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-2, 1e-2), + ) # The output has little diff between gpu and trt in CI-Windows-Inference tol_fp32 = 1e-4 @@ -122,14 +125,18 @@ def generate_trt_nodes_num(attrs, dynamic_shape): self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), tol_fp32 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + tol_fp32, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (tol_half, tol_half) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (tol_half, tol_half), + ) def add_skip_trt_case(self): pass diff --git a/test/ir/inference/test_trt_convert_cast.py b/test/ir/inference/test_trt_convert_cast.py index eac3c857fb2f04..c74eb4960fcf74 100644 --- a/test/ir/inference/test_trt_convert_cast.py +++ b/test/ir/inference/test_trt_convert_cast.py @@ -116,7 +116,6 @@ def generate_dynamic_shape(self): def sample_predictor_configs( self, program_config, run_pir=False ) -> tuple[paddle_infer.Config, list[int], float]: - def clear_dynamic_shape(): self.dynamic_shape.min_input_shape = {} self.dynamic_shape.max_input_shape = {} @@ -137,24 +136,32 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() if not run_pir: self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-2, + ) # for dynamic_shape self.generate_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-2, + ) def test(self): self.run_test(run_pir=True) diff --git a/test/ir/inference/test_trt_convert_clip.py b/test/ir/inference/test_trt_convert_clip.py index 71c067326677cd..6165dd61dc9465 100644 --- a/test/ir/inference/test_trt_convert_clip.py +++ b/test/ir/inference/test_trt_convert_clip.py @@ -142,24 +142,32 @@ def generate_trt_nodes_num(attrs, dynamic_shape): if not run_pir: clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # for dynamic_shape self.generate_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) def test(self): # test for old ir diff --git a/test/ir/inference/test_trt_convert_compare_and_logical.py b/test/ir/inference/test_trt_convert_compare_and_logical.py index c0e1ff8f5eeeeb..5d8566d539750d 100755 --- a/test/ir/inference/test_trt_convert_compare_and_logical.py +++ b/test/ir/inference/test_trt_convert_compare_and_logical.py @@ -135,7 +135,6 @@ def generate_dynamic_shape(self, attrs): def sample_predictor_configs( self, program_config, run_pir=False ) -> tuple[paddle_infer.Config, list[int], float]: - def clear_dynamic_shape(): self.dynamic_shape.max_input_shape = {} self.dynamic_shape.min_input_shape = {} @@ -157,27 +156,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) def add_skip_trt_case(self): pass @@ -283,7 +290,6 @@ def generate_dynamic_shape(self, attrs): def sample_predictor_configs( self, program_config, run_pir=False ) -> (paddle_infer.Config, list[int], float): - def clear_dynamic_shape(): self.dynamic_shape.max_input_shape = {} self.dynamic_shape.min_input_shape = {} @@ -305,27 +311,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) def add_skip_trt_case(self): pass @@ -448,7 +462,6 @@ def sample_predictor_configs( program_config, run_pir=False, ) -> (paddle_infer.Config, list[int], float): - def clear_dynamic_shape(): self.dynamic_shape.max_input_shape = {} self.dynamic_shape.min_input_shape = {} @@ -472,27 +485,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) def add_skip_trt_case(self): pass @@ -615,7 +636,6 @@ def sample_predictor_configs( program_config, run_pir=False, ) -> (paddle_infer.Config, list[int], float): - def clear_dynamic_shape(): self.dynamic_shape.max_input_shape = {} self.dynamic_shape.min_input_shape = {} @@ -639,27 +659,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) def add_skip_trt_case(self): pass @@ -731,7 +759,6 @@ def sample_predictor_configs( program_config, run_pir=False, ) -> (paddle_infer.Config, list[int], float): - def clear_dynamic_shape(): self.dynamic_shape.max_input_shape = {} self.dynamic_shape.min_input_shape = {} @@ -752,24 +779,32 @@ def generate_trt_nodes_num(attrs, dynamic_shape): # for static_shape clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) def add_skip_trt_case(self): pass diff --git a/test/ir/inference/test_trt_convert_concat.py b/test/ir/inference/test_trt_convert_concat.py index a4413fe03d2475..29318a59292447 100644 --- a/test/ir/inference/test_trt_convert_concat.py +++ b/test/ir/inference/test_trt_convert_concat.py @@ -303,7 +303,6 @@ def generate_dynamic_shape(self, attrs): def sample_predictor_configs( self, program_config, run_pir=False ) -> tuple[paddle_infer.Config, list[int], float]: - def clear_dynamic_shape(): self.dynamic_shape.min_input_shape = {} self.dynamic_shape.max_input_shape = {} @@ -326,27 +325,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-3, + ) # for dynamic_shape self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-3 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-3, + ) def add_skip_trt_case(self): def teller1(program_config, predictor_config): diff --git a/test/ir/inference/test_trt_convert_conv2d.py b/test/ir/inference/test_trt_convert_conv2d.py index 5fd2e266bd7daf..fa2e756ddb222a 100644 --- a/test/ir/inference/test_trt_convert_conv2d.py +++ b/test/ir/inference/test_trt_convert_conv2d.py @@ -178,15 +178,19 @@ def generate_trt_nodes_num(attrs, dynamic_shape): self.generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-2, 1e-2) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-2, 1e-2), + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-2, 1e-2) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-2, 1e-2), + ) def test(self): self.run_test(run_pir=True) diff --git a/test/ir/inference/test_trt_convert_cumsum.py b/test/ir/inference/test_trt_convert_cumsum.py index 4553845c41d9d2..5511d782481fdd 100644 --- a/test/ir/inference/test_trt_convert_cumsum.py +++ b/test/ir/inference/test_trt_convert_cumsum.py @@ -156,7 +156,6 @@ def generate_dynamic_shape(self): def sample_predictor_configs( self, program_config, run_pir=False ) -> tuple[paddle_infer.Config, list[int], float]: - def generate_trt_nodes_num(attrs, dynamic_shape): ver = paddle_infer.get_trt_compile_version() if ver[0] * 1000 + ver[1] * 100 + ver[2] * 10 < 7220: @@ -179,14 +178,18 @@ def clear_dynamic_shape(): self.generate_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-2, + ) def test(self): self.run_test(run_pir=True) diff --git a/test/ir/inference/test_trt_convert_deformable_conv.py b/test/ir/inference/test_trt_convert_deformable_conv.py index 2df403c8e9b899..30b56fd925e41d 100644 --- a/test/ir/inference/test_trt_convert_deformable_conv.py +++ b/test/ir/inference/test_trt_convert_deformable_conv.py @@ -224,27 +224,35 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-2 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-2, + ) generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-5, 1e-5) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-5, 1e-5), + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-2, 1e-2) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-2, 1e-2), + ) def test(self): self.trt_param.workspace_size = 1 << 28 diff --git a/test/ir/inference/test_trt_convert_depthwise_conv2d_transpose.py b/test/ir/inference/test_trt_convert_depthwise_conv2d_transpose.py index 562cabd8158704..8408986044cdc0 100644 --- a/test/ir/inference/test_trt_convert_depthwise_conv2d_transpose.py +++ b/test/ir/inference/test_trt_convert_depthwise_conv2d_transpose.py @@ -166,14 +166,18 @@ def generate_trt_nodes_num(attrs, dynamic_shape): clear_dynamic_shape() self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, False - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, False), + (1e-3, 1e-3), + ) # self.trt_param.precision = paddle_infer.PrecisionType.Int8 # yield self.create_inference_config(), generate_trt_nodes_num( # attrs, False), (1e-5, 1e-5) @@ -182,14 +186,18 @@ def generate_trt_nodes_num(attrs, dynamic_shape): generate_dynamic_shape(attrs) self.trt_param.precision = paddle_infer.PrecisionType.Float32 program_config.set_input_type(np.float32) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), 1e-5 + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + 1e-5, + ) self.trt_param.precision = paddle_infer.PrecisionType.Half program_config.set_input_type(np.float16) - yield self.create_inference_config(), generate_trt_nodes_num( - attrs, True - ), (1e-3, 1e-3) + yield ( + self.create_inference_config(), + generate_trt_nodes_num(attrs, True), + (1e-3, 1e-3), + ) # self.trt_param.precision = paddle_infer.PrecisionType.Int8 # yield self.create_inference_config(), generate_trt_nodes_num( # attrs, True), (1e-5, 1e-5)