Mv inference ut (#52987)

* mv inference/api infer_ut

* mv test

* merge develop fix error

* fix

* fix build error

* fix build error

* fix bug

* fix tester_helper.h

* fix analyzer_transformer_profile_tester.cc

* fix

* fix mac

* fix mac

* fix error

* fix

* fix

paddle/fluid/inference/CMakeLists.txt

@@ -13,10 +13,6 @@
 # limitations under the License.
 #
 
-if(WITH_TESTING)
-  include(tests/test.cmake) # some generic cmake function for inference
-endif()
-
 cc_library(
   paddle_inference_io
   SRCS io.cc
@@ -91,10 +87,6 @@ endif()
 # C inference API
 add_subdirectory(capi_exp)
 
-if(WITH_TESTING AND WITH_INFERENCE_API_TEST)
-  add_subdirectory(tests/api)
-endif()
-
 set(SHARED_INFERENCE_SRCS
     io.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../framework/data_feed.cc

paddle/fluid/inference/analysis/CMakeLists.txt

@@ -36,84 +36,3 @@ cc_library(
   analysis
   SRCS analyzer.cc
   DEPS ${analysis_deps} analysis_helper analysis_pass ${INFER_IR_PASSES})
-
-function(inference_analysis_test_build TARGET)
-  if(WITH_TESTING)
-    set(options "")
-    set(oneValueArgs "")
-    set(multiValueArgs SRCS EXTRA_DEPS)
-    cmake_parse_arguments(analysis_test "${options}" "${oneValueArgs}"
-                          "${multiValueArgs}" ${ARGN})
-    inference_base_test_build(
-      ${TARGET}
-      SRCS
-      ${analysis_test_SRCS}
-      DEPS
-      ${analysis_test_EXTRA_DEPS}
-      analysis
-      pass
-      ${GLOB_PASS_LIB})
-  endif()
-endfunction()
-
-function(inference_analysis_test_run TARGET)
-  if(WITH_TESTING)
-    set(options "")
-    set(oneValueArgs "")
-    set(multiValueArgs COMMAND ARGS)
-    cmake_parse_arguments(analysis_test "${options}" "${oneValueArgs}"
-                          "${multiValueArgs}" ${ARGN})
-    inference_base_test_run(${TARGET} COMMAND ${analysis_test_COMMAND} ARGS
-                            ${analysis_test_ARGS})
-    set_tests_properties(${TARGET} PROPERTIES LABELS "RUN_TYPE=INFER")
-  endif()
-endfunction()
-
-function(inference_analysis_test TARGET)
-  if(WITH_TESTING)
-    set(options "")
-    set(oneValueArgs "")
-    set(multiValueArgs SRCS ARGS EXTRA_DEPS)
-    cmake_parse_arguments(analysis_test "${options}" "${oneValueArgs}"
-                          "${multiValueArgs}" ${ARGN})
-    inference_base_test_build(
-      ${TARGET}
-      SRCS
-      ${analysis_test_SRCS}
-      DEPS
-      ${analysis_test_EXTRA_DEPS}
-      analysis
-      pass
-      ${GLOB_PASS_LIB})
-    inference_base_test_run(${TARGET} COMMAND ${TARGET} ARGS
-                            ${analysis_test_ARGS})
-    set_tests_properties(${TARGET} PROPERTIES LABELS "RUN_TYPE=INFER")
-  endif()
-endfunction()
-
-if(NOT APPLE AND NOT WIN32)
-  inference_analysis_test(
-    test_analyzer
-    SRCS
-    analyzer_tester.cc
-    EXTRA_DEPS
-    reset_tensor_array
-    paddle_inference_shared
-    ARGS
-    --inference_model_dir=${WORD2VEC_MODEL_DIR})
-elseif(WIN32)
-  inference_analysis_test(
-    test_analyzer
-    SRCS
-    analyzer_tester.cc
-    EXTRA_DEPS
-    reset_tensor_array
-    paddle_inference_api
-    ARGS
-    --inference_model_dir=${WORD2VEC_MODEL_DIR})
-  if(WITH_ONNXRUNTIME AND WIN32)
-    # Copy onnxruntime for some c++ test in Windows, since the test will
-    # be build only in CI, so suppose the generator in Windows is Ninja.
-    copy_onnx(test_analyzer)
-  endif()
-endif()

paddle/fluid/inference/api/CMakeLists.txt

@@ -97,85 +97,8 @@ else()
          infer_io_utils model_utils)
 endif()
 
-cc_test(
-  test_paddle_inference_api
-  SRCS api_tester.cc
-  DEPS paddle_inference_api)
-
-cc_test(
-  inference_api_helper_test
-  SRCS helper_test.cc
-  DEPS paddle_inference_api)
-
 if(WITH_ONNXRUNTIME AND WIN32)
   # Copy onnxruntime for some c++ test in Windows, since the test will
   # be build only in CI, so suppose the generator in Windows is Ninja.
   copy_onnx(test_paddle_inference_api)
 endif()
-
-if(WITH_TESTING)
-  if(NOT APPLE AND NOT WIN32)
-    inference_base_test(
-      test_api_impl
-      SRCS
-      api_impl_tester.cc
-      DEPS
-      paddle_inference_shared
-      ARGS
-      --word2vec_dirname=${WORD2VEC_MODEL_DIR}
-      --book_dirname=${IMG_CLS_RESNET_INSTALL_DIR})
-  elseif(WIN32)
-    inference_base_test(
-      test_api_impl
-      SRCS
-      api_impl_tester.cc
-      DEPS
-      ${inference_deps}
-      ARGS
-      --word2vec_dirname=${WORD2VEC_MODEL_DIR}
-      --book_dirname=${IMG_CLS_RESNET_INSTALL_DIR})
-  endif()
-endif()
-
-if(NOT APPLE AND NOT WIN32)
-  cc_test_old(
-    test_analysis_predictor
-    SRCS
-    analysis_predictor_tester.cc
-    DEPS
-    paddle_inference_shared
-    ARGS
-    --dirname=${WORD2VEC_MODEL_DIR})
-elseif(WIN32)
-  cc_test_old(
-    test_analysis_predictor
-    SRCS
-    analysis_predictor_tester.cc
-    DEPS
-    analysis_predictor
-    benchmark
-    ${inference_deps}
-    ARGS
-    --dirname=${WORD2VEC_MODEL_DIR})
-endif()
-
-if(WITH_TESTING AND WITH_MKLDNN)
-  if(NOT APPLE AND NOT WIN32)
-    cc_test(
-      test_mkldnn_quantizer
-      SRCS mkldnn_quantizer_tester.cc
-      DEPS paddle_inference_shared ARGS --dirname=${WORD2VEC_MODEL_DIR})
-  elseif(WIN32)
-    cc_test(
-      test_mkldnn_quantizer
-      SRCS mkldnn_quantizer_tester.cc
-      DEPS analysis_predictor benchmark ${inference_deps} ARGS
-           --dirname=${WORD2VEC_MODEL_DIR})
-  endif()
-endif()
-
-if(WITH_TESTING AND TEST test_api_impl)
-  if(NOT APPLE)
-    set_tests_properties(test_api_impl PROPERTIES TIMEOUT 120)
-  endif()
-endif()

paddle/fluid/inference/api/onnxruntime_predictor_tester.cc

@@ -25,9 +25,9 @@
 #include "paddle/fluid/inference/api/onnxruntime_predictor.h"
 #include "paddle/fluid/inference/api/paddle_api.h"
 #include "paddle/fluid/inference/api/paddle_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/fluid/inference/utils/io_utils.h"
 #include "paddle/phi/backends/cpu/cpu_info.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_string(dirname, "", "dirname to tests.");
 

paddle/scripts/paddle_build.sh

@@ -3008,7 +3008,7 @@ EOF
     echo "ipipe_log_param_Demo_Ci_Tests_Total_Time: $[ $demo_ci_endTime_s - $demo_ci_startTime_s ]s" >> ${PADDLE_ROOT}/build/build_summary.txt
 
     infer_ut_startTime_s=`date +%s`
-    cd ${PADDLE_ROOT}/paddle/fluid/inference/tests/infer_ut
+    cd ${PADDLE_ROOT}/test/cpp/inference/infer_ut
     ./run.sh ${PADDLE_ROOT} ${WITH_MKL:-ON} ${WITH_GPU:-OFF} ${INFERENCE_DEMO_INSTALL_DIR} \
              ${TENSORRT_ROOT_DIR:-/usr} ${WITH_ONNXRUNTIME:-ON}
     TEST_EXIT_CODE=$?

test/cpp/CMakeLists.txt

@@ -4,3 +4,4 @@ add_subdirectory(new_executor)
 add_subdirectory(prim)
 add_subdirectory(imperative)
 add_subdirectory(ir)
+add_subdirectory(inference)

test/cpp/inference/CMakeLists.txt

+if(WITH_TESTING)
+  include(test.cmake) # some generic cmake function for inference
+endif()
+
+add_subdirectory(analysis)
+add_subdirectory(api)

test/cpp/inference/analysis/CMakeLists.txt

+function(inference_analysis_test_build TARGET)
+  if(WITH_TESTING)
+    set(options "")
+    set(oneValueArgs "")
+    set(multiValueArgs SRCS EXTRA_DEPS)
+    cmake_parse_arguments(analysis_test "${options}" "${oneValueArgs}"
+                          "${multiValueArgs}" ${ARGN})
+    inference_base_test_build(
+      ${TARGET}
+      SRCS
+      ${analysis_test_SRCS}
+      DEPS
+      ${analysis_test_EXTRA_DEPS}
+      analysis
+      pass
+      ${GLOB_PASS_LIB})
+  endif()
+endfunction()
+
+function(inference_analysis_test_run TARGET)
+  if(WITH_TESTING)
+    set(options "")
+    set(oneValueArgs "")
+    set(multiValueArgs COMMAND ARGS)
+    cmake_parse_arguments(analysis_test "${options}" "${oneValueArgs}"
+                          "${multiValueArgs}" ${ARGN})
+    inference_base_test_run(${TARGET} COMMAND ${analysis_test_COMMAND} ARGS
+                            ${analysis_test_ARGS})
+    set_tests_properties(${TARGET} PROPERTIES LABELS "RUN_TYPE=INFER")
+  endif()
+endfunction()
+
+function(inference_analysis_test TARGET)
+  if(WITH_TESTING)
+    set(options "")
+    set(oneValueArgs "")
+    set(multiValueArgs SRCS ARGS EXTRA_DEPS)
+    cmake_parse_arguments(analysis_test "${options}" "${oneValueArgs}"
+                          "${multiValueArgs}" ${ARGN})
+    inference_base_test_build(
+      ${TARGET}
+      SRCS
+      ${analysis_test_SRCS}
+      DEPS
+      ${analysis_test_EXTRA_DEPS}
+      analysis
+      pass
+      ${GLOB_PASS_LIB})
+    inference_base_test_run(${TARGET} COMMAND ${TARGET} ARGS
+                            ${analysis_test_ARGS})
+    set_tests_properties(${TARGET} PROPERTIES LABELS "RUN_TYPE=INFER")
+  endif()
+endfunction()
+
+if(NOT APPLE AND NOT WIN32)
+  inference_analysis_test(
+    test_analyzer
+    SRCS
+    analyzer_tester.cc
+    EXTRA_DEPS
+    reset_tensor_array
+    paddle_inference_shared
+    ARGS
+    --inference_model_dir=${WORD2VEC_MODEL_DIR})
+elseif(WIN32)
+  inference_analysis_test(
+    test_analyzer
+    SRCS
+    analyzer_tester.cc
+    EXTRA_DEPS
+    reset_tensor_array
+    paddle_inference_api
+    ARGS
+    --inference_model_dir=${WORD2VEC_MODEL_DIR})
+  if(WITH_ONNXRUNTIME AND WIN32)
+    # Copy onnxruntime for some c++ test in Windows, since the test will
+    # be build only in CI, so suppose the generator in Windows is Ninja.
+    copy_onnx(test_analyzer)
+  endif()
+endif()

paddle/fluid/inference/api/analysis_predictor_tester.cc → test/cpp/inference/api/analysis_predictor_tester.cc

@@ -27,9 +27,9 @@
 #include "paddle/fluid/inference/api/helper.h"
 #include "paddle/fluid/inference/api/paddle_api.h"
 #include "paddle/fluid/inference/api/paddle_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/fluid/inference/utils/io_utils.h"
 #include "paddle/phi/backends/cpu/cpu_info.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_string(dirname, "", "dirname to tests.");
 

paddle/fluid/inference/tests/api/analyzer_bert_tester.cc → test/cpp/inference/api/analyzer_bert_tester.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/framework/transfer_scope_cache.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_bfloat16_image_classification_tester.cc → test/cpp/inference/api/analyzer_bfloat16_image_classification_tester.cc

@@ -13,8 +13,8 @@ limitations under the License. */
 #include <iostream>
 
 #include "paddle/fluid/inference/api/paddle_analysis_config.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/phi/backends/cpu/cpu_info.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_bool(enable_mkldnn, true, "Enable MKLDNN");
 

paddle/fluid/inference/tests/api/analyzer_capi_exp_gpu_tester.cc → test/cpp/inference/api/analyzer_capi_exp_gpu_tester.cc

@@ -24,7 +24,7 @@ limitations under the License. */
 #endif
 
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_exp_int_tester.cc → test/cpp/inference/api/analyzer_capi_exp_int_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_exp_ner_tester.cc → test/cpp/inference/api/analyzer_capi_exp_ner_tester.cc

@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_exp_pd_config_tester.cc → test/cpp/inference/api/analyzer_capi_exp_pd_config_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_exp_pd_tensor_tester.cc → test/cpp/inference/api/analyzer_capi_exp_pd_tensor_tester.cc

@@ -23,7 +23,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_exp_pd_threads_tester.cc → test/cpp/inference/api/analyzer_capi_exp_pd_threads_tester.cc

@@ -23,7 +23,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_exp_tester.cc → test/cpp/inference/api/analyzer_capi_exp_tester.cc

@@ -21,7 +21,7 @@ limitations under the License. */
 #include "paddle/fluid/inference/capi_exp/pd_config.h"
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
 #include "paddle/fluid/inference/capi_exp/pd_utils.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_exp_xpu_tester.cc → test/cpp/inference/api/analyzer_capi_exp_xpu_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi_exp/pd_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_gpu_tester.cc → test/cpp/inference/api/analyzer_capi_gpu_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi/paddle_c_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_int_tester.cc → test/cpp/inference/api/analyzer_capi_int_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi/paddle_c_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_ner_tester.cc → test/cpp/inference/api/analyzer_capi_ner_tester.cc

@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "paddle/fluid/inference/capi/paddle_c_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_pd_tensor_tester.cc → test/cpp/inference/api/analyzer_capi_pd_tensor_tester.cc

@@ -24,7 +24,7 @@ limitations under the License. */
 
 #include "paddle/fluid/inference/capi/c_api_internal.h"
 #include "paddle/fluid/inference/capi/paddle_c_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_tester.cc → test/cpp/inference/api/analyzer_capi_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi/paddle_c_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_capi_xpu_tester.cc → test/cpp/inference/api/analyzer_capi_xpu_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/fluid/inference/capi/paddle_c_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_dam_tester.cc → test/cpp/inference/api/analyzer_dam_tester.cc

@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "paddle/fluid/inference/analysis/helper.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 const int FLAGS_max_turn_num = 1;
 

paddle/fluid/inference/tests/api/analyzer_detect_functional_mkldnn_tester.cc → test/cpp/inference/api/analyzer_detect_functional_mkldnn_tester.cc

@@ -17,8 +17,8 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/phi/common/place.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_string(infer_shape, "", "data shape file");
 DEFINE_int32(sample, 20, "number of sample");

paddle/fluid/inference/tests/api/analyzer_detect_tester.cc → test/cpp/inference/api/analyzer_detect_tester.cc

@@ -17,7 +17,7 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_string(infer_shape, "", "data shape file");
 DEFINE_int32(sample, 20, "number of sample");

paddle/fluid/inference/tests/api/analyzer_dist_model_tester.cc → test/cpp/inference/api/analyzer_dist_model_tester.cc

@@ -17,8 +17,8 @@
 #include "paddle/fluid/framework/op_desc.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/fluid/inference/utils/singleton.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_dist_model_xpu_tester.cc → test/cpp/inference/api/analyzer_dist_model_xpu_tester.cc

@@ -17,8 +17,8 @@
 #include "paddle/fluid/framework/op_desc.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/fluid/inference/utils/singleton.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_ernie_int8_tester.cc → test/cpp/inference/api/analyzer_ernie_int8_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/analyzer_ernie_tester.h"
+#include "test/cpp/inference/api/analyzer_ernie_tester.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_ernie_tester.cc → test/cpp/inference/api/analyzer_ernie_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/analyzer_ernie_tester.h"
+#include "test/cpp/inference/api/analyzer_ernie_tester.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_ernie_tester.h → test/cpp/inference/api/analyzer_ernie_tester.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_image_classification_tester.cc → test/cpp/inference/api/analyzer_image_classification_tester.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_bool(disable_mkldnn_fc, false, "Disable usage of MKL-DNN's FC op");
 

paddle/fluid/inference/tests/api/analyzer_int8_image_classification_tester.cc → test/cpp/inference/api/analyzer_int8_image_classification_tester.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <iostream>
 
 #include "paddle/fluid/inference/api/paddle_analysis_config.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_bool(enable_mkldnn, true, "Enable MKLDNN");
 

paddle/fluid/inference/tests/api/analyzer_int8_object_detection_tester.cc → test/cpp/inference/api/analyzer_int8_object_detection_tester.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <iostream>
 
 #include "paddle/fluid/inference/api/paddle_analysis_config.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_bool(enable_mkldnn, true, "Enable MKLDNN");
 

paddle/fluid/inference/tests/api/analyzer_lac_tester.cc → test/cpp/inference/api/analyzer_lac_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_lexical_analysis_gru_tester.cc → test/cpp/inference/api/analyzer_lexical_analysis_gru_tester.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <iostream>
 
 #include "paddle/fluid/inference/api/paddle_analysis_config.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 // setting iterations to 0 means processing the whole dataset
 namespace paddle {

paddle/fluid/inference/tests/api/analyzer_mmp_tester.cc → test/cpp/inference/api/analyzer_mmp_tester.cc

@@ -15,7 +15,7 @@
 #include <random>
 
 #include "paddle/fluid/framework/transfer_scope_cache.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 // Here add missing commands
 DEFINE_string(infer_model2, "", "model path");
@@ -35,7 +35,9 @@ void SetConfig(AnalysisConfig* config, const std::string& infer_model) {
 }
 
 std::unique_ptr<PaddlePredictor> InitializePredictor(
-    const std::string& infer_model, std::vector<float>& data, bool use_mkldnn) {
+    const std::string& infer_model,
+    const std::vector<float>& data,
+    bool use_mkldnn) {
   AnalysisConfig cfg;
   SetConfig(&cfg, infer_model);
   if (use_mkldnn) {

paddle/fluid/inference/tests/api/analyzer_ner_tester.cc → test/cpp/inference/api/analyzer_ner_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_paddle_tensor_tester.cc → test/cpp/inference/api/analyzer_paddle_tensor_tester.cc

@@ -16,8 +16,8 @@
 #include "paddle/fluid/framework/op_desc.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/fluid/inference/utils/singleton.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_pyramid_dnn_tester.cc → test/cpp/inference/api/analyzer_pyramid_dnn_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_quant_image_classification_tester.cc → test/cpp/inference/api/analyzer_quant_image_classification_tester.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <iostream>
 
 #include "paddle/fluid/inference/api/paddle_analysis_config.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_bool(enable_mkldnn, true, "Enable MKLDNN");
 

paddle/fluid/inference/tests/api/analyzer_rnn1_tester.cc → test/cpp/inference/api/analyzer_rnn1_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 DEFINE_bool(with_precision_check, true, "turn on test");
 

paddle/fluid/inference/tests/api/analyzer_rnn2_tester.cc → test/cpp/inference/api/analyzer_rnn2_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_save_model_tester.cc → test/cpp/inference/api/analyzer_save_model_tester.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/inference/analysis/helper.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_seq_conv1_tester.cc → test/cpp/inference/api/analyzer_seq_conv1_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_seq_pool1_compare_determine_tester.cc → test/cpp/inference/api/analyzer_seq_pool1_compare_determine_tester.cc

@@ -16,8 +16,8 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/analyzer_seq_pool1_tester_helper.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/analyzer_seq_pool1_tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_seq_pool1_compare_tester.cc → test/cpp/inference/api/analyzer_seq_pool1_compare_tester.cc

@@ -16,8 +16,8 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/analyzer_seq_pool1_tester_helper.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/analyzer_seq_pool1_tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_seq_pool1_fuse_compare_zero_copy_tester.cc → test/cpp/inference/api/analyzer_seq_pool1_fuse_compare_zero_copy_tester.cc

@@ -16,8 +16,8 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/analyzer_seq_pool1_tester_helper.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/analyzer_seq_pool1_tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_seq_pool1_fuse_statis_tester.cc → test/cpp/inference/api/analyzer_seq_pool1_fuse_statis_tester.cc

@@ -16,8 +16,8 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/analyzer_seq_pool1_tester_helper.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/analyzer_seq_pool1_tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_seq_pool1_profile_tester.cc → test/cpp/inference/api/analyzer_seq_pool1_profile_tester.cc

@@ -16,8 +16,8 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/analyzer_seq_pool1_tester_helper.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/analyzer_seq_pool1_tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_seq_pool1_tester_helper.h → test/cpp/inference/api/analyzer_seq_pool1_tester_helper.h

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <utility>
 #include <vector>
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_text_classification_tester.cc → test/cpp/inference/api/analyzer_text_classification_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_transformer_compare_tester.cc → test/cpp/inference/api/analyzer_transformer_compare_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/analyzer_transformer_tester_helper.h"
+#include "test/cpp/inference/api/analyzer_transformer_tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_transformer_fuse_tester.cc → test/cpp/inference/api/analyzer_transformer_fuse_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/analyzer_transformer_tester_helper.h"
+#include "test/cpp/inference/api/analyzer_transformer_tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_transformer_profile_tester.cc → test/cpp/inference/api/analyzer_transformer_profile_tester.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/analyzer_transformer_tester_helper.h"
+#include "test/cpp/inference/api/analyzer_transformer_tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_transformer_tester_helper.h → test/cpp/inference/api/analyzer_transformer_tester_helper.h

@@ -16,7 +16,7 @@
 #include <utility>
 #include <vector>
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_vis_tester.cc → test/cpp/inference/api/analyzer_vis_tester.cc

@@ -17,7 +17,7 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_vit_ocr_tester.cc → test/cpp/inference/api/analyzer_vit_ocr_tester.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 #include <fstream>
 #include <iostream>
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/analyzer_zerocopy_tensor_tester.cc → test/cpp/inference/api/analyzer_zerocopy_tensor_tester.cc

@@ -16,8 +16,8 @@
 #include "paddle/fluid/framework/op_desc.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
 #include "paddle/fluid/inference/utils/singleton.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/api/api_impl_tester.cc → test/cpp/inference/api/api_impl_tester.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include "gflags/gflags.h"
 #include "paddle/fluid/framework/convert_utils.h"
 #include "paddle/fluid/inference/api/api_impl.h"
-#include "paddle/fluid/inference/tests/test_helper.h"
+#include "test/cpp/inference/test_helper.h"
 
 #ifdef __clang__
 #define ACC_DIFF 4e-3

paddle/fluid/inference/tests/api/gpu_ernie_half_test.cc → test/cpp/inference/api/gpu_ernie_half_test.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/inference/api/paddle_inference_api.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/ipu_ernie_fp16_test.cc → test/cpp/inference/api/ipu_ernie_fp16_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/ipu_ernie_test.cc → test/cpp/inference/api/ipu_ernie_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/ipu_multi_model_profile.cc → test/cpp/inference/api/ipu_multi_model_profile.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/ipu_resnet50_fp16_test.cc → test/cpp/inference/api/ipu_resnet50_fp16_test.cc

@@ -18,7 +18,7 @@ limitations under the License. */
 #include <cmath>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/ipu_resnet50_test.cc → test/cpp/inference/api/ipu_resnet50_test.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 #include <cmath>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/lite_mul_model_test.cc → test/cpp/inference/api/lite_mul_model_test.cc

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <thread>  // NOLINT
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/lite_resnet50_test.cc → test/cpp/inference/api/lite_resnet50_test.cc

@@ -18,7 +18,7 @@ limitations under the License. */
 #include <cmath>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/mkldnn_quantizer_config_tester.cc → test/cpp/inference/api/mkldnn_quantizer_config_tester.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <iostream>
 
 #include "paddle/fluid/inference/api/paddle_mkldnn_quantizer_config.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/paddle_infer_api_copy_tensor_tester.cc → test/cpp/inference/api/paddle_infer_api_copy_tensor_tester.cc

@@ -22,8 +22,8 @@ limitations under the License. */
 #include "gflags/gflags.h"
 #include "glog/logging.h"
 #include "paddle/fluid/inference/api/paddle_infer_contrib.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
 #include "paddle/fluid/platform/float16.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle_infer {
 

paddle/fluid/inference/tests/api/paddle_infer_api_test.cc → test/cpp/inference/api/paddle_infer_api_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/tester_helper.h"
+#include "test/cpp/inference/api/tester_helper.h"
 
 namespace paddle_infer {
 

paddle/fluid/inference/tests/api/tester_helper.h → test/cpp/inference/api/tester_helper.h

@@ -35,10 +35,10 @@
 #include "paddle/fluid/inference/api/helper.h"
 #include "paddle/fluid/inference/api/paddle_inference_api.h"
 #include "paddle/fluid/inference/api/paddle_inference_pass.h"
-#include "paddle/fluid/inference/tests/api/config_printer.h"
-#include "paddle/fluid/inference/tests/test_helper.h"
 #include "paddle/fluid/inference/utils/benchmark.h"
 #include "paddle/fluid/platform/profiler/event_tracing.h"
+#include "test/cpp/inference/api/config_printer.h"
+#include "test/cpp/inference/test_helper.h"
 
 DEFINE_string(model_name, "", "model name");
 DEFINE_string(infer_model, "", "model path");

paddle/fluid/inference/tests/api/trt_cascade_rcnn_test.cc → test/cpp/inference/api/trt_cascade_rcnn_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc → test/cpp/inference/api/trt_dynamic_shape_ernie_fp16_serialize_deserialize_test.cc

@@ -24,7 +24,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h"
+#include "test/cpp/inference/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc → test/cpp/inference/api/trt_dynamic_shape_ernie_serialize_deserialize_test.cc

@@ -24,7 +24,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h"
+#include "test/cpp/inference/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h → test/cpp/inference/api/trt_dynamic_shape_ernie_serialize_deserialize_test.h

@@ -26,7 +26,7 @@ limitations under the License. */
 #include <vector>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_dynamic_shape_ernie_test.cc → test/cpp/inference/api/trt_dynamic_shape_ernie_test.cc

@@ -17,7 +17,7 @@ limitations under the License. */
 #include "gflags/gflags.h"
 
 #include "paddle/fluid/inference/tensorrt/helper.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_dynamic_shape_test.cc → test/cpp/inference/api/trt_dynamic_shape_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_dynamic_shape_transformer_prune_test.cc → test/cpp/inference/api/trt_dynamic_shape_transformer_prune_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_fc_prelu_test.cc → test/cpp/inference/api/trt_fc_prelu_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_instance_norm_converter_test.cc → test/cpp/inference/api/trt_instance_norm_converter_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_mobilenet_test.cc → test/cpp/inference/api/trt_mobilenet_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_quant_int8_test.cc → test/cpp/inference/api/trt_quant_int8_test.cc

@@ -18,7 +18,7 @@ limitations under the License. */
 #include <numeric>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_quant_int8_yolov3_r50_test.cc → test/cpp/inference/api/trt_quant_int8_yolov3_r50_test.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 #include <numeric>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {

paddle/fluid/inference/tests/api/trt_resnet50_test.cc → test/cpp/inference/api/trt_resnet50_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <gtest/gtest.h>
 
 #include "gflags/gflags.h"
-#include "paddle/fluid/inference/tests/api/trt_test_helper.h"
+#include "test/cpp/inference/api/trt_test_helper.h"
 
 namespace paddle {
 namespace inference {