diff --git a/python/paddle/fluid/tests/unittests/test_accuracy_op.py b/python/paddle/fluid/tests/unittests/test_accuracy_op.py index e7152a29e56b3..e4412b1b24ee6 100755 --- a/python/paddle/fluid/tests/unittests/test_accuracy_op.py +++ b/python/paddle/fluid/tests/unittests/test_accuracy_op.py @@ -58,7 +58,7 @@ def test_check_output(self): self.check_output(atol=1e-3) -class TestAccuracyOpError(OpTest): +class TestAccuracyOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The input type of accuracy_op must be Variable. diff --git a/python/paddle/fluid/tests/unittests/test_activation_op.py b/python/paddle/fluid/tests/unittests/test_activation_op.py index e325d4afb82ce..fbd196ffda5c5 100644 --- a/python/paddle/fluid/tests/unittests/test_activation_op.py +++ b/python/paddle/fluid/tests/unittests/test_activation_op.py @@ -23,7 +23,7 @@ from paddle.fluid import compiler, Program, program_guard -class TestSqrtOpError(OpTest): +class TestSqrtOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The input type of sqrt op must be Variable or numpy.ndarray. @@ -537,7 +537,7 @@ def test_check_grad(self): self.check_grad(['X'], 'Out', max_relative_error=0.02) -class TestELUOpError(OpTest): +class TestELUOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The input type of elu_op must be Variable. diff --git a/python/paddle/fluid/tests/unittests/test_bilinear_interp_op.py b/python/paddle/fluid/tests/unittests/test_bilinear_interp_op.py index 73b11de069c90..85ca76897b2c1 100755 --- a/python/paddle/fluid/tests/unittests/test_bilinear_interp_op.py +++ b/python/paddle/fluid/tests/unittests/test_bilinear_interp_op.py @@ -484,7 +484,7 @@ def init_test_case(self): self.scale_by_1Dtensor = True -class TestBilinearInterpOpAPI(OpTest): +class TestBilinearInterpOpAPI(unittest.TestCase): def test_case(self): x = fluid.data(name="x", shape=[2, 3, 6, 6], dtype="float32") diff --git a/python/paddle/fluid/tests/unittests/test_cast_op.py b/python/paddle/fluid/tests/unittests/test_cast_op.py index 4cd0966dca10d..284d7101aa015 100644 --- a/python/paddle/fluid/tests/unittests/test_cast_op.py +++ b/python/paddle/fluid/tests/unittests/test_cast_op.py @@ -70,7 +70,7 @@ def test_check_output(self): self.check_output(atol=1e-3) -class TestCastOpError(op_test.OpTest): +class TestCastOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The input type of cast_op must be Variable. diff --git a/python/paddle/fluid/tests/unittests/test_conv2d_transpose_op.py b/python/paddle/fluid/tests/unittests/test_conv2d_transpose_op.py index 56b5505bc1d5b..1ca462ebf9ee6 100644 --- a/python/paddle/fluid/tests/unittests/test_conv2d_transpose_op.py +++ b/python/paddle/fluid/tests/unittests/test_conv2d_transpose_op.py @@ -718,7 +718,7 @@ def init_test_case(self): self.data_format = 'NHWC' -class TestConv2dTransposeAPI(OpTest): +class TestConv2dTransposeAPI(unittest.TestCase): def test_case1(self): data1 = fluid.layers.data( name='data1', shape=[3, 5, 5], dtype='float32') @@ -796,7 +796,7 @@ def test_case1(self): self.assertIsNotNone(results[6]) -class TestConv2dTransposeOpException(OpTest): +class TestConv2dTransposeOpException(unittest.TestCase): def test_exception(self): data = fluid.layers.data(name='data', shape=[3, 5, 5], dtype="float32") diff --git a/python/paddle/fluid/tests/unittests/test_conv3d_transpose_op.py b/python/paddle/fluid/tests/unittests/test_conv3d_transpose_op.py index d44bd1e449ef7..cb48f7b55dbfb 100644 --- a/python/paddle/fluid/tests/unittests/test_conv3d_transpose_op.py +++ b/python/paddle/fluid/tests/unittests/test_conv3d_transpose_op.py @@ -563,7 +563,7 @@ def init_op_type(self): self.op_type = "conv3d_transpose" -class TestConv3dTransposeAPI(OpTest): +class TestConv3dTransposeAPI(unittest.TestCase): def test_case1(self): data1 = fluid.layers.data( name='data1', shape=[3, 5, 5, 5], dtype='float32') @@ -642,7 +642,7 @@ def test_case1(self): self.assertIsNotNone(results[6]) -class TestConv3dTransposeOpException(OpTest): +class TestConv3dTransposeOpException(unittest.TestCase): def test_exception(self): data = fluid.layers.data( name='data', shape=[3, 5, 5, 5], dtype="float32") diff --git a/python/paddle/fluid/tests/unittests/test_crop_tensor_op.py b/python/paddle/fluid/tests/unittests/test_crop_tensor_op.py index 5864e15df1327..b9be58a291d86 100644 --- a/python/paddle/fluid/tests/unittests/test_crop_tensor_op.py +++ b/python/paddle/fluid/tests/unittests/test_crop_tensor_op.py @@ -217,7 +217,7 @@ def initTestCase(self): self.OffsetsTensor = True -class TestCropTensorException(OpTest): +class TestCropTensorException(unittest.TestCase): def test_exception(self): input1 = fluid.data(name="input1", shape=[2, 3, 6, 6], dtype="float32") input2 = fluid.data(name="input2", shape=[2, 3, 6, 6], dtype="float16") diff --git a/python/paddle/fluid/tests/unittests/test_downpoursgd.py b/python/paddle/fluid/tests/unittests/test_downpoursgd.py index 9dbea19ca5564..3564609e08e8a 100644 --- a/python/paddle/fluid/tests/unittests/test_downpoursgd.py +++ b/python/paddle/fluid/tests/unittests/test_downpoursgd.py @@ -31,7 +31,7 @@ import paddle.fluid.incubate.fleet.parameter_server.pslib.ps_pb2 as pslib -class TestListenAndServOp(OpTest): +class TestListenAndServOp(unittest.TestCase): """TestListenAndServOp.""" def setUp(self): diff --git a/python/paddle/fluid/tests/unittests/test_expand_op.py b/python/paddle/fluid/tests/unittests/test_expand_op.py index 910ab684f478c..05f2e520bd697 100644 --- a/python/paddle/fluid/tests/unittests/test_expand_op.py +++ b/python/paddle/fluid/tests/unittests/test_expand_op.py @@ -193,7 +193,7 @@ def test_check_output(self): self.check_output() -class TestExpandError(OpTest): +class TestExpandError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): x1 = fluid.create_lod_tensor( @@ -208,7 +208,7 @@ def test_errors(self): # Test python API -class TestExpandAPI(OpTest): +class TestExpandAPI(unittest.TestCase): def test_api(self): input = np.random.random([12, 14]).astype("float32") x = fluid.layers.data( diff --git a/python/paddle/fluid/tests/unittests/test_fc_op.py b/python/paddle/fluid/tests/unittests/test_fc_op.py index 9028210b8fe9c..1105dcee7b448 100644 --- a/python/paddle/fluid/tests/unittests/test_fc_op.py +++ b/python/paddle/fluid/tests/unittests/test_fc_op.py @@ -131,7 +131,7 @@ def config(self): self.matrix = MatrixGenerate(1, 4, 3, 128, 128, 2) -class TestFCOpError(OpTest): +class TestFCOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): input_data = np.random.random((2, 4)).astype("float32") diff --git a/python/paddle/fluid/tests/unittests/test_fetch_var.py b/python/paddle/fluid/tests/unittests/test_fetch_var.py index 14eb4c4ed78ea..d78b27566ebc3 100644 --- a/python/paddle/fluid/tests/unittests/test_fetch_var.py +++ b/python/paddle/fluid/tests/unittests/test_fetch_var.py @@ -21,7 +21,7 @@ import unittest -class TestFetchVar(op_test.OpTest): +class TestFetchVar(unittest.TestCase): def set_input(self): self.val = numpy.array([1, 3, 5]).astype(numpy.int32) diff --git a/python/paddle/fluid/tests/unittests/test_fl_listen_and_serv_op.py b/python/paddle/fluid/tests/unittests/test_fl_listen_and_serv_op.py index b9a58b6df5f98..e98551152686f 100644 --- a/python/paddle/fluid/tests/unittests/test_fl_listen_and_serv_op.py +++ b/python/paddle/fluid/tests/unittests/test_fl_listen_and_serv_op.py @@ -91,7 +91,7 @@ def run_pserver(use_cuda, sync_mode, ip, port, trainers, trainer_id): exe.run(main_program) -class TestFlListenAndServOp(OpTest): +class TestFlListenAndServOp(unittest.TestCase): def setUp(self): self.ps_timeout = 5 self.ip = "127.0.0.1" diff --git a/python/paddle/fluid/tests/unittests/test_group_norm_op.py b/python/paddle/fluid/tests/unittests/test_group_norm_op.py index e2b4e14640698..68584a4c91c7d 100644 --- a/python/paddle/fluid/tests/unittests/test_group_norm_op.py +++ b/python/paddle/fluid/tests/unittests/test_group_norm_op.py @@ -222,7 +222,7 @@ def test_case1(self): self.assertTrue(np.allclose(results[1], expect_res2[0])) -class TestGroupNormException(OpTest): +class TestGroupNormException(unittest.TestCase): # data_layout is not NHWC or NCHW def test_exception(self): data = fluid.data(name='data', shape=[None, 3, 3, 4], dtype="float32") diff --git a/python/paddle/fluid/tests/unittests/test_lookup_table_v2_op.py b/python/paddle/fluid/tests/unittests/test_lookup_table_v2_op.py index 50902f7941b01..811d48452e3a0 100644 --- a/python/paddle/fluid/tests/unittests/test_lookup_table_v2_op.py +++ b/python/paddle/fluid/tests/unittests/test_lookup_table_v2_op.py @@ -214,7 +214,7 @@ def test_api(self): return_numpy=False) -class TestEmbedOpError(OpTest): +class TestEmbedOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): input_data = np.random.randint(0, 10, (4, 6)).astype("int64") diff --git a/python/paddle/fluid/tests/unittests/test_mul_op.py b/python/paddle/fluid/tests/unittests/test_mul_op.py index 85947e5c32903..21d350170bf67 100644 --- a/python/paddle/fluid/tests/unittests/test_mul_op.py +++ b/python/paddle/fluid/tests/unittests/test_mul_op.py @@ -51,7 +51,7 @@ def test_check_grad_ingore_y(self): ['X'], 'Out', max_relative_error=0.5, no_grad_set=set('Y')) -class TestMulOpError(OpTest): +class TestMulOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The input type of mul_op must be Variable. diff --git a/python/paddle/fluid/tests/unittests/test_one_hot_op.py b/python/paddle/fluid/tests/unittests/test_one_hot_op.py index 0ff44058d4466..b1884b7e7a96f 100644 --- a/python/paddle/fluid/tests/unittests/test_one_hot_op.py +++ b/python/paddle/fluid/tests/unittests/test_one_hot_op.py @@ -137,7 +137,7 @@ def test_check_output(self): self.check_output(check_dygraph=False) -class TestOneHotOp_exception(OpTest): +class TestOneHotOp_exception(unittest.TestCase): def setUp(self): self.op_type = 'one_hot' self.depth = 10 diff --git a/python/paddle/fluid/tests/unittests/test_one_hot_v2_op.py b/python/paddle/fluid/tests/unittests/test_one_hot_v2_op.py index 73fd00e914dce..9901cdfef63e4 100644 --- a/python/paddle/fluid/tests/unittests/test_one_hot_v2_op.py +++ b/python/paddle/fluid/tests/unittests/test_one_hot_v2_op.py @@ -134,7 +134,7 @@ def test_check_output(self): self.check_output(check_dygraph=False) -class TestOneHotOp_exception(OpTest): +class TestOneHotOp_exception(unittest.TestCase): def setUp(self): self.op_type = 'one_hot_v2' self.depth = 10 diff --git a/python/paddle/fluid/tests/unittests/test_pool2d_op.py b/python/paddle/fluid/tests/unittests/test_pool2d_op.py index 2f0dfc50f253e..c9b26307c897c 100644 --- a/python/paddle/fluid/tests/unittests/test_pool2d_op.py +++ b/python/paddle/fluid/tests/unittests/test_pool2d_op.py @@ -985,7 +985,7 @@ def init_shape(self): # ----- test API -class TestPool2dAPI(OpTest): +class TestPool2dAPI(unittest.TestCase): def test_api(self): x_NHWC = np.random.random([2, 5, 5, 3]).astype("float32") x_NCHW = np.random.random([2, 3, 5, 5]).astype("float32") @@ -1204,7 +1204,7 @@ def test_api(self): data_format="NHWC")) -class TestPool2dAPI_Error(OpTest): +class TestPool2dAPI_Error(unittest.TestCase): def test_api(self): input_NHWC = fluid.layers.data( name="input_NHWC", diff --git a/python/paddle/fluid/tests/unittests/test_reduce_op.py b/python/paddle/fluid/tests/unittests/test_reduce_op.py index 866fa05fdb04c..6a62d3597f6c0 100644 --- a/python/paddle/fluid/tests/unittests/test_reduce_op.py +++ b/python/paddle/fluid/tests/unittests/test_reduce_op.py @@ -414,7 +414,7 @@ def test_check_grad(self): self.check_grad(['X'], 'Out') -class TestReduceSumOpError(OpTest): +class TestReduceSumOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The input type of reduce_sum_op must be Variable. @@ -426,7 +426,7 @@ def test_errors(self): self.assertRaises(TypeError, fluid.layers.reduce_sum, x2) -class TestReduceMeanOpError(OpTest): +class TestReduceMeanOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The input type of reduce_mean_op must be Variable. diff --git a/python/paddle/fluid/tests/unittests/test_reshape_op.py b/python/paddle/fluid/tests/unittests/test_reshape_op.py index 931d6caac55e1..277e60003a75e 100644 --- a/python/paddle/fluid/tests/unittests/test_reshape_op.py +++ b/python/paddle/fluid/tests/unittests/test_reshape_op.py @@ -186,7 +186,7 @@ def init_data(self): # Test python API -class TestReshapeAPI(OpTest): +class TestReshapeAPI(unittest.TestCase): # situation 1: have shape( list, no tensor), no actual shape(Tensor) def test_1(self): input = np.random.random([2, 25]).astype("float32") @@ -227,7 +227,7 @@ def test_1(self): # Test Input Error -class TestReshapeOpError(OpTest): +class TestReshapeOpError(unittest.TestCase): def test_errors(self): with program_guard(Program(), Program()): # The x type of reshape_op must be Variable. diff --git a/python/paddle/fluid/tests/unittests/test_runtime_and_compiletime_exception.py b/python/paddle/fluid/tests/unittests/test_runtime_and_compiletime_exception.py index 9a002a31d14ea..83c6ad8412210 100644 --- a/python/paddle/fluid/tests/unittests/test_runtime_and_compiletime_exception.py +++ b/python/paddle/fluid/tests/unittests/test_runtime_and_compiletime_exception.py @@ -21,7 +21,7 @@ import paddle.fluid.core as core -class TestRunTimeException(OpTest): +class TestRunTimeException(unittest.TestCase): def test_run_time_exception(self): place = fluid.CPUPlace() exe = fluid.Executor(place) @@ -39,7 +39,7 @@ def _run_program(): self.assertRaises(core.EnforceNotMet, _run_program) -class TestCompileTimeException(OpTest): +class TestCompileTimeException(unittest.TestCase): def test_compile_time_exception(self): self.assertRaises(core.EnforceNotMet, self.build_model) diff --git a/python/paddle/fluid/tests/unittests/test_scatter_nd_op.py b/python/paddle/fluid/tests/unittests/test_scatter_nd_op.py index dec9bfa43005c..fee3073169920 100644 --- a/python/paddle/fluid/tests/unittests/test_scatter_nd_op.py +++ b/python/paddle/fluid/tests/unittests/test_scatter_nd_op.py @@ -158,7 +158,7 @@ def test_check_grad(self): #Test Python API -class TestScatterNdOpAPI(OpTest): +class TestScatterNdOpAPI(unittest.TestCase): """ test scatter_nd_add api and scatter_nd api """ @@ -231,7 +231,7 @@ def testcase4(self): #Test Raise Error -class TestScatterNdOpRaise(OpTest): +class TestScatterNdOpRaise(unittest.TestCase): def test_check_raise(self): def check_raise_is_test(): try: diff --git a/python/paddle/fluid/tests/unittests/test_strided_slice_op.py b/python/paddle/fluid/tests/unittests/test_strided_slice_op.py index 8012f2e80048c..238fc06a20e0c 100644 --- a/python/paddle/fluid/tests/unittests/test_strided_slice_op.py +++ b/python/paddle/fluid/tests/unittests/test_strided_slice_op.py @@ -438,7 +438,7 @@ def test_check_grad_normal(self): # Test python API -class TestStridedSliceAPI(OpTest): +class TestStridedSliceAPI(unittest.TestCase): def test_1(self): input = np.random.random([3, 4, 5, 6]).astype("float32") minus_1 = fluid.layers.fill_constant([1], "int32", -1)