From 4d71160c84104f1085ef379cb952e711f2cc9bef Mon Sep 17 00:00:00 2001 From: Linwei-Ying Date: Wed, 26 Jun 2024 15:58:15 +0800 Subject: [PATCH 1/3] ops read bugfix --- debug/accuracy_tools/atat/pytorch/compare/acc_compare.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py b/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py index b8ed192305..31da2edd0b 100644 --- a/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py +++ b/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py @@ -844,7 +844,7 @@ def compare_process(file_handles, stack_mode, fuzzy_match, summary_compare=False read_err_bench = True while True: - if not read_err_npu or not read_err_bench: + if not read_err_npu and not read_err_bench: break try: op_name_npu = next(ops_npu_iter) @@ -860,7 +860,6 @@ def compare_process(file_handles, stack_mode, fuzzy_match, summary_compare=False npu_ops_queue.append(merge_tensor(npu_op_parsed_list, summary_compare, md5_compare)) except StopIteration: read_err_npu = False - continue try: op_name_bench = next(ops_bench_iter) read_err_bench = True @@ -876,10 +875,11 @@ def compare_process(file_handles, stack_mode, fuzzy_match, summary_compare=False bench_ops_queue.append(merge_tensor(bench_op_parsed_list, summary_compare, md5_compare)) except StopIteration: read_err_bench = False - continue - if len(npu_ops_queue) == 0 or len(bench_ops_queue) == 0: + if len(npu_ops_queue) == 0: break + if len(bench_ops_queue) == 0: + continue n_match_point, b_match_point = match_op(npu_ops_queue, bench_ops_queue, fuzzy_match) if n_match_point == -1 and b_match_point == -1: -- Gitee From 683ca856ea928cd9a1b1cb4fd24585add9f40a19 Mon Sep 17 00:00:00 2001 From: Linwei-Ying Date: Wed, 26 Jun 2024 17:04:03 +0800 Subject: [PATCH 2/3] fix according to review --- debug/accuracy_tools/atat/pytorch/compare/acc_compare.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py b/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py index 31da2edd0b..8167aef6cd 100644 --- a/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py +++ b/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py @@ -876,9 +876,9 @@ def compare_process(file_handles, stack_mode, fuzzy_match, summary_compare=False except StopIteration: read_err_bench = False - if len(npu_ops_queue) == 0: + if not npu_ops_queue: break - if len(bench_ops_queue) == 0: + if not bench_ops_queue: continue n_match_point, b_match_point = match_op(npu_ops_queue, bench_ops_queue, fuzzy_match) -- Gitee From e5198b5834cb98715e843f11794f41254ffb8d1a Mon Sep 17 00:00:00 2001 From: Linwei-Ying Date: Wed, 26 Jun 2024 19:42:31 +0800 Subject: [PATCH 3/3] fix according to review --- debug/accuracy_tools/atat/pytorch/compare/acc_compare.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py b/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py index 8167aef6cd..f01b74f98a 100644 --- a/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py +++ b/debug/accuracy_tools/atat/pytorch/compare/acc_compare.py @@ -841,10 +841,9 @@ def compare_process(file_handles, stack_mode, fuzzy_match, summary_compare=False ops_npu_iter = iter(npu_json_data['data']) ops_bench_iter = iter(bench_json_data['data']) read_err_npu = True - read_err_bench = True while True: - if not read_err_npu and not read_err_bench: + if not read_err_npu: break try: op_name_npu = next(ops_npu_iter) @@ -862,7 +861,6 @@ def compare_process(file_handles, stack_mode, fuzzy_match, summary_compare=False read_err_npu = False try: op_name_bench = next(ops_bench_iter) - read_err_bench = True bench_op_data = bench_json_data['data'][op_name_bench] bench_op_parsed_list = read_op(bench_op_data, op_name_bench) @@ -874,7 +872,7 @@ def compare_process(file_handles, stack_mode, fuzzy_match, summary_compare=False bench_ops_queue.append(merge_tensor(bench_op_parsed_list, summary_compare, md5_compare)) except StopIteration: - read_err_bench = False + pass if not npu_ops_queue: break -- Gitee