From ad9e6476ff55dc7eb91fda177b7be1a83c9c21c1 Mon Sep 17 00:00:00 2001 From: minqiyang Date: Thu, 6 Sep 2018 14:47:41 +0800 Subject: [PATCH] Force object deletion on trainer in unit test --- .../test_image_classification_vgg.py | 27 +++++++------------ .../test_recognize_digits_mlp.py | 25 ++++++----------- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/python/paddle/fluid/tests/book/high-level-api/image_classification/test_image_classification_vgg.py b/python/paddle/fluid/tests/book/high-level-api/image_classification/test_image_classification_vgg.py index 93a7215410b..dbd8e5a8818 100644 --- a/python/paddle/fluid/tests/book/high-level-api/image_classification/test_image_classification_vgg.py +++ b/python/paddle/fluid/tests/book/high-level-api/image_classification/test_image_classification_vgg.py @@ -14,11 +14,11 @@ from __future__ import print_function -import six import paddle import paddle.fluid as fluid import paddle.fluid.core as core import numpy +import six import os import cifar10_small_test_set @@ -101,23 +101,14 @@ def train(use_cuda, train_program, parallel, params_dirname): optimizer_func=optimizer_func, parallel=parallel) - if six.PY2: - trainer.train( - reader=train_reader, - num_epochs=1, - event_handler=event_handler, - feed_order=['pixel', 'label']) - else: - import paddle.fluid.core as core - import paddle.compat as cpt - try: - trainer.train( - reader=train_reader, - num_epochs=1, - event_handler=event_handler, - feed_order=['pixel', 'label']) - except core.EnforceNotMet as ex: - assert ("kid scope" in cpt.get_exception_message(ex)) + trainer.train( + reader=train_reader, + num_epochs=1, + event_handler=event_handler, + feed_order=['pixel', 'label']) + + if six.PY3: + del trainer def infer(use_cuda, inference_program, parallel, params_dirname=None): diff --git a/python/paddle/fluid/tests/book/high-level-api/recognize_digits/test_recognize_digits_mlp.py b/python/paddle/fluid/tests/book/high-level-api/recognize_digits/test_recognize_digits_mlp.py index d3e42446214..2546fdbb719 100644 --- a/python/paddle/fluid/tests/book/high-level-api/recognize_digits/test_recognize_digits_mlp.py +++ b/python/paddle/fluid/tests/book/high-level-api/recognize_digits/test_recognize_digits_mlp.py @@ -84,23 +84,14 @@ def train(use_cuda, train_program, params_dirname, parallel): paddle.dataset.mnist.train(), buf_size=500), batch_size=BATCH_SIZE) - if six.PY2: - trainer.train( - num_epochs=1, - event_handler=event_handler, - reader=train_reader, - feed_order=['img', 'label']) - else: - import paddle.fluid.core as core - import paddle.compat as cpt - try: - trainer.train( - num_epochs=1, - event_handler=event_handler, - reader=train_reader, - feed_order=['img', 'label']) - except core.EnforceNotMet as ex: - assert ("kid scope" in cpt.get_exception_message(ex)) + trainer.train( + num_epochs=1, + event_handler=event_handler, + reader=train_reader, + feed_order=['img', 'label']) + + if six.PY3: + del trainer def infer(use_cuda, inference_program, parallel, params_dirname=None): -- GitLab