3717 Commits

Autor SHA1 Mensagem Data
Taehoon Lee 205c61178d Update backend strings (#7214) 2017-07-06 04:27:07 -07:00
Taehoon Lee 3fe7837691 Update the old interfaces (#7252) 2017-07-06 04:26:47 -07:00
Dirk Gorissen bcc68e9040 Improve docstring on order of transformations (#7248)
* Improve docstring on order of transformations

* Add code markers and be more precise
2017-07-06 04:23:33 -07:00
jorgecarleitao 985c441014 Improved error message for missing class_weights. (#7238)
The error is now a ValueError, as per docs, and contains
a suitable message.
2017-07-05 11:20:12 -07:00
Taehoon Lee 59cd1c3994 Fix typos (#7213) 2017-07-02 19:23:33 -07:00
Larissa Heinrich 4de120f051 Fix computation of receptive field size for 'channels_last' (#7200) 2017-06-30 16:36:22 -07:00
Francois Chollet d9255f15a4 Redirect mobilenet weights path. 2017-06-30 13:59:04 -07:00
Francois Chollet b42f6760bc Fix mobilenet weight preprocessing. 2017-06-30 13:52:14 -07:00
Francois Chollet 6b51d149ca Merge branch 'master' of github.com:fchollet/keras 2017-06-30 12:24:54 -07:00
Francois Chollet 8040ad72dd Fix mobilenet bugs. 2017-06-30 12:24:40 -07:00
nzw ec048edffc Fix typo (#7191) 2017-06-30 11:05:59 -07:00
Francois Chollet 23269507fd CI now fails for test coverage below 80%. 2017-06-29 12:14:04 -07:00
Francois Chollet eafdffff75 Fix NotImplementedError in data_utils.py 2017-06-29 12:13:34 -07:00
jorgecarleitao 5834747dc7 Make load_model's convert_custom_objects recursive 2017-06-29 11:51:56 -07:00
NC Cullen 6c2dea64fc conv3d_transpose in tf, th, and cntk (#7161)
* conv3d_tranpose in tf and th

* fix _preprocess_deconv_output_shape error

* cntk conv3d_tranpose

* conv3d_tranpose test

* formatting

* cleanup tests

* fix incorrect axis ordering and docs

* fix incorrect axis ordering and docs

* deconv3d_output_shape to fix errors

* remove conv2d_transpose reference in theano backend

* remove kernel_size loop from test

* put depth first in test and add dim to invalid use case input

* formatting - removed extra line

* fix pep8

* remove extraneous args from tf conv3d_transpose function

* default val for data_format=None
2017-06-29 09:09:12 -07:00
Alan Yee ddcf66fbe8 Update README.md (#7163)
Remove incorrect usage of "either"
2017-06-29 09:05:17 -07:00
Dapid 5edd96a9f8 Don't warn of repeated data with one worker (#7175)
* Don't warn of repeated data with one worker

If there is only one worker there is no risk of duplicated data.

* Update training.py
2017-06-29 09:03:24 -07:00
Taehoon Lee c6ec39258b Fix styles (#7154) 2017-06-28 06:33:21 -07:00
Kongsea 7866fbaa1a Fix some typos. (#7144)
* Fix some typos.

* Fix a typo
2017-06-27 18:00:58 -07:00
Francois Chollet 94397e08ae Further style fixes. 2017-06-27 16:40:12 -07:00
Francois Chollet 98db0285ee Style fix (avoid use of reserved variable name). 2017-06-27 16:08:10 -07:00
Francois Chollet 7413956e7e Merge branch 'master' of github.com:fchollet/keras 2017-06-27 15:46:05 -07:00
Francois Chollet 9a4598da50 Further style fixes in mobilenet 2017-06-27 15:45:51 -07:00
Frédéric Branchaud-Charron a09c9f6c2d Fix test in training (#7149) 2017-06-27 13:19:54 -07:00
nzw e4ab777d07 Improve documentation (#7150) 2017-06-27 13:19:24 -07:00
Francois Chollet 4fab0bf9a8 Style fixes. 2017-06-27 11:18:57 -07:00
Somshubra Majumdar 49a7c7376d Addition of MobileNet to application (#7009)
* Add MobileNet to application

* Add support for 1001 classes in imagenet utils

* Revert a mistake in the tests

* Setup application test for mobilenet to run only when on tensorflow

* Correct pytest.mark.skipif explanation for skipping tests if not on tensorflow

* Corrected mobilenet to support 1000 classes and reverted imagenet_utils to prior state

* Fix tensorflow test

* Restrict mobilenets to data format "channels_last"

* Add review fixes

* PEP8 fix

* Add relu6 to activations.py

* Corrected imports in mobilenet.py

* Rolled back activation relu6 and inlined it to mobilenet.py

* Refactored DepthwiseConv2D and other corrections

* Fixed tests

* PEP8 correction

* Add docs to private functions and other fixes

* Fix failed test where input shape is None

* Fix value of size for model name
2017-06-27 11:11:48 -07:00
Francois Chollet fb9dbdb10c Remove name-based trainable weight sorting, as it was a source of bugs. 2017-06-26 19:52:14 -07:00
Hideaki Kanehara a85263fb3e unify coding style (#7129) 2017-06-26 11:16:03 -07:00
Gleb Sidora f6c1730cf3 better error message when ReduceLROnPlateau conditioned on non-existing metric (#7134) 2017-06-26 11:15:22 -07:00
vfdev 598954d2c8 * Replace tensorflow deprecated attribute : reduction_indices -> axis (#7126) 2017-06-25 15:17:56 -07:00
nzw 21c5e5479b Add Sequence section in utils page (#7123) 2017-06-25 10:33:25 -07:00
Francois Chollet d1ad183770 Merge branch 'master' of github.com:fchollet/keras 2017-06-23 13:57:34 -07:00
Francois Chollet 9dca90e705 Fix PEP8 2017-06-23 13:56:54 -07:00
Ben 5a7f6b0e74 fix dtype handling in 2 optimizers and 1 layer (#7088)
* fix dtype handling in 2 optimizers and 1 layer

* fix zeros

* Add base_dtype argument

* Fix base_dtype

* remove base_dtype
2017-06-23 13:41:11 -07:00
Francois Chollet 7dcd2982b2 Allow custom print functions for summary 2017-06-23 13:24:20 -07:00
Francois Chollet 3462835597 Improve formatting of CONTRIBUTING.md. 2017-06-22 16:04:52 -07:00
Francois Chollet 585f33f6b7 Add API design review process to CONTRIBUTING.md 2017-06-22 16:03:51 -07:00
Tang, Cheng 1aa9e9199b Add more meaningful message when cnkt can't handle variable length input (#7094)
* return meaningful message when variable input length detected.

* ignore scalar input

* update the recommandation.
2017-06-22 13:11:45 -07:00
Andrew Hundt fb97b6e0fa _check_array_lengths properly handles corner cases with None (#7063)
* _check_array_lengths properly handles corner cases with None

* test_training.py _check_array_lengths() unit test

* set_of_lengths if/else + whitespace

* training.py pep8 whitespace

* training.py restate set more cleanly
2017-06-21 21:29:33 -07:00
Taehoon Lee 60cf7ca6b2 Fix typos (#7087) 2017-06-21 21:28:57 -07:00
Andrew Hundt 1b539993aa training.py _slice_arrays() fix crash when arrays are None (#7069)
* training.py _slice_arrays() fix crash when arrays are None

* training.py test _slice_arrays()
2017-06-21 18:01:30 -07:00
Andrew Hundt de73eda89a .gitignore visual studio code IDE excluded (#7070) 2017-06-21 13:47:52 -07:00
Andrew Hundt 219d6ee5be training.py _weighted_masked_objective fix crash when weights is None (#7068)
* training.py _weighted_masked_objective fix crash when weights is None

* unit test _weighted_masked_objective function
2017-06-21 13:46:55 -07:00
Taehoon Lee f430de10fb Style fixes (#7073) 2017-06-21 10:58:38 -07:00
nzw a2f6ae2c66 Style fix (#7079) 2017-06-21 10:53:59 -07:00
Andrew Hundt b713122e77 wrappers_test.py quick fix for flaky TimeDistributed test (#7062)
full issue: https://github.com/fchollet/keras/pull/7033
2017-06-21 10:50:58 -07:00
Gökçen Eraslan 75470e380f join() OrderedEnqueuer.executor to prevent zombies (#7059) 2017-06-21 10:50:10 -07:00
moi90 b5ad5334fc Add more numpy-style attributes to HDF5Matrix (#6982)
* Add more numpy-style attributes to HDF5Matrix

* Improve docstrings

* Add test coverage

* Add a ´# Returns´ section to shape, dtype, ndim, size.

* Remove whitespace in blank lines

* Use third-person and close docstrings on a new line.
2017-06-21 09:59:29 -07:00
Chris 04a20177cf Avoid DeprecationWarning from inspect.getargspec (rebased) (#7035)
* Utility function to check if a callable has a given keyword argument

* Added unit tests for the has_arg function

* Replace uses of getargspec with the new has_arg function

Not changing keras.backend, because that gives ImportErrors due to
a circular import (conv_utils uses the backend, and is imported
before generic_utils in utils/__init__.py)

Not changing keras.utils.test_utils, because that change exposes
(what looks to me like) a latent bug

* Replace incorrect use of getargspec in test_utils.py

The previous code would always fail to detect the 'weights' argument.
Simply replacing getargspec would cause the tests for some of the legacy
layers to fail because the passed 'weights' argument is bad.

Instead, I have added a check for whether the passed `weights` array
is empty, this avoids tripping the bug.

* Replacing getargspec with has_arg in the backend modules

This requires reordering imports to avoid errors caused by
conv_utils trying to import the backend, the backend wanting to
import generic_utils, and utils/__init__.py listing conv_utils
before generic_utils.

* Removed getargspec from legacy wrapping function

Instead save the wrapped function in an attribute and call
getargspec on this attribute during documentation generation.
2017-06-21 09:58:38 -07:00