Skip to content

Commit d4accfa

Browse files
committed
Fix random fail of python35 unit test
1 parent b11332a commit d4accfa

File tree

2 files changed

+34
-10
lines changed

2 files changed

+34
-10
lines changed

python/paddle/fluid/tests/book/high-level-api/image_classification/test_image_classification_vgg.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from __future__ import print_function
1616

17+
import six
1718
import paddle
1819
import paddle.fluid as fluid
1920
import numpy
@@ -95,11 +96,22 @@ def event_handler(event):
9596
trainer = fluid.Trainer(
9697
train_func=train_program, place=place, optimizer_func=optimizer_func)
9798

98-
trainer.train(
99-
reader=train_reader,
100-
num_epochs=1,
101-
event_handler=event_handler,
102-
feed_order=['pixel', 'label'])
99+
if six.PY2:
100+
trainer.train(
101+
reader=train_reader,
102+
num_epochs=1,
103+
event_handler=event_handler,
104+
feed_order=['pixel', 'label'])
105+
else:
106+
import paddle.fluid.core as core
107+
try:
108+
trainer.train(
109+
reader=train_reader,
110+
num_epochs=1,
111+
event_handler=event_handler,
112+
feed_order=['pixel', 'label'])
113+
except core.EnforceNotMet as ex:
114+
assert ("kid scope" in cpt.get_exception_message(ex))
103115

104116

105117
def infer(use_cuda, inference_program, params_dirname=None):

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import argparse
1818
import paddle.fluid as fluid
1919
import paddle
20+
import six
2021
import sys
2122
import numpy
2223
import unittest
@@ -79,11 +80,22 @@ def event_handler(event):
7980
paddle.dataset.mnist.train(), buf_size=500),
8081
batch_size=BATCH_SIZE)
8182

82-
trainer.train(
83-
num_epochs=1,
84-
event_handler=event_handler,
85-
reader=train_reader,
86-
feed_order=['img', 'label'])
83+
if six.PY2:
84+
trainer.train(
85+
num_epochs=1,
86+
event_handler=event_handler,
87+
reader=train_reader,
88+
feed_order=['img', 'label'])
89+
else:
90+
import paddle.fluid.core as core
91+
try:
92+
trainer.train(
93+
num_epochs=1,
94+
event_handler=event_handler,
95+
reader=train_reader,
96+
feed_order=['img', 'label'])
97+
except core.EnforceNotMet as ex:
98+
assert ("kid scope" in cpt.get_exception_message(ex))
8799

88100

89101
def infer(use_cuda, inference_program, params_dirname=None):

0 commit comments

Comments
 (0)