mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-20 21:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

process replay: print correct ref path (#25448)

Browse Source 
* fix log paths ref printing in process replay

* rm that

* this is easier to read

* fix model_replay
This commit is contained in:
Shane Smiskol
2022-08-16 00:32:42 -07:00
committed by GitHub
parent df48ab9ee2
commit 4602e5a8f9
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/test/process_replay/model_replay.py
+1 -1
View File
@@ -176,7 +176,7 @@ if __name__ == "__main__":
# TODO this tolerence is absurdly large
tolerance = 5e-1 if PC else None
results: Any = {TEST_ROUTE: {}}
log_paths: Any = {TEST_ROUTE: {'ref': BASE_URL + log_fn, 'new': log_fn}}
log_paths: Any = {TEST_ROUTE: {"models": {'ref': BASE_URL + log_fn, 'new': log_fn}}}
results[TEST_ROUTE]["models"] = compare_logs(cmp_log, log_msgs, tolerance=tolerance, ignore_fields=ignore)
diff1, diff2, failed = format_diff(results, log_paths, ref_commit)
selfdrive/test/process_replay/test_processes.py
+9 -10
View File
@@ -117,19 +117,19 @@ def format_diff(results, log_paths, ref_commit):
for proc, diff in list(result.items()):
# long diff
diff2 += f"*** process: {proc} ***\n"
diff2 += f"\tref: {log_paths[segment]['ref']}\n\n"
diff2 += f"\tnew: {log_paths[segment]['new']}\n\n"
diff2 += f"\tref: {log_paths[segment][proc]['ref']}\n"
diff2 += f"\tnew: {log_paths[segment][proc]['new']}\n\n"
# short diff
diff1 += f" {proc}\n"
if isinstance(diff, str):
diff1 += f" ref: {log_paths[segment]['ref']}\n"
diff1 += f" new: {log_paths[segment]['new']}\n\n"
diff1 += f" ref: {log_paths[segment][proc]['ref']}\n"
diff1 += f" new: {log_paths[segment][proc]['new']}\n\n"
diff1 += f" {diff}\n"
failed = True
elif len(diff):
diff1 += f" ref: {log_paths[segment]['ref']}\n"
diff1 += f" new: {log_paths[segment]['new']}\n\n"
diff1 += f" ref: {log_paths[segment][proc]['ref']}\n"
diff1 += f" new: {log_paths[segment][proc]['new']}\n\n"
cnt: Dict[str, int] = {}
for d in diff:
@@ -196,8 +196,7 @@ if __name__ == "__main__":
untested = (set(interface_names) - set(excluded_interfaces)) - {c.lower() for c in tested_cars}
assert len(untested) == 0, f"Cars missing routes: {str(untested)}"
log_paths: DefaultDict[str, Dict[str, str]] = defaultdict(dict)
log_paths: DefaultDict[str, Dict[str, Dict[str, str]]] = defaultdict(lambda: defaultdict(dict))
with concurrent.futures.ProcessPoolExecutor(max_workers=args.jobs) as pool:
if not args.upload_only:
download_segments = [seg for car, seg in segments if car in tested_cars]
@@ -225,8 +224,8 @@ if __name__ == "__main__":
dat = None if args.upload_only else log_data[segment]
pool_args.append((segment, cfg, args, cur_log_fn, ref_log_path, dat))
log_paths[segment]['ref'] = ref_log_path
log_paths[segment]['new'] = cur_log_fn
log_paths[segment][cfg.proc_name + cfg.subtest_name]['ref'] = ref_log_path
log_paths[segment][cfg.proc_name + cfg.subtest_name]['new'] = cur_log_fn
results: Any = defaultdict(dict)
p2 = pool.map(run_test_process, pool_args)