Merge branch 'master' into tracking

This commit is contained in:
Daniel
2025-05-26 14:20:32 +02:00
12 changed files with 2524 additions and 3171 deletions

View File

@ -77,6 +77,7 @@ datasets = {
"path": "/datasets/panoptic/skelda/test.json",
"cams": ["00_03", "00_06", "00_12", "00_13", "00_23"],
# "cams": ["00_03", "00_06", "00_12"],
# "cams": ["00_03", "00_06", "00_12", "00_13", "00_23", "00_15", "00_10"],
# "cams": ["00_03", "00_06", "00_12", "00_13", "00_23", "00_15", "00_10", "00_21", "00_09", "00_01"],
# "cams": [],
"take_interval": 3,
@ -84,7 +85,9 @@ datasets = {
"min_match_score": 0.95,
"use_scenes": ["160906_pizza1", "160422_haggling1", "160906_ian5"],
"min_group_size": 1,
# "min_group_size": 4,
# "min_group_size": 1,
# "min_group_size": 1,
# "min_group_size": 2,
# "min_group_size": 11,
"min_bbox_area": 0.05 * 0.05,
"max_track_distance": 0.3 + default_max_movement_speed / (30 / 3),
@ -93,15 +96,14 @@ datasets = {
"path": "/datasets/mvor/skelda/all.json",
"take_interval": 1,
"fps": -1,
"with_depth": False,
"min_match_score": 0.85,
"min_match_score": 0.81,
"min_bbox_score": 0.25,
},
"campus": {
"path": "/datasets/campus/skelda/test.json",
"fps": 25,
"take_interval": 1,
"min_match_score": 0.92,
"min_match_score": 0.91,
"min_bbox_score": 0.5,
"max_track_distance": 0.3 + default_max_movement_speed / 25,
},
@ -117,7 +119,7 @@ datasets = {
"path": "/datasets/ikeaasm/skelda/test.json",
"take_interval": 2,
"fps": -1,
"min_match_score": 0.92,
"min_match_score": 0.81,
"min_bbox_score": 0.20,
},
"chi3d": {
@ -146,8 +148,8 @@ datasets = {
"take_interval": 2,
"fps": 20,
"subset": "tagging",
"min_match_score": 0.92,
"min_group_size": 2,
"min_match_score": 0.89,
"min_group_size": 1,
"min_bbox_score": 0.2,
"min_bbox_area": 0.05 * 0.05,
"max_movement_speed": 4.0 * 1.5,
@ -176,7 +178,7 @@ datasets = {
"take_interval": 2,
"fps": 20,
"subset": "basketball",
"min_group_size": 7,
"min_group_size": 4,
"min_bbox_score": 0.25,
"min_bbox_area": 0.025 * 0.025,
"max_movement_speed": 4.0 * 1.5,
@ -187,7 +189,8 @@ datasets = {
"take_interval": 2,
"fps": 20,
"subset": "volleyball",
"min_group_size": 11,
"min_match_score": 0.95,
"min_group_size": 7,
"min_bbox_score": 0.25,
"min_bbox_area": 0.05 * 0.05,
"max_movement_speed": 4.0 * 1.5,
@ -433,6 +436,19 @@ def main():
replace_head_with_nose=True,
)
if dataset_use == "shelf":
# Also run old-style evaluation for shelf dataset
odir = os.path.join(output_dir, "pcp/") if output_dir != "" else ""
_ = evals.campus_shelf.run_eval(
labels,
all_poses_3d,
all_ids,
joint_names_net=joint_names_3d,
save_error_imgs=odir,
debug_2D_preds=all_poses_2d,
)
# ==================================================================================================
if __name__ == "__main__":