From fc645d8a47d8533a0c7a1e5af7f1217bc5427510 Mon Sep 17 00:00:00 2001 From: Chen Weihang Date: Sun, 16 Feb 2020 21:25:49 +0800 Subject: [PATCH] Fix data loader test failed problem in release 1.7 (#22624) * split unittests in data loader test, test=release/1.7 * split unittests to different files, test=develop * remove repeat unittest, test=develop --- .../fluid/tests/unittests/CMakeLists.txt | 1 + .../unittests/test_imperative_data_loader.py | 90 +------------------ .../test_imperative_data_loader_exception.py | 82 +++++++++++++++++ 3 files changed, 85 insertions(+), 88 deletions(-) create mode 100644 python/paddle/fluid/tests/unittests/test_imperative_data_loader_exception.py diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt index 2f118373cce..34bc899586f 100644 --- a/python/paddle/fluid/tests/unittests/CMakeLists.txt +++ b/python/paddle/fluid/tests/unittests/CMakeLists.txt @@ -196,6 +196,7 @@ if (APPLE OR WIN32) list(REMOVE_ITEM TEST_OPS test_dataset) list(REMOVE_ITEM TEST_OPS test_dataset_dataloader) list(REMOVE_ITEM TEST_OPS test_imperative_data_loader) + list(REMOVE_ITEM TEST_OPS test_imperative_data_loader_exception) list(REMOVE_ITEM TEST_OPS test_imperative_data_loader_process) list(REMOVE_ITEM TEST_OPS test_imperative_signal_handler) endif() diff --git a/python/paddle/fluid/tests/unittests/test_imperative_data_loader.py b/python/paddle/fluid/tests/unittests/test_imperative_data_loader.py index 2848bff04b9..50a7e21609b 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_data_loader.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_data_loader.py @@ -17,7 +17,6 @@ import unittest import numpy as np import paddle.fluid as fluid from paddle.fluid import core -import paddle.compat as cpt def get_random_images_and_labels(image_shape, label_shape): @@ -35,19 +34,6 @@ def sample_generator_creator(batch_size, batch_num): return __reader__ -def sample_list_generator_creator(batch_size, batch_num): - def __reader__(): - for _ in range(batch_num): - sample_list = [] - for _ in range(batch_size): - image, label = get_random_images_and_labels([784], [1]) - sample_list.append([image, label]) - - yield sample_list - - return __reader__ - - def batch_generator_creator(batch_size, batch_num): def __reader__(): for _ in range(batch_num): @@ -62,8 +48,8 @@ class TestDygraphhDataLoader(unittest.TestCase): def setUp(self): self.batch_size = 8 self.batch_num = 4 - self.epoch_num = 2 - self.capacity = 2 + self.epoch_num = 1 + self.capacity = 5 def test_single_process_reader(self): with fluid.dygraph.guard(): @@ -95,20 +81,6 @@ class TestDygraphhDataLoader(unittest.TestCase): self.assertEqual(label.shape, [self.batch_size, 1]) self.assertEqual(relu.shape, [self.batch_size, 784]) - def test_sample_list_generator(self): - with fluid.dygraph.guard(): - loader = fluid.io.DataLoader.from_generator( - capacity=self.capacity, use_multiprocess=True) - loader.set_sample_list_generator( - sample_list_generator_creator(self.batch_size, self.batch_num), - places=fluid.CPUPlace()) - for _ in range(self.epoch_num): - for image, label in loader(): - relu = fluid.layers.relu(image) - self.assertEqual(image.shape, [self.batch_size, 784]) - self.assertEqual(label.shape, [self.batch_size, 1]) - self.assertEqual(relu.shape, [self.batch_size, 784]) - def test_batch_genarator(self): with fluid.dygraph.guard(): loader = fluid.io.DataLoader.from_generator( @@ -124,63 +96,5 @@ class TestDygraphhDataLoader(unittest.TestCase): self.assertEqual(relu.shape, [self.batch_size, 784]) -class TestDygraphhDataLoaderWithException(unittest.TestCase): - def setUp(self): - self.batch_num = 4 - self.capacity = 2 - - def test_not_capacity(self): - with fluid.dygraph.guard(): - with self.assertRaisesRegexp(ValueError, - "Please give value to capacity."): - fluid.io.DataLoader.from_generator() - - def test_single_process_with_thread_expection(self): - def error_sample_genarator(batch_num): - def __reader__(): - for _ in range(batch_num): - yield [[[1, 2], [1]]] - - return __reader__ - - with fluid.dygraph.guard(): - loader = fluid.io.DataLoader.from_generator( - capacity=self.capacity, iterable=False, use_multiprocess=False) - loader.set_batch_generator( - error_sample_genarator(self.batch_num), places=fluid.CPUPlace()) - exception = None - try: - for _ in loader(): - print("test_single_process_with_thread_expection") - except core.EnforceNotMet as ex: - self.assertIn("Blocking queue is killed", - cpt.get_exception_message(ex)) - exception = ex - self.assertIsNotNone(exception) - - def test_multi_process_with_thread_expection(self): - def error_sample_genarator(batch_num): - def __reader__(): - for _ in range(batch_num): - yield [[[1, 2], [1]]] - - return __reader__ - - with fluid.dygraph.guard(): - loader = fluid.io.DataLoader.from_generator( - capacity=self.capacity, use_multiprocess=True) - loader.set_batch_generator( - error_sample_genarator(self.batch_num), places=fluid.CPUPlace()) - exception = None - try: - for _ in loader(): - print("test_multi_process_with_thread_expection") - except core.EnforceNotMet as ex: - self.assertIn("Blocking queue is killed", - cpt.get_exception_message(ex)) - exception = ex - self.assertIsNotNone(exception) - - if __name__ == '__main__': unittest.main() diff --git a/python/paddle/fluid/tests/unittests/test_imperative_data_loader_exception.py b/python/paddle/fluid/tests/unittests/test_imperative_data_loader_exception.py new file mode 100644 index 00000000000..1f7c0c2f90e --- /dev/null +++ b/python/paddle/fluid/tests/unittests/test_imperative_data_loader_exception.py @@ -0,0 +1,82 @@ +# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import sys +import unittest +import numpy as np +import paddle.fluid as fluid +from paddle.fluid import core +import paddle.compat as cpt + + +class TestDygraphhDataLoaderWithException(unittest.TestCase): + def setUp(self): + self.batch_num = 4 + self.capacity = 2 + + def test_not_capacity(self): + with fluid.dygraph.guard(): + with self.assertRaisesRegexp(ValueError, + "Please give value to capacity."): + fluid.io.DataLoader.from_generator() + + def test_single_process_with_thread_expection(self): + def error_sample_genarator(batch_num): + def __reader__(): + for _ in range(batch_num): + yield [[[1, 2], [1]]] + + return __reader__ + + with fluid.dygraph.guard(): + loader = fluid.io.DataLoader.from_generator( + capacity=self.capacity, iterable=False, use_multiprocess=False) + loader.set_batch_generator( + error_sample_genarator(self.batch_num), places=fluid.CPUPlace()) + exception = None + try: + for _ in loader(): + print("test_single_process_with_thread_expection") + except core.EnforceNotMet as ex: + self.assertIn("Blocking queue is killed", + cpt.get_exception_message(ex)) + exception = ex + self.assertIsNotNone(exception) + + def test_multi_process_with_thread_expection(self): + def error_sample_genarator(batch_num): + def __reader__(): + for _ in range(batch_num): + yield [[[1, 2], [1]]] + + return __reader__ + + with fluid.dygraph.guard(): + loader = fluid.io.DataLoader.from_generator( + capacity=self.capacity, use_multiprocess=True) + loader.set_batch_generator( + error_sample_genarator(self.batch_num), places=fluid.CPUPlace()) + exception = None + try: + for _ in loader(): + print("test_multi_process_with_thread_expection") + except core.EnforceNotMet as ex: + self.assertIn("Blocking queue is killed", + cpt.get_exception_message(ex)) + exception = ex + self.assertIsNotNone(exception) + + +if __name__ == '__main__': + unittest.main() -- GitLab