Merge upstream #62
Merged
Merge upstream #62
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* rem get_session() call from multi gpu utils * tiny fix * optimizer fixes * fix tempfile * rem os.remove * rem tmpdir * ws fix
* rem get_session() call from multi gpu utils * tiny fix
* Use .format calls for string interpolation on utils * Use generators over listcomps whenever possible to save memory
* Change `batch_size` descriptions to proper ones Since there're no gradients updated during `evaulate` and `predict` processes, changed their `batch_size` docstrings from `"Number of samples per gradient update"` to `"Number of samples per evaluation step"` and `"Number of samples to be predicted at once"`. (The sentence in fit remains unchanged.) I hope this fix would change related auto-generated documents as well. * Correct `callbacks` description docstrings Corrected `callbacks` description docstrings in `evaluate_generator` and `predict_generator`: "List of callbacks to apply during training" -> "- during evaluation", "- during prediction".
fix duplicate module name for callbacks module
I just fixed Numpy -> NumPy in HDF5Matrix class.
* Update pooling.py Added Integer at the `pool_size` of `MaxPooling3D` * Update pooling.py Add Integer in `strides` and `pool_size` of 3D layers Added "If None, it will default to `pool_size`." to be consistent with explanation of 1D, 2D layer * Update pooling.py `channels_first` ->`"channels_first"` `channels_last` ->`"channels_last"` "channels_last"->`"channels_last"`
`channels_first` -> `'channels_first'` `channels_last`, "channels_last" -> `'channels_last'` data_format='channels_first' -> `data_format='channels_first'` data_format='channels_last' -> `data_format='channels_last'`
* fix too many values to unpack error
In the example script lstm_seq2seq_restore.py and lstm_seq2seq.py, when
parse the data using line.split("\t"), it will return 3 values rather than
2, a simple modification can fix it.
* add blankspace around operator
# Conflicts: # .coveragerc # .travis.yml # README.md # examples/mnist_swwae.py # keras/backend/tensorflow_backend.py # keras/backend/theano_backend.py # keras/engine/training.py # keras/losses.py # keras/metrics.py # keras/optimizers.py # keras/wrappers/scikit_learn.py # setup.py # tests/integration_tests/test_temporal_data_tasks.py # tests/integration_tests/test_vector_data_tasks.py # tests/keras/engine/test_training.py # tests/keras/losses_test.py # tests/keras/metrics_test.py # tests/keras/test_sequential_model.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge upstream. Fixes some bugs.