Skip to content

[Don't Merge][Need discussion] First-step toward a working mp on Travis #11521

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 9 commits into from
Dec 17, 2018
Merged

[Don't Merge][Need discussion] First-step toward a working mp on Travis #11521

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
452d92b
Improve type-check for Sequence
Oct 23, 2018
e906b5d
Proposition for better error handling
Oct 29, 2018
24cadfc
Merge branch 'master' of https://github.com/keras-team/keras into seq…
Oct 29, 2018
a57bf5a
Fix order
Oct 29, 2018
3d5e837
Test with spawn
Nov 27, 2018
dc05b52
Merge master
Nov 27, 2018
e2a257a
Fix flaky test
Nov 27, 2018
1bc99f6
Fix flaky test
Nov 27, 2018
c8fd39c
Used pytest's `warns` function.
gabrieldemarmiesse Dec 2, 2018
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
Prev Previous commit
Next Next commit
Fix order
  • Loading branch information
Dref360 committed Oct 29, 2018
commit a57bf5a0e1bcb3309251567de941bbf97be6bdde
4 changes: 2 additions & 2 deletions keras/utils/data_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,8 +598,8 @@ def get(self):
while self.is_running():
try:
future = self.queue.get(block=True)
self.queue.task_done()
inputs = future.get(timeout=30)
self.queue.task_done()
except mp.TimeoutError:
idx = future.idx
warnings.warn(
Expand Down Expand Up @@ -697,8 +697,8 @@ def get(self):
while self.is_running():
try:
future = self.queue.get(block=True)
self.queue.task_done()
inputs = future.get(timeout=30)
self.queue.task_done()
except mp.TimeoutError:
warnings.warn(
"An input could not be retrieved."
Expand Down