diff --git a/debug/accuracy_tools/msprobe/test/pytorch_ut/compare/test_acc_compare.py b/debug/accuracy_tools/msprobe/test/core_ut/compare/test_acc_compare.py similarity index 97% rename from debug/accuracy_tools/msprobe/test/pytorch_ut/compare/test_acc_compare.py rename to debug/accuracy_tools/msprobe/test/core_ut/compare/test_acc_compare.py index b08b09c8529928470899dbb9cd3ffc0e40be5f24..0e5f00045c932feba70d2316c3d114da877f9cd7 100644 --- a/debug/accuracy_tools/msprobe/test/pytorch_ut/compare/test_acc_compare.py +++ b/debug/accuracy_tools/msprobe/test/core_ut/compare/test_acc_compare.py @@ -4,7 +4,6 @@ import pandas as pd from msprobe.core.compare.check import check_graph_mode from msprobe.core.compare.utils import merge_tensor, read_op, get_accuracy, rename_api from msprobe.core.compare.highlight import find_error_rows,find_compare_result_error_rows -from msprobe.pytorch.compare.pt_compare import PTComparator npu_dict = {'op_name': ['Functional_conv2d_0_forward_input.0', 'Functional_conv2d_0_forward_input.1', 'Functional_conv2d_0_forward_input.2', 'Functional_conv2d_0_forward_output'], @@ -216,11 +215,6 @@ class TestUtilsMethods(unittest.TestCase): self.assertFalse(check_graph_mode(op1, op1)) self.assertFalse(check_graph_mode(op2, op2)) - def test_check_op(self): - fuzzy_match = False - ptComparator=PTComparator() - result = ptComparator.check_op(npu_dict, bench_dict, fuzzy_match) - self.assertEqual(result, True) def test_merge_tensor(self): op_dict = merge_tensor(tensor_list, True, False) @@ -230,12 +224,6 @@ class TestUtilsMethods(unittest.TestCase): result = read_op(op_data, op_name) self.assertEqual(result, op_result) - def test_match_op(self): - fuzzy_match = False - ptComparator=PTComparator() - a, b = ptComparator.match_op([npu_dict], [bench_dict], fuzzy_match) - self.assertEqual(a, 0) - self.assertEqual(b, 0) def test_get_accuracy(self): result = [] diff --git a/debug/accuracy_tools/msprobe/test/mindspore_ut/compare/test_ms_compare.py b/debug/accuracy_tools/msprobe/test/mindspore_ut/compare/test_ms_compare.py new file mode 100644 index 0000000000000000000000000000000000000000..751481c9d3a1c0cd41abee52ce5dc108641b1583 --- /dev/null +++ b/debug/accuracy_tools/msprobe/test/mindspore_ut/compare/test_ms_compare.py @@ -0,0 +1,31 @@ +# coding=utf-8 +import unittest +from msprobe.mindspore.compare.ms_compare import MSComparator + +npu_dict = {'op_name': ['ops_conv2d_0_forward_input.0', 'ops_conv2d_0_forward_input.1', + 'ops_conv2d_0_forward_input.2', 'ops_conv2d_0_forward_output'], + 'input_struct': [('Float32', [1, 1, 28, 28]), ('Float32', [16, 1, 5, 5]), + ('Float32', [16])], + 'output_struct': [('Float32', [1, 16, 28, 28])], + 'summary': [[3.029174327850342, -2.926689624786377, -0.06619918346405029], + [0.19919930398464203, -0.19974489510059357, 0.006269412115216255], + [0.19734230637550354, -0.18177609145641327, 0.007903944700956345], + [2.1166646480560303, -2.190781354904175, -0.003579073818400502]], 'stack_info': []} + +bench_dict = {'op_name': ['ops_conv2d_0_forward_input.0', 'ops_conv2d_0_forward_input.1', + 'ops_conv2d_0_forward_input.2', 'ops_conv2d_0_forward_output'], + 'input_struct': [('Float32', [1, 1, 28, 28]), ('Float32', [16, 1, 5, 5]), + ('Float32', [16])], + 'output_struct': [('Float32', [1, 16, 28, 28])], + 'summary': [[3.029174327850342, -2.926689624786377, -0.06619918346405029], + [0.19919930398464203, -0.19974489510059357, 0.006269412115216255], + [0.19734230637550354, -0.18177609145641327, 0.007903944700956345], + [2.1166646480560303, -2.190781354904175, -0.003579073818400502]], 'stack_info': []} + +class TestUtilsMethods(unittest.TestCase): + + def test_check_op_ms(self): + fuzzy_match = False + msComparator=MSComparator() + result = msComparator.check_op(npu_dict, bench_dict, fuzzy_match) + self.assertEqual(result, True) diff --git a/debug/accuracy_tools/msprobe/test/pytorch_ut/compare/test_pt_compare.py b/debug/accuracy_tools/msprobe/test/pytorch_ut/compare/test_pt_compare.py new file mode 100644 index 0000000000000000000000000000000000000000..dadd25d36cd0dc9c7e3bbc0b26d3864e5efcba88 --- /dev/null +++ b/debug/accuracy_tools/msprobe/test/pytorch_ut/compare/test_pt_compare.py @@ -0,0 +1,20 @@ +# coding=utf-8 +import unittest +from msprobe.pytorch.compare.pt_compare import PTComparator +from msprobe.test.core_ut.compare.test_acc_compare import npu_dict, bench_dict + + +class TestUtilsMethods(unittest.TestCase): + + def test_check_op(self): + fuzzy_match = False + ptComparator=PTComparator() + result = ptComparator.check_op(npu_dict, bench_dict, fuzzy_match) + self.assertEqual(result, True) + + def test_match_op(self): + fuzzy_match = False + ptComparator=PTComparator() + a, b = ptComparator.match_op([npu_dict], [bench_dict], fuzzy_match) + self.assertEqual(a, 0) + self.assertEqual(b, 0) \ No newline at end of file