Force object deletion on trainer in unit test

Author: velconia

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 event_handler(event):
         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):

python/paddle/fluid/tests/book/high-level-api/recognize_digits/test_recognize_digits_mlp.py

@@ -84,23 +84,14 @@ def event_handler(event):
             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):