From 227368762aa666c18dbb5ba06346490439e55188 Mon Sep 17 00:00:00 2001 From: wangguanzhong Date: Tue, 22 Mar 2022 12:23:43 +0800 Subject: [PATCH] refine pptracking import (#5421) --- deploy/pphuman/pipeline.py | 2 +- deploy/pptracking/python/det_infer.py | 6 +++--- deploy/pptracking/python/{ => mot}/visualize.py | 0 deploy/pptracking/python/mot_jde_infer.py | 8 ++++---- deploy/pptracking/python/mot_sde_infer.py | 8 ++++---- deploy/pptracking/python/{utils.py => mot_utils.py} | 3 +-- deploy/python/mot_sde_infer.py | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) rename deploy/pptracking/python/{ => mot}/visualize.py (100%) rename deploy/pptracking/python/{utils.py => mot_utils.py} (99%) diff --git a/deploy/pphuman/pipeline.py b/deploy/pphuman/pipeline.py index c4f1901a0..f87035dc4 100644 --- a/deploy/pphuman/pipeline.py +++ b/deploy/pphuman/pipeline.py @@ -40,7 +40,7 @@ from python.preprocess import decode_image from python.visualize import visualize_box_mask, visualize_attr, visualize_pose, visualize_action from pptracking.python.mot_sde_infer import SDE_Detector -from pptracking.python.visualize import plot_tracking +from pptracking.python.mot.visualize import plot_tracking class Pipeline(object): diff --git a/deploy/pptracking/python/det_infer.py b/deploy/pptracking/python/det_infer.py index b586621f9..90a391e07 100644 --- a/deploy/pptracking/python/det_infer.py +++ b/deploy/pptracking/python/det_infer.py @@ -33,8 +33,8 @@ sys.path.insert(0, parent_path) from benchmark_utils import PaddleInferBenchmark from picodet_postprocess import PicoDetPostProcess from preprocess import preprocess, Resize, NormalizeImage, Permute, PadStride, LetterBoxResize, decode_image -from visualize import visualize_box_mask -from utils import argsparser, Timer, get_current_memory_mb +from mot.visualize import visualize_box_mask +from mot_utils import argsparser, Timer, get_current_memory_mb # Global dictionary SUPPORT_MODELS = { @@ -269,7 +269,7 @@ class Detector(object): if not os.path.exists(self.output_dir): os.makedirs(self.output_dir) out_path = os.path.join(self.output_dir, video_out_name) - fourcc = cv2.VideoWriter_fourcc(*'mp4v') + fourcc = cv2.VideoWriter_fourcc(* 'mp4v') writer = cv2.VideoWriter(out_path, fourcc, fps, (width, height)) index = 1 while (1): diff --git a/deploy/pptracking/python/visualize.py b/deploy/pptracking/python/mot/visualize.py similarity index 100% rename from deploy/pptracking/python/visualize.py rename to deploy/pptracking/python/mot/visualize.py diff --git a/deploy/pptracking/python/mot_jde_infer.py b/deploy/pptracking/python/mot_jde_infer.py index 6a4e18abd..6ce7a5e4f 100644 --- a/deploy/pptracking/python/mot_jde_infer.py +++ b/deploy/pptracking/python/mot_jde_infer.py @@ -22,7 +22,7 @@ import paddle from benchmark_utils import PaddleInferBenchmark from preprocess import decode_image -from utils import argsparser, Timer, get_current_memory_mb +from mot_utils import argsparser, Timer, get_current_memory_mb from det_infer import Detector, get_test_images, print_arguments, bench_log, PredictConfig # add python path @@ -31,8 +31,8 @@ parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) sys.path.insert(0, parent_path) from mot import JDETracker -from utils import MOTTimer, write_mot_results -from visualize import plot_tracking, plot_tracking_dict +from mot.utils import MOTTimer, write_mot_results +from mot.visualize import plot_tracking, plot_tracking_dict # Global dictionary MOT_JDE_SUPPORT_MODELS = { @@ -264,7 +264,7 @@ class JDE_Detector(Detector): if not os.path.exists(self.output_dir): os.makedirs(self.output_dir) out_path = os.path.join(self.output_dir, video_out_name) - fourcc = cv2.VideoWriter_fourcc(*'mp4v') + fourcc = cv2.VideoWriter_fourcc(* 'mp4v') writer = cv2.VideoWriter(out_path, fourcc, fps, (width, height)) frame_id = 1 diff --git a/deploy/pptracking/python/mot_sde_infer.py b/deploy/pptracking/python/mot_sde_infer.py index 5e15adb21..9eac91278 100644 --- a/deploy/pptracking/python/mot_sde_infer.py +++ b/deploy/pptracking/python/mot_sde_infer.py @@ -24,17 +24,17 @@ import paddle from benchmark_utils import PaddleInferBenchmark from preprocess import decode_image -from .utils import argsparser, Timer, get_current_memory_mb, _is_valid_video, video2frames -from .det_infer import Detector, get_test_images, print_arguments, bench_log, PredictConfig, load_predictor # add python path import sys -parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) +parent_path = os.path.abspath(os.path.join(__file__, *(['..']))) sys.path.insert(0, parent_path) +from det_infer import Detector, get_test_images, print_arguments, bench_log, PredictConfig, load_predictor +from mot_utils import argsparser, Timer, get_current_memory_mb, video2frames, _is_valid_video from mot.tracker import JDETracker, DeepSORTTracker from mot.utils import MOTTimer, write_mot_results, flow_statistic, get_crops, clip_box -from .visualize import plot_tracking, plot_tracking_dict +from mot.visualize import plot_tracking, plot_tracking_dict from mot.mtmct.utils import parse_bias from mot.mtmct.postprocess import trajectory_fusion, sub_cluster, gen_res, print_mtmct_result diff --git a/deploy/pptracking/python/utils.py b/deploy/pptracking/python/mot_utils.py similarity index 99% rename from deploy/pptracking/python/utils.py rename to deploy/pptracking/python/mot_utils.py index a4eddfe1b..04f942060 100644 --- a/deploy/pptracking/python/utils.py +++ b/deploy/pptracking/python/mot_utils.py @@ -147,7 +147,6 @@ def argsparser(): return parser - class Times(object): def __init__(self): self.time = 0. @@ -241,7 +240,7 @@ class Timer(Times): total_time = pre_time + infer_time + post_time if self.with_tracker: dic['tracking_time_s'] = round(track_time / max(1, self.img_num), - 4) if average else track_time + 4) if average else track_time total_time = total_time + track_time dic['total_time_s'] = round(total_time, 4) return dic diff --git a/deploy/python/mot_sde_infer.py b/deploy/python/mot_sde_infer.py index 3394db188..4dd66dda0 100644 --- a/deploy/python/mot_sde_infer.py +++ b/deploy/python/mot_sde_infer.py @@ -32,7 +32,7 @@ sys.path.insert(0, parent_path) from pptracking.python.mot import JDETracker from pptracking.python.mot.utils import MOTTimer, write_mot_results -from pptracking.python.visualize import plot_tracking, plot_tracking_dict +from pptracking.python.mot.visualize import plot_tracking, plot_tracking_dict class SDE_Detector(Detector): -- GitLab