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 93a7215410b9fee00c51367f3036f599ecf8eb96..dbd8e5a8818b9b60e6b52307e01602f6c5b427a4 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 d3e42446214ad2c86d0105747280fb017774609b..2546fdbb7196295f7972e99ff29d7645dada9a58 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):