Skip to content

Commit ca92f5c

Browse files
authored
bug fix, test=develop (#20911)
* bug fix, test=develop
1 parent da6e33c commit ca92f5c

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

python/paddle/fluid/executor.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -996,11 +996,6 @@ def _run_from_dataset(self,
996996

997997
dataset._prepare_to_run()
998998

999-
if fetch_handler is not None:
1000-
fetch_instance = fetch_handler
1001-
else:
1002-
fetch_instance = FetchHandler([])
1003-
1004999
scope, trainer = self._prepare_trainer(
10051000
program=program,
10061001
dataset=dataset,
@@ -1015,17 +1010,26 @@ def _run_from_dataset(self,
10151010
trainer._gen_trainer_desc()
10161011

10171012
self._dump_debug_info(program=program, trainer=trainer)
1013+
dataset._dynamic_adjust_before_train(trainer.proto_desc.thread_num)
10181014

10191015
trainer_instance = self._default_executor.init_for_dataset(
10201016
program.desc, trainer._desc(), scope, dataset.dataset)
10211017

1022-
scope0 = trainer_instance.get_worker_scope(0)
1018+
if fetch_handler is not None:
1019+
scope0 = trainer_instance.get_worker_scope(0)
1020+
fetch_monitor = FetchHandlerMonitor(scope0, fetch_handler)
1021+
fetch_monitor.start()
1022+
1023+
self._default_executor.run_from_dataset(trainer_instance)
10231024

1024-
fetch_monitor = FetchHandlerMonitor(scope0, fetch_instance)
1025-
fetch_monitor.start()
1026-
self._default_executor.run_from_dataset(trainer_instance)
1027-
fetch_monitor.stop()
1025+
fetch_monitor.stop()
1026+
else:
1027+
1028+
self._default_executor.run_from_dataset(trainer_instance)
1029+
1030+
dataset._dynamic_adjust_after_train()
10281031
dataset._finish_to_run()
1032+
10291033
return None
10301034

10311035
def infer_from_dataset(self,

0 commit comments

Comments
 (0)