PaddlePaddle
diff --git a/‎test/cpp/inference/api/CMakeLists.txt
Copy file name to clipboard
-18Lines changed: 0 additions & 18 deletions b/‎test/cpp/inference/api/CMakeLists.txt
Copy file name to clipboard
-18Lines changed: 0 additions & 18 deletions
diff --git a/‎test/deprecated/cpp/inference/api/CMakeLists.txt
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎test/deprecated/cpp/inference/api/CMakeLists.txt
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎test/cpp/inference/api/trt_dynamic_shape_transformer_prune_test.cc renamed to ‎test/deprecated/cpp/inference/api/trt_dynamic_shape_transformer_prune_test.cc
Copy file name to clipboard b/‎test/cpp/inference/api/trt_dynamic_shape_transformer_prune_test.cc renamed to ‎test/deprecated/cpp/inference/api/trt_dynamic_shape_transformer_prune_test.cc
Copy file name to clipboard
diff --git a/‎test/deprecated/ir/inference/CMakeLists.txt
Copy file name to clipboard
+19-10Lines changed: 19 additions & 10 deletions b/‎test/deprecated/ir/inference/CMakeLists.txt
Copy file name to clipboard
+19-10Lines changed: 19 additions & 10 deletions
diff --git a/‎test/ir/inference/test_trt_convert_pad3d.py renamed to ‎test/deprecated/ir/inference/test_trt_convert_pad3d_deprecated.py
Copy file name to clipboard b/‎test/ir/inference/test_trt_convert_pad3d.py renamed to ‎test/deprecated/ir/inference/test_trt_convert_pad3d_deprecated.py
Copy file name to clipboard
diff --git a/‎test/ir/inference/test_trt_convert_temporal_shift.py renamed to ‎test/deprecated/ir/inference/test_trt_convert_temporal_shift_deprecated.py
Copy file name to clipboard b/‎test/ir/inference/test_trt_convert_temporal_shift.py renamed to ‎test/deprecated/ir/inference/test_trt_convert_temporal_shift_deprecated.py
Copy file name to clipboard
diff --git a/‎test/ir/inference/test_trt_multiclass_nms3_op.py renamed to ‎test/deprecated/ir/inference/test_trt_multiclass_nms3_op_deprecated.py
Copy file name to clipboard b/‎test/ir/inference/test_trt_multiclass_nms3_op.py renamed to ‎test/deprecated/ir/inference/test_trt_multiclass_nms3_op_deprecated.py
Copy file name to clipboard
diff --git a/‎test/ir/inference/CMakeLists.txt
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎test/ir/inference/CMakeLists.txt
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎test/ir/inference/test_auto_mixed_precision_pass_for_sparse_op.py
Copy file name to clipboard
+14-15Lines changed: 14 additions & 15 deletions b/‎test/ir/inference/test_auto_mixed_precision_pass_for_sparse_op.py
Copy file name to clipboard
+14-15Lines changed: 14 additions & 15 deletions
diff --git a/‎test/ir/inference/test_inference_predictor_run.py
Copy file name to clipboard
+26-23Lines changed: 26 additions & 23 deletions b/‎test/ir/inference/test_inference_predictor_run.py
Copy file name to clipboard
+26-23Lines changed: 26 additions & 23 deletions
@@ -790,24 +790,6 @@ if(WITH_TESTING AND WITH_INFERENCE_API_TEST)
       ARGS
       --infer_model=${TEST_TRT_ERNIE_MODEL}/ernie_model_4)
 
-    set(TEST_TRT_TRANSFORMER_PRUNE_MODEL
-        "${TRT_MODEL_INSTALL_DIR}/transformer_prune")
-    if(NOT EXISTS ${TEST_TRT_TRANSFORMER_PRUNE_MODEL}/transformer_prune.tar.gz)
-      inference_download_and_uncompress(
-        ${TEST_TRT_TRANSFORMER_PRUNE_MODEL} ${INFERENCE_URL}/tensorrt_test
-        "transformer_prune.tar.gz" 77b56dc73ff0cf44ddb1ce9ca0b0f471)
-    endif()
-
-    inference_analysis_test(
-      test_trt_dynamic_shape_transformer_prune
-      SRCS
-      trt_dynamic_shape_transformer_prune_test.cc
-      EXTRA_DEPS
-      paddle_inference_shared
-      common
-      ARGS
-      --infer_model=${TEST_TRT_TRANSFORMER_PRUNE_MODEL}/transformer_prune)
-
     if(NOT EXISTS ${TEST_TRT_ERNIE_MODEL}/ernie_model_4_unserialized.tgz)
       inference_download_and_uncompress(
         ${TEST_TRT_ERNIE_MODEL} ${INFERENCE_URL}/tensorrt_test
 
@@ -336,6 +336,30 @@ if(WITH_TESTING AND WITH_INFERENCE_API_TEST)
     --batch_size=8
     --cpu_num_threads=${CPU_NUM_THREADS_ON_CI})
 
+  if(WITH_GPU
+     AND TENSORRT_FOUND
+     AND NOT WIN32)
+    set(TRT_MODEL_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/trt_models")
+    set(TEST_TRT_TRANSFORMER_PRUNE_MODEL
+        "${TRT_MODEL_INSTALL_DIR}/transformer_prune")
+    if(NOT EXISTS ${TEST_TRT_TRANSFORMER_PRUNE_MODEL}/transformer_prune.tar.gz)
+      inference_download_and_uncompress(
+        ${TEST_TRT_TRANSFORMER_PRUNE_MODEL} ${INFERENCE_URL}/tensorrt_test
+        "transformer_prune.tar.gz" 77b56dc73ff0cf44ddb1ce9ca0b0f471)
+    endif()
+    inference_analysis_test(
+      test_trt_dynamic_shape_transformer_prune_deprecated
+      SRCS
+      trt_dynamic_shape_transformer_prune_test.cc
+      EXTRA_DEPS
+      paddle_inference_shared
+      common
+      ARGS
+      --infer_model=${TEST_TRT_TRANSFORMER_PRUNE_MODEL}/transformer_prune)
+    set_tests_properties(test_trt_dynamic_shape_transformer_prune_deprecated
+                         PROPERTIES TIMEOUT 300)
+  endif()
+
   # Image classification tests with fake data
   set(IMG_CLASS_TEST_APP "test_analyzer_image_classification")
   set(IMG_CLASS_TEST_APP_SRC "analyzer_image_classification_tester.cc")
 
@@ -21,6 +21,18 @@ set(TEST_INFERENCE_CPU_UT "test_mul_lstm_fuse_pass" "test_mul_gru_fuse_pass")
 
 list(REMOVE_ITEM TEST_TRT_IR_PASSES "test_trt_inspector_deprecated")
 list(REMOVE_ITEM TEST_INFERENCE_IR_PASSES "test_trt_inspector_deprecated")
+list(REMOVE_ITEM TEST_INFERENCE_IR_PASSES
+     "test_trt_convert_temporal_shift_deprecated")
+list(REMOVE_ITEM TEST_TRT_IR_PASSES
+     "test_trt_convert_temporal_shift_deprecated")
+list(REMOVE_ITEM TEST_TRT_CONVERTER
+     "test_trt_convert_temporal_shift_deprecated")
+list(REMOVE_ITEM TEST_INFERENCE_IR_PASSES "test_trt_convert_pad3d_deprecated")
+list(REMOVE_ITEM TEST_TRT_IR_PASSES "test_trt_convert_pad3d_deprecated")
+list(REMOVE_ITEM TEST_TRT_CONVERTER "test_trt_convert_pad3d_deprecated")
+list(REMOVE_ITEM TEST_TRT_IR_PASSES "test_trt_multiclass_nms3_op_deprecated")
+list(REMOVE_ITEM TEST_INFERENCE_IR_PASSES
+     "test_trt_multiclass_nms3_op_deprecated")
 
 if(WIN32)
   list(REMOVE_ITEM TEST_INFERENCE_IR_PASSES
@@ -61,7 +73,6 @@ foreach(TEST_INFERENCE_IR_PASS ${TEST_TRT_IR_PASSES})
 endforeach()
 
 if(WITH_GPU AND TENSORRT_FOUND)
-  list(REMOVE_ITEM TEST_TRT_IR_PASSES test_trt_multiclass_nms_op)
 
   foreach(TRT_CONVERT ${TEST_TRT_CONVERTER})
     list(REMOVE_ITEM TEST_TRT_IR_PASSES ${TRT_CONVERT})
@@ -98,7 +109,7 @@ if(WITH_GPU AND TENSORRT_FOUND)
                                                                          300)
   set_tests_properties(test_trt_elementwise_op_deprecated PROPERTIES TIMEOUT
                                                                      300)
-  set_tests_properties(test_trt_fc_fuse_pass_deprecated PROPERTIES TIMEOUT 300)
+  set_tests_properties(test_trt_fc_fuse_pass_deprecated PROPERTIES TIMEOUT 500)
   set_tests_properties(test_trt_flatten_op_deprecated PROPERTIES TIMEOUT 300)
   set_tests_properties(test_trt_gather_nd_op_deprecated PROPERTIES TIMEOUT 300)
   set_tests_properties(test_trt_gather_op_deprecated PROPERTIES TIMEOUT 300)
@@ -133,7 +144,6 @@ if(WITH_GPU AND TENSORRT_FOUND)
                        PROPERTIES TIMEOUT 300)
   set_tests_properties(test_trt_convert_depthwise_conv2d_deprecated
                        PROPERTIES TIMEOUT 300)
-
   if(NOT WIN32)
     set_tests_properties(test_trt_inference_fp16_io_deprecated
                          PROPERTIES TIMEOUT 500)
@@ -153,28 +163,27 @@ if(WITH_GPU AND TENSORRT_FOUND)
     set_tests_properties(
       test_trt_pool_op_deprecated
       PROPERTIES ENVIRONMENT FLAGS_fraction_of_gpu_memory_to_use=0.1 TIMEOUT
-                 450)
+                 550)
     set_tests_properties(
       test_trt_pool3d_op_deprecated
       PROPERTIES ENVIRONMENT FLAGS_fraction_of_gpu_memory_to_use=0.1 TIMEOUT
-                 450)
+                 550)
   else()
     set_tests_properties(
       test_trt_pool_op_deprecated
       PROPERTIES ENVIRONMENT FLAGS_fraction_of_gpu_memory_to_use=0.1 TIMEOUT
-                 300)
-
+                 500)
   endif()
 
   set_tests_properties(test_trt_tile_op_deprecated PROPERTIES TIMEOUT 60)
   set_tests_properties(test_trt_fc_fuse_quant_dequant_pass_deprecated
-                       PROPERTIES TIMEOUT 100)
+                       PROPERTIES TIMEOUT 300)
   set_tests_properties(test_trt_conv_quant_dequant_pass_deprecated
                        PROPERTIES TIMEOUT 500)
   set_tests_properties(test_trt_matmul_quant_dequant_deprecated
-                       PROPERTIES TIMEOUT 450)
+                       PROPERTIES TIMEOUT 500)
   set_tests_properties(test_trt_conv3d_transpose_op_deprecated
-                       PROPERTIES TIMEOUT 60)
+                       PROPERTIES TIMEOUT 500)
   set_tests_properties(test_trt_nearest_interp_v2_op_deprecated
                        PROPERTIES TIMEOUT 500)
 endif()
@@ -43,6 +43,7 @@ if(WIN32)
        "test_trt_convert_elementwiseadd_transpose")
   list(REMOVE_ITEM TEST_TRT_CONVERTER
        "test_trt_convert_elementwiseadd_transpose")
+
   list(REMOVE_ITEM TEST_INFERENCE_IR_PASSES
        "test_split_layernorm_to_math_ops_pass")
   list(REMOVE_ITEM TEST_TRT_CONVERTER
@@ -152,6 +153,7 @@ if(WITH_GPU AND TENSORRT_FOUND)
 
   set_tests_properties(test_trt_ops_fp32_mix_precision PROPERTIES TIMEOUT 300)
   set_tests_properties(test_trt_convert_unary PROPERTIES TIMEOUT 600)
+
   if(NOT WIN32)
     set_tests_properties(test_trt_explicit_quantization_resnet
                          PROPERTIES TIMEOUT 300)
@@ -162,7 +164,6 @@ if(WITH_GPU AND TENSORRT_FOUND)
   endif()
 
   set_tests_properties(test_trt_conv3d_op PROPERTIES TIMEOUT 60)
-  set_tests_properties(test_trt_multiclass_nms3_op PROPERTIES TIMEOUT 60)
 
   if(WITH_ONEDNN)
     set_tests_properties(test_merge_layernorm_fuse_pass PROPERTIES TIMEOUT 180)
 
@@ -61,21 +61,20 @@ def setUp(self):
         self.indices = np.array([[0, 0, 0], [0, 16, 16], [0, 20, 8]]).astype(
             "int32"
         )
-        self.path_prefix = (
-            "inference_test_models/auto_mixed_precision_pass_for_sparse_op_test"
-        )
-        paddle.jit.save(
-            self.test_model,
-            self.path_prefix,
-            input_spec=[
-                paddle.static.InputSpec(
-                    shape=[3, -1], dtype='int32', name="indices"
-                ),
-                paddle.static.InputSpec(
-                    shape=[-1, 3], dtype='float32', name="values"
-                ),
-            ],
-        )
+        with paddle.pir_utils.OldIrGuard():
+            self.path_prefix = "inference_test_models/auto_mixed_precision_pass_for_sparse_op_test"
+            paddle.jit.save(
+                self.test_model,
+                self.path_prefix,
+                input_spec=[
+                    paddle.static.InputSpec(
+                        shape=[3, -1], dtype='int32', name="indices"
+                    ),
+                    paddle.static.InputSpec(
+                        shape=[-1, 3], dtype='float32', name="values"
+                    ),
+                ],
+            )
 
     def test_check_output(self):
         fp32_out = self.inference("fp32")
 
@@ -39,6 +39,7 @@ def forward(self, x1, x2):
 )
 class TestPredictorRunWithTensor(unittest.TestCase):
     def setUp(self):
+
         self.temp_dir = tempfile.TemporaryDirectory()
         net = TestNet()
         model = paddle.jit.to_static(
@@ -53,34 +54,36 @@ def setUp(self):
             ],
             full_graph=True,
         )
-        paddle.jit.save(
-            model,
-            os.path.join(
-                self.temp_dir.name, 'test_predictor_run_model/inference'
-            ),
-        )
+        with paddle.pir_utils.OldIrGuard():
+            paddle.jit.save(
+                model,
+                os.path.join(
+                    self.temp_dir.name, 'test_predictor_run_model/inference'
+                ),
+            )
 
     def tearDown(self):
         self.temp_dir.cleanup()
 
     def init_predictor(self, use_pir: bool):
-        config = Config(
-            os.path.join(
-                self.temp_dir.name,
-                'test_predictor_run_model/inference.pdmodel',
-            ),
-            os.path.join(
-                self.temp_dir.name,
-                'test_predictor_run_model/inference.pdiparams',
-            ),
-        )
-        config.enable_use_gpu(256, 0)
-        config.switch_ir_optim(False)
-        # config.enable_memory_optim()
-        config.enable_new_executor()
-        if use_pir:
-            config.enable_new_ir()
-        predictor = create_predictor(config)
+        with paddle.pir_utils.OldIrGuard():
+            config = Config(
+                os.path.join(
+                    self.temp_dir.name,
+                    'test_predictor_run_model/inference.pdmodel',
+                ),
+                os.path.join(
+                    self.temp_dir.name,
+                    'test_predictor_run_model/inference.pdiparams',
+                ),
+            )
+            config.enable_use_gpu(256, 0)
+            config.switch_ir_optim(False)
+            # config.enable_memory_optim()
+            config.enable_new_executor()
+            if use_pir:
+                config.enable_new_ir()
+            predictor = create_predictor(config)
         return predictor
 
     def get_inputs(self):