From 0568300da7bfe6ba17bf63a23c474419e5b6ece8 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Sat, 1 Oct 2022 17:01:22 +0800 Subject: [PATCH 1/4] mkldnn_op_test --- .../fluid/tests/unittests/mkldnn/mkldnn_op_test.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py b/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py index 3b6788e6ab126..0091353f57910 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py @@ -17,9 +17,12 @@ import paddle.fluid as fluid -def __assert_close(test_case, tensor, np_array, msg, atol=1e-4): - test_case.assertTrue(np.allclose(np.array(tensor), np_array, atol=atol), - msg) +def __assert_close(tensor, np_array, msg, atol=1e-4, rtol=1e-5): + np.testing.allclose(np.array(tensor), + np_array, + atol=atol, + rtol=rtol, + err_msg=msg) def check_if_mkldnn_primitives_exist_in_bwd(test_case, op_type, x, out, @@ -69,7 +72,7 @@ def check_if_mkldnn_primitives_exist_in_bwd(test_case, op_type, x, out, for name in ['x', 'out@GRAD']}, fetch_list=['x@GRAD', 'out']) - __assert_close(test_case, x_grad, out[0], 'x@GRAD') + __assert_close(x_grad, out[0], 'x@GRAD') def check_if_mkldnn_batchnorm_primitives_exist_in_bwd(test_case, var_dict, @@ -144,7 +147,7 @@ def check_if_mkldnn_batchnorm_primitives_exist_in_bwd(test_case, var_dict, }, fetch_list=test_case.fetch_list) for id, name in enumerate(test_case.fetch_list): - __assert_close(test_case, var_dict[name], out[id], name) + __assert_close(var_dict[name], out[id], name) print("MKLDNN op test forward passed: ", str(place), data_layout) From dc3b9385a39ed1d5cec622a70b2649d4ff5d5e03 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Sat, 1 Oct 2022 17:05:06 +0800 Subject: [PATCH 2/4] op_test --- .../tests/unittests/mkldnn/mkldnn_op_test.py | 10 +++--- .../paddle/fluid/tests/unittests/op_test.py | 33 +++++++++---------- .../test_quantile_and_nanquantile.py | 5 ++- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py b/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py index 0091353f57910..f7c712f46b911 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py @@ -18,11 +18,11 @@ def __assert_close(tensor, np_array, msg, atol=1e-4, rtol=1e-5): - np.testing.allclose(np.array(tensor), - np_array, - atol=atol, - rtol=rtol, - err_msg=msg) + np.testing.assert_allclose(np.array(tensor), + np_array, + atol=atol, + rtol=rtol, + err_msg=msg) def check_if_mkldnn_primitives_exist_in_bwd(test_case, op_type, x, out, diff --git a/python/paddle/fluid/tests/unittests/op_test.py b/python/paddle/fluid/tests/unittests/op_test.py index 18eaae293b3df..d95a168762e4c 100644 --- a/python/paddle/fluid/tests/unittests/op_test.py +++ b/python/paddle/fluid/tests/unittests/op_test.py @@ -1438,14 +1438,14 @@ def find_actual_value(self, name): raise NotImplementedError("base class, not implement!") def _compare_numpy(self, name, actual_np, expect_np): - self.op_test.assertTrue( - np.allclose( - actual_np, - expect_np, - atol=atol, - rtol=self.rtol if hasattr(self, 'rtol') else 1e-5, - equal_nan=equal_nan), "Output (" + name + - ") has diff at " + str(place) + " in " + self.checker_name) + np.testing.assert_allclose( + actual_np, + expect_np, + atol=atol, + rtol=self.rtol if hasattr(self, 'rtol') else 1e-5, + equal_nan=equal_nan, + err_msg="Output (" + name + ") has diff at " + str(place) + + " in " + self.checker_name) def _compare_list(self, name, actual, expect): """ if expect is a tuple, we need to compare list. @@ -1584,15 +1584,14 @@ def _compare_numpy(self, name, actual_np, expect_np): 1) == 0: pass else: - self.op_test.assertTrue( - np.allclose( - actual_np, - expect_np, - atol=atol, - rtol=self.rtol if hasattr(self, 'rtol') else 1e-5, - equal_nan=equal_nan), - "Output (" + name + ") has diff at " + str(place) + - " in " + self.checker_name) + np.testing.assert_allclose( + actual_np, + expect_np, + atol=atol, + rtol=self.rtol if hasattr(self, 'rtol') else 1e-5, + equal_nan=equal_nan, + err_msg="Output (" + name + ") has diff at " + + str(place) + " in " + self.checker_name) class EagerChecker(DygraphChecker): diff --git a/python/paddle/fluid/tests/unittests/test_quantile_and_nanquantile.py b/python/paddle/fluid/tests/unittests/test_quantile_and_nanquantile.py index 259e5556deefe..8c40e46a4662a 100644 --- a/python/paddle/fluid/tests/unittests/test_quantile_and_nanquantile.py +++ b/python/paddle/fluid/tests/unittests/test_quantile_and_nanquantile.py @@ -271,9 +271,8 @@ def test_static(self): fetch_list=[results, results_fp64]) np_res = res_func(np_input_data, q=0.5, axis=1) np_res_fp64 = res_func(np_input_data_fp64, q=0.5, axis=1) - self.assertTrue( - np.allclose(paddle_res, np_res) - and np.allclose(paddle_res_fp64, np_res_fp64)) + np.testing.assert_allclose(paddle_res, np_res) + np.testing.assert_allclose(paddle_res_fp64, np_res_fp64) if __name__ == '__main__': From 17dd44f587243855718b3391294c85edb90f4075 Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 4 Oct 2022 19:50:43 +0800 Subject: [PATCH 3/4] fix test_isclose_op, remove wrapped [] --- .../paddle/fluid/tests/unittests/test_isclose_op.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/test_isclose_op.py b/python/paddle/fluid/tests/unittests/test_isclose_op.py index 04b7fbe54e7ee..e7de0c96d3ac7 100644 --- a/python/paddle/fluid/tests/unittests/test_isclose_op.py +++ b/python/paddle/fluid/tests/unittests/test_isclose_op.py @@ -41,13 +41,11 @@ def setUp(self): self.attrs = {'equal_nan': self.equal_nan} self.outputs = { 'Out': - np.array([ - np.isclose(self.inputs['Input'], - self.inputs['Other'], - rtol=self.rtol, - atol=self.atol, - equal_nan=self.equal_nan) - ]) + np.isclose(self.inputs['Input'], + self.inputs['Other'], + rtol=self.rtol, + atol=self.atol, + equal_nan=self.equal_nan) } def test_check_output(self): From 0929bc806610a27b5c339f9f059abeea224a66cc Mon Sep 17 00:00:00 2001 From: SigureMo Date: Tue, 4 Oct 2022 21:52:41 +0800 Subject: [PATCH 4/4] fix test_reduce_op, remove wrong attr `reduce_all` --- python/paddle/fluid/tests/unittests/test_reduce_op.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/test_reduce_op.py b/python/paddle/fluid/tests/unittests/test_reduce_op.py index 3929fd77e5f10..53d34e2302952 100644 --- a/python/paddle/fluid/tests/unittests/test_reduce_op.py +++ b/python/paddle/fluid/tests/unittests/test_reduce_op.py @@ -358,7 +358,7 @@ def setUp(self): 'X': np.random.randint(0, 2, (2, 5, 3, 2, 2, 3, 4, 2)).astype("bool") } - self.attrs = {'reduce_all': True, 'dim': (2, 3, 4)} + self.attrs = {'dim': (2, 3, 4)} self.outputs = {'Out': self.inputs['X'].all(axis=self.attrs['dim'])} def test_check_output(self): @@ -464,7 +464,7 @@ def setUp(self): 'X': np.random.randint(0, 2, (2, 5, 3, 2, 2, 3, 4, 2)).astype("bool") } - self.attrs = {'reduce_all': True, 'dim': (3, 5, 4)} + self.attrs = {'dim': (3, 5, 4)} self.outputs = {'Out': self.inputs['X'].any(axis=self.attrs['dim'])} def test_check_output(self):