fix conflicts

83303bc7 · LDOUBLEV · 3af943f3 · af0bac58 · 83303bc7 · 83303bc7
Commit 83303bc7 authored Oct 09, 2021 by LDOUBLEV
20 changed files
--- a/tests/ocr_rec_params.txt
+++ b/tests/ocr_rec_params.txt
--- a/tests/ocr_rec_server_params.txt
+++ b/tests/ocr_rec_server_params.txt
--- a/tests/prepare.sh
+++ b/tests/prepare.sh
--- a/tests/readme.md
+++ b/tests/readme.md
--- a/tests/results/det_results_gpu_fp32.txt
+++ b/tests/results/det_results_gpu_fp32.txt
--- a/tests/results/det_results_gpu_trt_fp16.txt
+++ b/tests/results/det_results_gpu_trt_fp16.txt
--- a/tests/results/det_results_gpu_trt_fp16_cpp.txt
+++ b/tests/results/det_results_gpu_trt_fp16_cpp.txt
--- a/tests/results/det_results_gpu_trt_fp32_cpp.txt
+++ b/tests/results/det_results_gpu_trt_fp32_cpp.txt
--- a/tests/test.sh
+++ b/tests/test.sh
--- a/tools/eval.py
+++ b/tools/eval.py
--- a/tools/export_model.py
+++ b/tools/export_model.py
--- a/tools/infer/predict_cls.py
+++ b/tools/infer/predict_cls.py
--- a/tools/infer/predict_det.py
+++ b/tools/infer/predict_det.py
--- a/tools/infer/predict_e2e.py
+++ b/tools/infer/predict_e2e.py
--- a/tools/infer/predict_rec.py
+++ b/tools/infer/predict_rec.py
--- a/tools/infer/predict_system.py
+++ b/tools/infer/predict_system.py
--- a/tools/infer/utility.py
+++ b/tools/infer/utility.py
--- a/tools/infer_cls.py
+++ b/tools/infer_cls.py
--- a/tools/infer_det.py
+++ b/tools/infer_det.py
--- a/tools/infer_e2e.py
+++ b/tools/infer_e2e.py