[Cherry-Pick] fix data collector error (#5534)

* fix data collector error

* change List to Tuple to adapt different cv version

* fix reid model_dir set

deploy/pphuman/datacollector.py

@@ -90,7 +90,7 @@ class DataCollector(object):
             if kpt_res:
                 self.collector[ids]["kpts"].append(
                     [kpt_res['keypoint'][0][idx], kpt_res['keypoint'][1][idx]])
-            if action_res:
+            if action_res and (idx + 1) in action_res:
                 self.collector[ids]["actions"].append(action_res[idx + 1])
             else:
                 # action model generate result per X frames, Not available every frames

deploy/pphuman/pipe_utils.py

@@ -217,7 +217,7 @@ class PipeTimer(Times):
 
 def merge_model_dir(args, model_dir):
     # set --model_dir DET=ppyoloe/ to overwrite the model_dir in config file
-    task_set = ['DET', 'ATTR', 'MOT', 'KPT', 'ACTION']
+    task_set = ['DET', 'ATTR', 'MOT', 'KPT', 'ACTION', 'REID']
     if not model_dir:
         return args
     for md in model_dir:

deploy/pphuman/reid.py

@@ -73,7 +73,7 @@ class ReID(object):
         self.det_times = Timer()
         self.cpu_mem, self.gpu_mem, self.gpu_util = 0, 0, 0
         self.batch_size = batch_size
-        self.input_wh = [128, 256]
+        self.input_wh = (128, 256)
 
     def set_config(self, model_dir):
         return PredictConfig(model_dir)