From 2c6eb21df2e7b3f407dbe2eee8f5e6ecfc971490 Mon Sep 17 00:00:00 2001 From: lelelelelez Date: Fri, 30 Jul 2021 14:57:21 +0800 Subject: [PATCH] fix function-redefined --- python/paddle/fluid/dataloader/dataloader_iter.py | 10 ---------- .../tests/unittests/dygraph_to_static/test_dict.py | 2 +- .../unittests/mkldnn/test_activation_mkldnn_op.py | 3 --- .../tests/unittests/mkldnn/test_pool2d_mkldnn_op.py | 3 --- .../unittests/sequence/test_sequence_unpad_op.py | 2 +- .../paddle/fluid/tests/unittests/test_argsort_op.py | 2 +- .../tests/unittests/test_bicubic_interp_v2_op.py | 2 +- .../paddle/fluid/tests/unittests/test_flatten2_op.py | 2 +- .../paddle/fluid/tests/unittests/test_flatten_op.py | 2 +- .../fluid/tests/unittests/test_fleet_base_3.py | 2 +- .../test_fleet_graph_execution_meta_optimizer.py | 2 +- .../unittests/test_fleet_sharding_meta_optimizer.py | 2 +- .../tests/unittests/test_imperative_auto_prune.py | 12 ------------ python/paddle/fluid/tests/unittests/test_linspace.py | 4 ++-- .../test_parallel_dygraph_pipeline_parallel.py | 2 +- 15 files changed, 12 insertions(+), 40 deletions(-) diff --git a/python/paddle/fluid/dataloader/dataloader_iter.py b/python/paddle/fluid/dataloader/dataloader_iter.py index 4a9b450be9..069dff28cc 100644 --- a/python/paddle/fluid/dataloader/dataloader_iter.py +++ b/python/paddle/fluid/dataloader/dataloader_iter.py @@ -391,16 +391,6 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase): for _ in range(self._outstanding_capacity): self._try_put_indices() - def _clear_and_remove_data_queue(self): - if self._data_queue is not None: - while True: - try: - self._data_queue.get_nowait() - except: - self._data_queue.cancel_join_thread() - self._data_queue.close() - break - def _shutdown_worker(self, worker_id, shutdown=False): if self._worker_status[worker_id] or (self._persistent_workers and shutdown): diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py index dbd3952991..a7be885576 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py @@ -219,7 +219,7 @@ class NetWithDictPop(paddle.nn.Layer): return x -class TestDictPop(TestNetWithDict): +class TestDictPop3(TestNetWithDict): def setUp(self): self.x = np.array([2, 2]).astype('float32') diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py index e10a7be40d..f782c5b710 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py @@ -117,9 +117,6 @@ class TestMKLDNNSwishDim2(TestSwish): def init_dtype(self): self.dtype = np.float32 - def init_dtype(self): - self.dtype = np.float32 - class TestMKLDNNHardSwishDim2(TestHardSwish): def setUp(self): diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_mkldnn_op.py index 7ecd0ee099..3f80bdc165 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_mkldnn_op.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_mkldnn_op.py @@ -122,9 +122,6 @@ class TestAsymPad(TestPool2D_Op): def init_kernel_type(self): self.use_mkldnn = True - def init_global_pool(self): - self.global_pool = False - def init_data_type(self): self.dtype = np.float32 diff --git a/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py index aec3033316..1d21229622 100644 --- a/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py @@ -79,7 +79,7 @@ class TestSequenceUnpadOp4(TestSequenceUnpadOp): self.dtype = "float64" -class TestSequenceUnpadOp4(TestSequenceUnpadOp): +class TestSequenceUnpadOp5(TestSequenceUnpadOp): def init(self): self.length = [0, 4, 3, 0] self.x_shape = (4, 5, 3, 3, 6) diff --git a/python/paddle/fluid/tests/unittests/test_argsort_op.py b/python/paddle/fluid/tests/unittests/test_argsort_op.py index e324f0ec3d..ee2d65684f 100644 --- a/python/paddle/fluid/tests/unittests/test_argsort_op.py +++ b/python/paddle/fluid/tests/unittests/test_argsort_op.py @@ -436,7 +436,7 @@ class TestArgsortImperative3(TestArgsortImperative): self.axis = 1 -class TestArgsortImperative2(TestArgsortImperative): +class TestArgsortImperative4(TestArgsortImperative): def init(self): self.input_shape = [2, 3, 4] self.axis = 1 diff --git a/python/paddle/fluid/tests/unittests/test_bicubic_interp_v2_op.py b/python/paddle/fluid/tests/unittests/test_bicubic_interp_v2_op.py index 58d8d0f53d..afce05cced 100644 --- a/python/paddle/fluid/tests/unittests/test_bicubic_interp_v2_op.py +++ b/python/paddle/fluid/tests/unittests/test_bicubic_interp_v2_op.py @@ -484,7 +484,7 @@ class TestBicubicOpError(unittest.TestCase): align_corners=False, scale_factor=[1, 2, 2]) - def test_scale_value(): + def test_scale_value_1(): x = fluid.data(name="x", shape=[2, 3, 6, 6], dtype="float32") out = interpolate( x, diff --git a/python/paddle/fluid/tests/unittests/test_flatten2_op.py b/python/paddle/fluid/tests/unittests/test_flatten2_op.py index 0d50c65558..4d2f34946f 100644 --- a/python/paddle/fluid/tests/unittests/test_flatten2_op.py +++ b/python/paddle/fluid/tests/unittests/test_flatten2_op.py @@ -46,7 +46,7 @@ class TestFlattenOp(OpTest): self.attrs = {"axis": self.axis} -class TestFlattenOp(TestFlattenOp): +class TestFlattenOp_V1(TestFlattenOp): def init_test_case(self): self.in_shape = (3, 2, 5, 4) self.axis = 0 diff --git a/python/paddle/fluid/tests/unittests/test_flatten_op.py b/python/paddle/fluid/tests/unittests/test_flatten_op.py index cf568970b7..f29e15dfff 100644 --- a/python/paddle/fluid/tests/unittests/test_flatten_op.py +++ b/python/paddle/fluid/tests/unittests/test_flatten_op.py @@ -43,7 +43,7 @@ class TestFlattenOp(OpTest): self.attrs = {"axis": self.axis} -class TestFlattenOp(TestFlattenOp): +class TestFlattenOp_V1(TestFlattenOp): def init_test_case(self): self.in_shape = (3, 2, 2, 10) self.axis = 0 diff --git a/python/paddle/fluid/tests/unittests/test_fleet_base_3.py b/python/paddle/fluid/tests/unittests/test_fleet_base_3.py index 6be05f4363..a6153a7f61 100644 --- a/python/paddle/fluid/tests/unittests/test_fleet_base_3.py +++ b/python/paddle/fluid/tests/unittests/test_fleet_base_3.py @@ -49,7 +49,7 @@ class TestFleetBase(unittest.TestCase): optimizer.minimize(avg_cost) -class TestFleetBase(unittest.TestCase): +class TestFleetBase1(unittest.TestCase): def setUp(self): os.environ["POD_IP"] = "127.0.0.1" os.environ["PADDLE_TRAINER_ENDPOINTS"] = "127.0.0.1:36001" diff --git a/python/paddle/fluid/tests/unittests/test_fleet_graph_execution_meta_optimizer.py b/python/paddle/fluid/tests/unittests/test_fleet_graph_execution_meta_optimizer.py index 6c462c435c..393de688aa 100644 --- a/python/paddle/fluid/tests/unittests/test_fleet_graph_execution_meta_optimizer.py +++ b/python/paddle/fluid/tests/unittests/test_fleet_graph_execution_meta_optimizer.py @@ -209,7 +209,7 @@ class TestFleetGraphExecutionMetaOptimizer(unittest.TestCase): proc_b.start() wait([proc_a, proc_b]) - def test_graph_execution_optimizer(self): + def test_graph_execution_optimizer_v2(self): port_a = self._dist_ut_port_0 + 6 port_b = self._dist_ut_port_1 + 6 node_a = { diff --git a/python/paddle/fluid/tests/unittests/test_fleet_sharding_meta_optimizer.py b/python/paddle/fluid/tests/unittests/test_fleet_sharding_meta_optimizer.py index d66fb2c36b..a1cd0df8d7 100755 --- a/python/paddle/fluid/tests/unittests/test_fleet_sharding_meta_optimizer.py +++ b/python/paddle/fluid/tests/unittests/test_fleet_sharding_meta_optimizer.py @@ -292,7 +292,7 @@ class TestFleetShardingMetaOptimizer(TestFleetMetaOptimizer): ]) -class TestFleetMetaOptimizer(TestFleetMetaOptimizer): +class TestFleetMetaOptimizer_V1(TestFleetMetaOptimizer): def setUp(self): os.environ["PADDLE_TRAINER_ID"] = "3" os.environ[ diff --git a/python/paddle/fluid/tests/unittests/test_imperative_auto_prune.py b/python/paddle/fluid/tests/unittests/test_imperative_auto_prune.py index 837e82882e..b82a058ae4 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_auto_prune.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_auto_prune.py @@ -375,18 +375,6 @@ class TestImperativeAutoPrune(unittest.TestCase): self.assertTrue(case3.linear2.weight._grad_ivar() is None) self.assertTrue(case3.linear.weight._grad_ivar() is not None) - def test_case2_prune_no_grad_branch(self): - with fluid.dygraph.guard(): - value1 = np.arange(784).reshape(1, 784) - value2 = np.arange(1).reshape(1, 1) - v1 = fluid.dygraph.to_variable(value1).astype("float32") - v2 = fluid.dygraph.to_variable(value2).astype("float32") - case3 = AutoPruneLayer2(input_size=784) - loss = case3(v1, v2) - loss.backward() - self.assertTrue(case3.linear2.weight._grad_ivar() is None) - self.assertTrue(case3.linear.weight._grad_ivar() is not None) - def test_case3_prune_no_grad_branch2(self): with fluid.dygraph.guard(): value1 = np.arange(1).reshape(1, 1) diff --git a/python/paddle/fluid/tests/unittests/test_linspace.py b/python/paddle/fluid/tests/unittests/test_linspace.py index 03cb84ec99..635b3437f7 100644 --- a/python/paddle/fluid/tests/unittests/test_linspace.py +++ b/python/paddle/fluid/tests/unittests/test_linspace.py @@ -143,10 +143,10 @@ class TestLinspaceOpError(unittest.TestCase): self.assertRaises(TypeError, test_start_type) - def test_end_dtype(): + def test_end_type(): fluid.layers.linspace(0, [10], 1, dtype="float32") - self.assertRaises(TypeError, test_end_dtype) + self.assertRaises(TypeError, test_end_type) def test_step_dtype(): fluid.layers.linspace(0, 10, [0], dtype="float32") diff --git a/python/paddle/fluid/tests/unittests/test_parallel_dygraph_pipeline_parallel.py b/python/paddle/fluid/tests/unittests/test_parallel_dygraph_pipeline_parallel.py index 73967782ae..9f534381c9 100644 --- a/python/paddle/fluid/tests/unittests/test_parallel_dygraph_pipeline_parallel.py +++ b/python/paddle/fluid/tests/unittests/test_parallel_dygraph_pipeline_parallel.py @@ -27,7 +27,7 @@ class TestHybridPipeParallel(TestMultipleGpus): def test_hybrid_parallel_pp_tuple_inputs(self): self.run_mnist_2gpu('hybrid_parallel_pp_embedding.py') - def test_hybrid_parallel_pp_tuple_inputs(self): + def test_hybrid_parallel_shared_weight(self): self.run_mnist_2gpu('hybrid_parallel_shared_weight.py') def test_pipeline_parallel(self): -- GitLab