[CherryPick] Fix issue 60092 (#61427)

* fix issue 60092

* update

* update

* update

Author: yuanlehome

paddle/fluid/inference/CMakeLists.txt

@@ -35,7 +35,7 @@ get_property(fluid_modules GLOBAL PROPERTY FLUID_MODULES)
 get_property(phi_modules GLOBAL PROPERTY PHI_MODULES)
 get_property(ir_targets GLOBAL PROPERTY IR_TARGETS)
 get_property(not_infer_modules GLOBAL PROPERTY NOT_INFER_MODULES)
-set(utils_modules pretty_log string_helper benchmark utf8proc)
+set(utils_modules pretty_log string_helper utf8proc)
 
 if(NOT WITH_GFLAGS)
   set(utils_modules ${utils_modules} paddle_flags)

paddle/fluid/inference/utils/CMakeLists.txt

@@ -1,8 +1,3 @@
-cc_library(
-  benchmark
-  SRCS benchmark.cc
-  DEPS enforce common)
-paddle_test(test_benchmark SRCS benchmark_tester.cc DEPS benchmark)
 cc_library(
   infer_io_utils
   SRCS io_utils.cc
@@ -13,13 +8,5 @@ cc_library(
   DEPS proto_desc enforce common)
 
 cc_library(table_printer SRCS table_printer.cc)
-paddle_test(test_table_printer SRCS table_printer_tester.cc)
 
 proto_library(shape_range_info_proto SRCS shape_range_info.proto)
-
-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_benchmark)
-  copy_onnx(test_table_printer)
-endif()

paddle/fluid/inference/utils/benchmark.cc

@@ -1,8 +1,6 @@
 add_subdirectory(benchmark)
 add_subdirectory(framework)
 
-add_subdirectory(inference)
-
 if(WITH_CINN)
   add_subdirectory(cinn)
 endif()

paddle/fluid/inference/utils/benchmark.h

@@ -34,7 +34,6 @@
 #include "paddle/fluid/inference/api/analysis_predictor.h"
 #include "paddle/fluid/inference/api/helper.h"
 #include "paddle/fluid/inference/api/paddle_inference_api.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"
@@ -69,9 +68,6 @@ PD_DEFINE_int32(num_threads,
 PD_DEFINE_bool(use_analysis,
                true,
                "Running the inference program in analysis mode.");
-PD_DEFINE_bool(record_benchmark,
-               false,
-               "Record benchmark after profiling the model");
 PD_DEFINE_double(accuracy, 1e-3, "Result Accuracy.");
 PD_DEFINE_double(quantized_accuracy, 2e-2, "Result Quantized Accuracy.");
 PD_DEFINE_bool(zero_copy, false, "Use ZeroCopy to speedup Feed/Fetch.");
@@ -594,14 +590,6 @@ void PredictionRun(PaddlePredictor *predictor,
 
   if (sample_latency != nullptr)
     *sample_latency = batch_latency / FLAGS_batch_size;
-
-  if (FLAGS_record_benchmark) {
-    Benchmark benchmark;
-    benchmark.SetName(FLAGS_model_name);
-    benchmark.SetBatchSize(FLAGS_batch_size);
-    benchmark.SetLatency(batch_latency);
-    benchmark.PersistToFile("benchmark_record.txt");
-  }
 }
 
 void TestOneThreadPrediction(

paddle/fluid/inference/utils/benchmark_tester.cc

@@ -111,10 +111,9 @@ function(inference_base_test_build TARGET)
   add_executable(${TARGET} ${base_test_SRCS})
   if("${base_test_DEPS};" MATCHES "paddle_inference_shared;")
     list(REMOVE_ITEM base_test_DEPS paddle_inference_shared)
-    target_link_libraries(
-      ${TARGET} $<TARGET_LINKER_FILE:paddle_inference_shared>
-      $<TARGET_LINKER_FILE:benchmark>)
-    add_dependencies(${TARGET} paddle_inference_shared benchmark)
+    target_link_libraries(${TARGET}
+                          $<TARGET_LINKER_FILE:paddle_inference_shared>)
+    add_dependencies(${TARGET} paddle_inference_shared)
   elseif("${base_test_DEPS};" MATCHES "paddle_inference_c_shared;")
     list(REMOVE_ITEM base_test_DEPS paddle_inference_c_shared)
     target_link_libraries(${TARGET}

paddle/fluid/inference/utils/table_printer_tester.cc

@@ -28,7 +28,6 @@
     'test_fc_gru_fuse_pass_cc',
     'device_worker_test',
     'test_custom_conj',
-    'infer_io_utils_tester',
     'test_transpose_bf16_mkldnn_op',
     'test_container',
     'cpu_helper_test',
@@ -73,7 +72,6 @@
     'test_pybind_interface',
     'test_io_save_load',
     'test_fusion_lstm_int8_mkldnn_op',
-    'test_benchmark',
     'test_protobuf',
     'test_tdm_sampler_op',
     'test_teacher_student_sigmoid_loss_op',
@@ -482,7 +480,6 @@
     'test_communicator_half_async',
     'test_dynrnn_gradient_check',
     'test_pool2d_bf16_mkldnn_op',
-    'test_table_printer',
     'test_framework_debug_str',
     'test_dist_fleet_ps2',
     'test_collective_scatter_api',
@@ -1926,7 +1923,6 @@
     'test_bpr_loss_op',
     'test_boxps',
     'test_bipartite_match_op',
-    'test_benchmark',
     'test_beam_search_op',
     'test_batch_sampler',
     'test_batch_norm_act_fuse_pass',
@@ -1970,7 +1966,6 @@
     'lodtensor_printer_test',
     'test_dispatch_jit',
     'inlined_vector_test',
-    'infer_io_utils_tester',
     'graph_to_program_pass_test',
     'graph_test',
     'graph_helper_test',
@@ -2176,7 +2171,6 @@
     'test_auto_parallel_api',
     'test_tensor_copy_from',
     'test_analyzer_capi_exp_xpu',
-    'test_table_printer',
     'test_egr_task_autocodegen',
     'test_static_save_load_bf16',
     'test_parallel_executor_run_cinn',