PaddlePaddle
diff --git a/‎python/paddle/tensorrt/impls/norm.py
Copy file name to clipboard
+10-2Lines changed: 10 additions & 2 deletions b/‎python/paddle/tensorrt/impls/norm.py
Copy file name to clipboard
+10-2Lines changed: 10 additions & 2 deletions
diff --git a/‎test/tensorrt/CMakeLists.txt
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎test/tensorrt/CMakeLists.txt
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎test/tensorrt/tensorrt_test_base.py
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎test/tensorrt/tensorrt_test_base.py
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎test/tensorrt/test_converter_add.py
Copy file name to clipboard
-39Lines changed: 0 additions & 39 deletions b/‎test/tensorrt/test_converter_add.py
Copy file name to clipboard
-39Lines changed: 0 additions & 39 deletions
diff --git a/‎test/tensorrt/test_converter_conv2d.py renamed to ‎test/tensorrt/test_converter_conv.py
Copy file name to clipboard b/‎test/tensorrt/test_converter_conv2d.py renamed to ‎test/tensorrt/test_converter_conv.py
Copy file name to clipboard
diff --git a/‎test/tensorrt/test_converter_full.py renamed to ‎test/tensorrt/test_converter_creation.py
Copy file name to clipboard b/‎test/tensorrt/test_converter_full.py renamed to ‎test/tensorrt/test_converter_creation.py
Copy file name to clipboard
diff --git a/‎test/tensorrt/test_converter_flatten.py
Copy file name to clipboard
-40Lines changed: 0 additions & 40 deletions b/‎test/tensorrt/test_converter_flatten.py
Copy file name to clipboard
-40Lines changed: 0 additions & 40 deletions
diff --git a/‎test/tensorrt/test_converter_concat.py renamed to ‎test/tensorrt/test_converter_manipulation.py
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/‎test/tensorrt/test_converter_concat.py renamed to ‎test/tensorrt/test_converter_manipulation.py
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎test/tensorrt/test_converter_math.py
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/‎test/tensorrt/test_converter_math.py
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎test/tensorrt/test_converter_model_resnet50.py
Copy file name to clipboard
+20-7Lines changed: 20 additions & 7 deletions b/‎test/tensorrt/test_converter_model_resnet50.py
Copy file name to clipboard
+20-7Lines changed: 20 additions & 7 deletions
@@ -70,9 +70,17 @@ def layernorm_converter(network, paddle_op, inputs):
 @converter_registry.register("pd_op.batch_norm_", trt_version="8.x")
 def batch_norm_converter(network, paddle_op, inputs):
     input_tensor, mean, variance, scale, bias = inputs
-
     scale_shape = paddle_op.operands()[3].source().shape
-
+    eps = paddle_op.attrs().get("epsilon", 1e-8)
+    mean_np = mean.numpy()
+    variance_np = variance.numpy()
+    scale_np = scale.numpy()
+    bias_np = bias.numpy()
+
+    actual_scale_np = scale_np / np.sqrt(variance_np + eps)
+    actual_bias_np = bias_np - mean_np * actual_scale_np
+    bias = trt.Weights(actual_bias_np)
+    scale = trt.Weights(actual_scale_np)
     power = np.ones(scale_shape, dtype='float32')
     power = trt.Weights(power)
     input_tensor_shape = paddle_op.operands()[0].source().shape
 
@@ -11,12 +11,13 @@ if(NOT WIN32 AND TENSORRT_FOUND)
   set_tests_properties(test_converter_model_bert PROPERTIES TIMEOUT "500")
   set_tests_properties(test_converter_model_dummy PROPERTIES TIMEOUT "500")
   set_tests_properties(test_converter_model_resnet50 PROPERTIES TIMEOUT "500")
-  set_tests_properties(test_converter_conv2d PROPERTIES TIMEOUT "100")
-  set_tests_properties(test_converter_add PROPERTIES TIMEOUT "100")
+  set_tests_properties(test_converter_conv PROPERTIES TIMEOUT "100")
+  set_tests_properties(test_converter_norm PROPERTIES TIMEOUT "100")
   set_tests_properties(test_converter_ops PROPERTIES TIMEOUT "100")
   set_tests_properties(test_converter_stat PROPERTIES TIMEOUT "100")
-  set_tests_properties(test_converter_batch_norm PROPERTIES TIMEOUT "100")
   set_tests_properties(test_converter_math PROPERTIES TIMEOUT "100")
   set_tests_properties(test_converter_activation PROPERTIES TIMEOUT "100")
   set_tests_properties(test_converter_others PROPERTIES TIMEOUT "100")
+  set_tests_properties(test_converter_manipulation PROPERTIES TIMEOUT "100")
+  set_tests_properties(test_converter_creation PROPERTIES TIMEOUT "100")
 endif()
@@ -122,7 +122,7 @@ def prepare_feed(self):
                     new_list_args[sub_arg_name] = self.api_args[arg_name][i]
                 self.api_args[arg_name] = new_list_args
 
-    def check_trt_result(self):
+    def check_trt_result(self, rtol=1e-5, atol=1e-5):
         paddle.framework.set_flags({"FLAGS_trt_min_group_size": 1})
         with paddle.pir_utils.IrGuard():
             self.prepare_feed()
@@ -208,8 +208,8 @@ def check_trt_result(self):
             np.testing.assert_allclose(
                 output_expected[i],
                 output_trt[i],
-                rtol=1e-3,
-                atol=1e-3,
+                rtol=rtol,
+                atol=atol,
             )
 
     def check_marker(self, expected_result):
 
@@ -39,5 +39,21 @@ def test_trt_result(self):
         self.check_trt_result()
 
 
+class TestFlattenTRTPattern(TensorRTBaseTest):
+    def setUp(self):
+        self.python_api = paddle.flatten
+        self.api_args = {
+            "x": np.random.random([2, 1, 1, 19]).astype("float32"),
+            "start_axis": 1,
+            "stop_axis": 2,
+        }
+        self.program_config = {"feed_list": ["x"]}
+        self.min_shape = {"x": [1, 1, 1, 19]}
+        self.max_shape = {"x": [10, 1, 1, 19]}
+
+    def test_trt_result(self):
+        self.check_trt_result()
+
+
 if __name__ == '__main__':
     unittest.main()
@@ -82,5 +82,20 @@ def test_trt_result(self):
         self.check_trt_result()
 
 
+class TestAddTRTPattern(TensorRTBaseTest):
+    def setUp(self):
+        self.python_api = paddle.add
+        self.api_args = {
+            "x": np.random.randn(2, 3).astype(np.float32),
+            "y": np.random.randn(2, 3).astype(np.float32),
+        }
+        self.program_config = {"feed_list": ["x", "y"]}
+        self.min_shape = {"x": [1, 3], "y": [1, 3]}
+        self.max_shape = {"x": [5, 3], "y": [5, 3]}
+
+    def test_trt_result(self):
+        self.check_trt_result()
+
+
 if __name__ == '__main__':
     unittest.main()
@@ -27,12 +27,23 @@
 )
 
 
+def standardize(array):
+    mean_val = np.mean(array)
+    std_val = np.std(array)
+    standardized_array = (array - mean_val) / std_val
+    return standardized_array
+
+
 class TestConverterResNet50(unittest.TestCase):
     def test_paddle_to_tensorrt_conversion_r50(self):
         # Step1: get program and init fake inputs
         program, scope, param_dict = get_r50_program()
-        input_data_min_shape = np.ones((1, 3, 224, 224), dtype='float32')
-        input_data_max_shape = np.ones((1, 3, 224, 224), dtype='float32')
+        input_data_min_shape = np.random.randn(1, 3, 224, 224).astype(
+            np.float32
+        )
+        input_data_max_shape = np.random.randn(1, 3, 224, 224).astype(
+            np.float32
+        )
 
         # Step1.1: get original results(for tests only)
         output_var = program.list_vars()[-1]
@@ -65,13 +76,15 @@ def test_paddle_to_tensorrt_conversion_r50(self):
             program_with_pir, {"input": input_data_min_shape}, [output_var]
         )
 
+        output_expected = standardize(output_expected[0])
+        output_trt = standardize(output_converted[0])
         # Check that the results are close to each other within a tolerance of 1e-3
         np.testing.assert_allclose(
-            output_expected[0],
-            output_converted[0],
-            rtol=0.2,
-            atol=0.2,
-            err_msg="Outputs are not within the 0.2 tolerance",
+            output_expected,
+            output_trt,
+            rtol=1e-3,
+            atol=1e-3,
+            err_msg="Outputs are not within the 1e-3 tolerance",
         )