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

Show file tree
Hide file tree
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
Merge master
  • Loading branch information
Dref360 committed Nov 27, 2018
commit dc05b52da19407eca79f7a6b905ce7c1990a51e0
5 changes: 3 additions & 2 deletions tests/keras/utils/data_utils_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
import six
from six.moves.urllib.parse import urljoin
from six.moves.urllib.request import pathname2url
import time
import warnings

from flaky import flaky

from keras.utils import GeneratorEnqueuer
from keras.utils import OrderedEnqueuer
from keras.utils import Sequence
Expand All @@ -28,7 +29,7 @@
six.PY2 and 'TRAVIS_PYTHON_VERSION' in os.environ,
reason='Temporarily disabled until the use_multiprocessing problem is solved')

skip_generators = pytest.mark.skipif(K.backend() in ['tensorflow', 'cntk'] and
skip_generators = pytest.mark.skipif(K.backend() in {'tensorflow', 'cntk'} and
'TRAVIS_PYTHON_VERSION' in os.environ,
reason='Generators do not work with `spawn`.')

Expand Down
6 changes: 3 additions & 3 deletions tests/test_multiprocessing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from keras.utils import Sequence
from keras import backend as K

pytestmark = pytest.mark.skipif('TRAVIS_PYTHON_VERSION' in os.environ,
reason='Temporarily disabled until'
'the use_multiprocessing problem is solved')
pytestmark = pytest.mark.skipif(
K.backend() in {'tensorflow', 'cntk'} and 'TRAVIS_PYTHON_VERSION' in os.environ,
reason='Temporarily disabled until the use_multiprocessing problem is solved')

STEPS_PER_EPOCH = 100
STEPS = 100
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.