refine pptracking import (#5421)

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):

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):

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

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

deploy/pptracking/python/utils.py → 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

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):