Skip to content

Commit e104e70

Browse files
reyoungreyoung
committed
Update Unittests
1 parent e704aa2 commit e104e70

File tree

12 files changed

+170
-51
lines changed

12 files changed

+170
-51
lines changed

‎python/paddle/fluid/tests/book/high-level-api/fit_a_line/test_fit_a_line.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616

1717
import paddle
1818
import paddle.fluid as fluid
19+
import sys
20+
try:
21+
from paddle.fluid.contrib.trainer import *
22+
from paddle.fluid.contrib.inferencer import *
23+
except ImportError:
24+
print(
25+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
26+
file=sys.stderr)
27+
from paddle.fluid.trainer import *
28+
from paddle.fluid.inferencer import *
1929
import contextlib
2030
import numpy
2131
import unittest
@@ -57,11 +67,11 @@ def optimizer_func():
5767
def train(use_cuda, train_program, params_dirname, inference_model_dirname):
5868
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
5969

60-
trainer = fluid.Trainer(
70+
trainer = Trainer(
6171
train_func=train_program, place=place, optimizer_func=optimizer_func)
6272

6373
def event_handler(event):
64-
if isinstance(event, fluid.EndStepEvent):
74+
if isinstance(event, EndStepEvent):
6575
if event.step == 10:
6676
test_metrics = trainer.test(
6777
reader=test_reader, feed_order=['x', 'y'])
@@ -91,7 +101,7 @@ def infer(use_cuda, inference_program, params_dirname=None):
91101
return
92102

93103
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
94-
inferencer = fluid.Inferencer(
104+
inferencer = Inferencer(
95105
infer_func=inference_program, param_path=params_dirname, place=place)
96106

97107
batch_size = 10

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,22 @@
1414

1515
from __future__ import print_function
1616

17+
import sys
18+
1719
import paddle
1820
import paddle.fluid as fluid
21+
22+
try:
23+
from paddle.fluid.contrib.trainer import *
24+
from paddle.fluid.contrib.inferencer import *
25+
except ImportError:
26+
print(
27+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
28+
file=sys.stderr)
29+
from paddle.fluid.trainer import *
30+
from paddle.fluid.inferencer import *
1931
import paddle.fluid.core as core
2032
import numpy
21-
import six
2233
import os
2334
import cifar10_small_test_set
2435

@@ -106,7 +117,7 @@ def train(use_cuda, train_program, parallel, params_dirname):
106117
paddle.dataset.cifar.test10(), batch_size=BATCH_SIZE, drop_last=False)
107118

108119
def event_handler(event):
109-
if isinstance(event, fluid.EndStepEvent):
120+
if isinstance(event, EndStepEvent):
110121
avg_cost, accuracy = trainer.test(
111122
reader=test_reader, feed_order=['pixel', 'label'])
112123

@@ -118,7 +129,7 @@ def event_handler(event):
118129
return
119130

120131
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
121-
trainer = fluid.Trainer(
132+
trainer = Trainer(
122133
train_func=train_program,
123134
optimizer_func=optimizer_func,
124135
place=place,
@@ -133,7 +144,7 @@ def event_handler(event):
133144

134145
def infer(use_cuda, inference_program, parallel, params_dirname=None):
135146
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
136-
inferencer = fluid.Inferencer(
147+
inferencer = Inferencer(
137148
infer_func=inference_program,
138149
param_path=params_dirname,
139150
place=place,

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,22 @@
1414

1515
from __future__ import print_function
1616

17+
import sys
18+
1719
import paddle
1820
import paddle.fluid as fluid
21+
22+
try:
23+
from paddle.fluid.contrib.trainer import *
24+
from paddle.fluid.contrib.inferencer import *
25+
except ImportError:
26+
print(
27+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
28+
file=sys.stderr)
29+
from paddle.fluid.trainer import *
30+
from paddle.fluid.inferencer import *
1931
import paddle.fluid.core as core
2032
import numpy
21-
import six
2233
import os
2334
import cifar10_small_test_set
2435

@@ -83,7 +94,7 @@ def train(use_cuda, train_program, parallel, params_dirname):
8394
paddle.dataset.cifar.test10(), batch_size=BATCH_SIZE, drop_last=False)
8495

8596
def event_handler(event):
86-
if isinstance(event, fluid.EndStepEvent):
97+
if isinstance(event, EndStepEvent):
8798
avg_cost, accuracy = trainer.test(
8899
reader=test_reader, feed_order=['pixel', 'label'])
89100

@@ -95,7 +106,7 @@ def event_handler(event):
95106
return
96107

97108
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
98-
trainer = fluid.Trainer(
109+
trainer = Trainer(
99110
train_func=train_program,
100111
place=place,
101112
optimizer_func=optimizer_func,
@@ -110,7 +121,7 @@ def event_handler(event):
110121

111122
def infer(use_cuda, inference_program, parallel, params_dirname=None):
112123
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
113-
inferencer = fluid.Inferencer(
124+
inferencer = Inferencer(
114125
infer_func=inference_program,
115126
param_path=params_dirname,
116127
place=place,

‎python/paddle/fluid/tests/book/high-level-api/label_semantic_roles/test_label_semantic_roles_newapi.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616

1717
import paddle
1818
import paddle.fluid as fluid
19+
import sys
20+
try:
21+
from paddle.fluid.contrib.trainer import *
22+
from paddle.fluid.contrib.inferencer import *
23+
except ImportError:
24+
print(
25+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
26+
file=sys.stderr)
27+
from paddle.fluid.trainer import *
28+
from paddle.fluid.inferencer import *
1929
import numpy as np
2030

2131
WORD_DICT, VERB_DICT, LABEL_DICT = paddle.dataset.conll05.get_dict()
@@ -149,7 +159,7 @@ def optimize_func():
149159
def train(use_cuda, train_program, params_dirname):
150160
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
151161

152-
trainer = fluid.Trainer(
162+
trainer = Trainer(
153163
train_func=train_program, place=place, optimizer_func=optimize_func)
154164

155165
feed_order = [
@@ -164,7 +174,7 @@ def train(use_cuda, train_program, params_dirname):
164174
# place)
165175

166176
def event_handler(event):
167-
if isinstance(event, fluid.EndEpochEvent):
177+
if isinstance(event, EndEpochEvent):
168178
test_reader = paddle.batch(
169179
paddle.dataset.conll05.test(), batch_size=BATCH_SIZE)
170180
avg_cost_set = trainer.test(
@@ -184,7 +194,7 @@ def event_handler(event):
184194
if math.isnan(float(avg_cost)):
185195
sys.exit("got NaN loss, training failed.")
186196

187-
elif isinstance(event, fluid.EndStepEvent):
197+
elif isinstance(event, EndStepEvent):
188198
print("Step {0}, Epoch {1} Metrics {2}".format(
189199
event.step, event.epoch, list(map(np.array, event.metrics))))
190200
if event.step == 1: # Run 2 iterations to speed CI
@@ -204,7 +214,7 @@ def event_handler(event):
204214

205215
def infer(use_cuda, inference_program, params_dirname):
206216
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
207-
inferencer = fluid.Inferencer(
217+
inferencer = Inferencer(
208218
inference_program, param_path=params_dirname, place=place)
209219

210220
# Setup input by creating LoDTensor to represent sequence of words.

‎python/paddle/fluid/tests/book/high-level-api/machine_translation/test_machine_translation.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,28 @@
1313
# limitations under the License.
1414

1515
from __future__ import print_function
16+
1617
import contextlib
18+
import sys
1719

1820
import numpy as np
1921
import paddle
2022
import paddle.fluid as fluid
23+
24+
try:
25+
from paddle.fluid.contrib.trainer import *
26+
from paddle.fluid.contrib.inferencer import *
27+
except ImportError:
28+
print(
29+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
30+
file=sys.stderr)
31+
from paddle.fluid.trainer import *
32+
from paddle.fluid.inferencer import *
2133
import paddle.fluid.framework as framework
2234
import paddle.fluid.layers as pd
2335
from paddle.fluid.executor import Executor
2436
from functools import partial
2537
import unittest
26-
import os
2738

2839
dict_size = 30000
2940
source_dict_dim = target_dict_dim = dict_size
@@ -198,12 +209,12 @@ def train(use_cuda, is_sparse, is_local=True):
198209
]
199210

200211
def event_handler(event):
201-
if isinstance(event, fluid.EndStepEvent):
212+
if isinstance(event, EndStepEvent):
202213
print('pass_id=' + str(event.epoch) + ' batch=' + str(event.step))
203214
if event.step == 10:
204215
trainer.stop()
205216

206-
trainer = fluid.Trainer(
217+
trainer = Trainer(
207218
train_func=partial(train_program, is_sparse),
208219
place=place,
209220
optimizer_func=optimizer_func)

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,22 @@
1414

1515
from __future__ import print_function
1616

17-
import argparse
17+
import sys
18+
1819
import paddle.fluid as fluid
20+
21+
try:
22+
from paddle.fluid.contrib.trainer import *
23+
from paddle.fluid.contrib.inferencer import *
24+
except ImportError:
25+
print(
26+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
27+
file=sys.stderr)
28+
from paddle.fluid.trainer import *
29+
from paddle.fluid.inferencer import *
1930
import paddle.fluid.core as core
2031
import paddle
21-
import six
22-
import sys
2332
import numpy
24-
import unittest
2533
import math
2634
import sys
2735
import os
@@ -68,14 +76,14 @@ def optimizer_func():
6876
def train(use_cuda, train_program, parallel, params_dirname):
6977
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
7078

71-
trainer = fluid.Trainer(
79+
trainer = Trainer(
7280
train_func=train_program,
7381
place=place,
7482
optimizer_func=optimizer_func,
7583
parallel=parallel)
7684

7785
def event_handler(event):
78-
if isinstance(event, fluid.EndEpochEvent):
86+
if isinstance(event, EndEpochEvent):
7987
test_reader = paddle.batch(
8088
paddle.dataset.mnist.test(), batch_size=BATCH_SIZE)
8189
avg_cost, acc = trainer.test(
@@ -91,7 +99,7 @@ def event_handler(event):
9199
event.epoch + 1, avg_cost, acc))
92100
if math.isnan(avg_cost):
93101
sys.exit("got NaN loss, training failed.")
94-
elif isinstance(event, fluid.EndStepEvent):
102+
elif isinstance(event, EndStepEvent):
95103
print(
96104
("Step {0}, Epoch {1} Metrics {2}".format(
97105
event.step, event.epoch,
@@ -112,7 +120,7 @@ def event_handler(event):
112120
def infer(use_cuda, inference_program, parallel, params_dirname=None):
113121
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
114122

115-
inferencer = fluid.Inferencer(
123+
inferencer = Inferencer(
116124
infer_func=inference_program,
117125
param_path=params_dirname,
118126
place=place,

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,22 @@
1414

1515
from __future__ import print_function
1616

17-
import argparse
17+
import sys
18+
1819
import paddle.fluid as fluid
20+
21+
try:
22+
from paddle.fluid.contrib.trainer import *
23+
from paddle.fluid.contrib.inferencer import *
24+
except ImportError:
25+
print(
26+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
27+
file=sys.stderr)
28+
from paddle.fluid.trainer import *
29+
from paddle.fluid.inferencer import *
1930
import paddle.fluid.core as core
2031
import paddle
21-
import six
22-
import sys
2332
import numpy
24-
import unittest
2533
import math
2634
import sys
2735
import os
@@ -55,14 +63,14 @@ def optimizer_func():
5563
def train(use_cuda, train_program, params_dirname, parallel):
5664
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
5765

58-
trainer = fluid.Trainer(
66+
trainer = Trainer(
5967
train_func=train_program,
6068
place=place,
6169
optimizer_func=optimizer_func,
6270
parallel=parallel)
6371

6472
def event_handler(event):
65-
if isinstance(event, fluid.EndEpochEvent):
73+
if isinstance(event, EndEpochEvent):
6674
test_reader = paddle.batch(
6775
paddle.dataset.mnist.test(), batch_size=BATCH_SIZE)
6876
avg_cost, acc = trainer.test(
@@ -94,7 +102,7 @@ def event_handler(event):
94102
def infer(use_cuda, inference_program, parallel, params_dirname=None):
95103
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
96104

97-
inferencer = fluid.Inferencer(
105+
inferencer = Inferencer(
98106
infer_func=inference_program,
99107
param_path=params_dirname,
100108
place=place,

‎python/paddle/fluid/tests/book/high-level-api/recommender_system/test_recommender_system_newapi.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@
1919
import numpy as np
2020
import paddle
2121
import paddle.fluid as fluid
22+
import sys
23+
try:
24+
from paddle.fluid.contrib.trainer import *
25+
from paddle.fluid.contrib.inferencer import *
26+
except ImportError:
27+
print(
28+
"In the fluid 1.0, the trainer and inferencer are moving to paddle.fluid.contrib",
29+
file=sys.stderr)
30+
from paddle.fluid.trainer import *
31+
from paddle.fluid.inferencer import *
2232
import paddle.fluid.layers as layers
2333
import paddle.fluid.nets as nets
2434

@@ -164,7 +174,7 @@ def optimizer_func():
164174
def train(use_cuda, train_program, params_dirname):
165175
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
166176

167-
trainer = fluid.Trainer(
177+
trainer = Trainer(
168178
train_func=train_program, place=place, optimizer_func=optimizer_func)
169179

170180
feed_order = [
@@ -173,7 +183,7 @@ def train(use_cuda, train_program, params_dirname):
173183
]
174184

175185
def event_handler(event):
176-
if isinstance(event, fluid.EndStepEvent):
186+
if isinstance(event, EndStepEvent):
177187
test_reader = paddle.batch(
178188
paddle.dataset.movielens.test(), batch_size=BATCH_SIZE)
179189
avg_cost_set = trainer.test(
@@ -208,7 +218,7 @@ def event_handler(event):
208218

209219
def infer(use_cuda, inference_program, params_dirname):
210220
place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
211-
inferencer = fluid.Inferencer(
221+
inferencer = Inferencer(
212222
inference_program, param_path=params_dirname, place=place)
213223

214224
# Use the first data from paddle.dataset.movielens.test() as input.

0 commit comments

Comments
 (0)