Skip to content

Commit 1c4bb5c

Browse files
jacquesqiaodaming-lu
authored andcommitted
user need to set feed order for Trainer.train and Trainer.test (#10679)
1 parent 6c32052 commit 1c4bb5c

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

python/paddle/fluid/trainer.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ def _dist_transpile_if_necessary(self, optimize_ops, params_grads):
172172
def train(self,
173173
num_epochs,
174174
event_handler,
175-
reader=None,
176-
parallel=False,
177-
feed_order=None):
175+
reader,
176+
feed_order,
177+
parallel=False):
178178
"""
179179
Train the model.
180180
@@ -202,7 +202,7 @@ def train(self,
202202

203203
self._train_by_executor(num_epochs, event_handler, reader, feed_order)
204204

205-
def test(self, reader, feed_order=None):
205+
def test(self, reader, feed_order):
206206
"""
207207
Test the model on given test data
208208
@@ -276,12 +276,7 @@ def build_feed_var_list(program, feed_order):
276276
if not isinstance(program, framework.Program):
277277
raise TypeError("The 'program' should be an object of Program")
278278

279-
if feed_order is None:
280-
feed_var_list = [
281-
var for var in program.global_block().vars.itervalues()
282-
if var.is_data
283-
]
284-
elif isinstance(feed_order, list):
279+
if isinstance(feed_order, list):
285280
feed_var_list = [
286281
program.global_block().var(var_name) for var_name in feed_order
287282
]

0 commit comments

Comments
 (0)