From 098b06754f5228df003e488980df0a89f0dfa811 Mon Sep 17 00:00:00 2001 From: WJJ1995 Date: Thu, 9 Mar 2023 22:12:58 +0800 Subject: [PATCH] [Benchmark]Fixed PrintBenchmarkInfo bug (#1570) * add GPL lisence * add GPL-3.0 lisence * add GPL-3.0 lisence * add GPL-3.0 lisence * support yolov8 * add pybind for yolov8 * add yolov8 readme * add cpp benchmark * add cpu and gpu mem * public part split * add runtime mode * fixed bugs * add cpu_thread_nums * deal with comments * deal with comments * deal with comments * rm useless code * add FASTDEPLOY_DECL * add FASTDEPLOY_DECL * fixed for windows * mv rss to pss * mv rss to pss * Update utils.cc * use thread to collect mem * Add ResourceUsageMonitor * rm useless code * fixed bug * fixed typo * update ResourceUsageMonitor * fixed bug * fixed bug * add note for ResourceUsageMonitor * deal with comments * add macros * deal with comments * deal with comments * deal with comments * re-lint * rm pmap and use mem api * rm pmap and use mem api * add mem api * Add PrintBenchmarkInfo func * Add PrintBenchmarkInfo func * Add PrintBenchmarkInfo func * deal with comments * fixed enable_paddle_to_trt * add log for paddle_trt * support ppcls benchmark * use new trt option api * update benchmark info * simplify benchmark.cc * simplify benchmark.cc * deal with comments * Add ppseg && ppocr benchmark * add OCR rec img * add ocr benchmark * fixed trt shape * add trt shape * resolve conflict * add ENABLE_BENCHMARK define * Add ClassifyDiff * Add Resize for ClassifyResult * deal with comments * add convert info script * resolve conflict * Add SaveBenchmarkResult func * fixed bug * fixed bug * fixed bug * add config.txt for option * fixed bug * fixed bug * fixed bug * add benchmark.sh * mv thread_nums from 8 to 1 * deal with comments * deal with comments * fixed readme * deal with comments * add all platform shell * Update config.arm.txt * Update config.gpu.txt * Update config.x86.txt * fixed printinfo bug --------- Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> --- benchmark/cpp/config.arm.txt | 2 +- benchmark/cpp/config.gpu.txt | 2 +- benchmark/cpp/config.x86.txt | 2 +- benchmark/cpp/config.xpu.txt | 2 +- benchmark/cpp/option.h | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/benchmark/cpp/config.arm.txt b/benchmark/cpp/config.arm.txt index 2e3526c1f..69187a060 100755 --- a/benchmark/cpp/config.arm.txt +++ b/benchmark/cpp/config.arm.txt @@ -11,4 +11,4 @@ collect_memory_info: false sampling_interval: 1 precision_compare: false xpu_l3_cache: 0 -result_path: benchmark_arm.txt +result_path: benchmark_arm.txt \ No newline at end of file diff --git a/benchmark/cpp/config.gpu.txt b/benchmark/cpp/config.gpu.txt index 476745622..c5437718e 100755 --- a/benchmark/cpp/config.gpu.txt +++ b/benchmark/cpp/config.gpu.txt @@ -11,4 +11,4 @@ collect_memory_info: false sampling_interval: 1 precision_compare: false xpu_l3_cache: 0 -result_path: benchmark_gpu.txt +result_path: benchmark_gpu.txt \ No newline at end of file diff --git a/benchmark/cpp/config.x86.txt b/benchmark/cpp/config.x86.txt index d98a45ad5..153c3e76a 100755 --- a/benchmark/cpp/config.x86.txt +++ b/benchmark/cpp/config.x86.txt @@ -11,4 +11,4 @@ collect_memory_info: false sampling_interval: 1 precision_compare: false xpu_l3_cache: 0 -result_path: benchmark_x86.txt +result_path: benchmark_x86.txt \ No newline at end of file diff --git a/benchmark/cpp/config.xpu.txt b/benchmark/cpp/config.xpu.txt index a99ebe05a..2dded3221 100755 --- a/benchmark/cpp/config.xpu.txt +++ b/benchmark/cpp/config.xpu.txt @@ -11,4 +11,4 @@ collect_memory_info: false sampling_interval: 1 precision_compare: false xpu_l3_cache: 0 -result_path: benchmark_xpu.txt +result_path: benchmark_xpu.txt \ No newline at end of file diff --git a/benchmark/cpp/option.h b/benchmark/cpp/option.h index b04dcafda..1c0032e10 100755 --- a/benchmark/cpp/option.h +++ b/benchmark/cpp/option.h @@ -45,6 +45,7 @@ static bool CreateRuntimeOption(fastdeploy::RuntimeOption* option, option->trt_option.enable_fp16 = true; } } else if (config_info["backend"] == "default") { + PrintBenchmarkInfo(config_info); return true; } else { std::cout << "While inference with GPU, only support " @@ -67,6 +68,7 @@ static bool CreateRuntimeOption(fastdeploy::RuntimeOption* option, option->paddle_lite_option.enable_fp16 = true; } } else if (config_info["backend"] == "default") { + PrintBenchmarkInfo(config_info); return true; } else { std::cout << "While inference with CPU, only support " @@ -88,6 +90,7 @@ static bool CreateRuntimeOption(fastdeploy::RuntimeOption* option, option->paddle_lite_option.enable_fp16 = true; } } else if (config_info["backend"] == "default") { + PrintBenchmarkInfo(config_info); return true; } else { std::cout << "While inference with XPU, only support "