Skip to content

Fix off-by-one bug in predict/evaluate progress bar #8071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2017
Merged

Fix off-by-one bug in predict/evaluate progress bar #8071

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
575a5dc
Fix off-by-one bug in predict/evaluate progress bar
ozabluda Oct 5, 2017
72b67ae
pep8
ozabluda Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions keras/engine/training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,7 @@ def _predict_loop(self, f, ins, batch_size=32, verbose=0, steps=None):
for i, batch_out in enumerate(batch_outs):
unconcatenated_outs[i].append(batch_out)
if verbose == 1:
progbar.update(step)
progbar.update(step + 1)
if len(unconcatenated_outs) == 1:
return np.concatenate(unconcatenated_outs[0], axis=0)
return [np.concatenate(unconcatenated_outs[i], axis=0)
Expand Down Expand Up @@ -1304,9 +1304,12 @@ def _test_loop(self, f, ins, batch_size=None, verbose=0, steps=None):
steps,
'steps')
outs = []
if steps is not None:
if verbose == 1:
if verbose == 1:
if steps is not None:
progbar = Progbar(target=steps)
else:
progbar = Progbar(target=num_samples)
if steps is not None:
for step in range(steps):
batch_outs = f(ins)
if isinstance(batch_outs, list):
Expand All @@ -1320,12 +1323,10 @@ def _test_loop(self, f, ins, batch_size=None, verbose=0, steps=None):
outs.append(0.)
outs[0] += batch_outs
if verbose == 1:
progbar.update(step)
progbar.update(step + 1)
for i in range(len(outs)):
outs[i] /= steps
else:
if verbose == 1:
progbar = Progbar(target=num_samples)
batches = _make_batches(num_samples, batch_size)
index_array = np.arange(num_samples)
for batch_index, (batch_start, batch_end) in enumerate(batches):
Expand Down