Skip to content
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.

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

Support return_state parameter in ConvRecurrent2D #7407

Merged
merged 13 commits into from
Jul 26, 2017

Conversation

ericwu09
Copy link
Contributor

Added support for the return_state=True parameter in the ConvRecurrent2D abstract class.

Added support for the return_state=True parameter in the ConvRecurrent2D abstract class.
@fchollet
Copy link
Member

Please fix PEP8 error: https://travis-ci.org/fchollet/keras/jobs/256547031

@fchollet
Copy link
Member

Additionally, this change should have a unit test.

@fchollet
Copy link
Member

@ericwu09
Copy link
Contributor Author

Thanks, @fchollet. The unit test is in and passes the checks now.

Copy link
Member

@fchollet fchollet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fchollet fchollet merged commit cafa286 into keras-team:master Jul 26, 2017
ahundt added a commit to ahundt/keras that referenced this pull request Jul 26, 2017
* commit '84ceb94055b831c486dbf4955fdf1ba0f63320d1': (42 commits)
  Fix conv reccurent test
  Style fix in conv recurrent tests.
  Support return_state parameter in ConvRecurrent2D (keras-team#7407)
  Small simplification in ResNet50 architecture
  Update FAQ with info about custom object loading.
  add example for passing in custom objects in load_model (keras-team#7420)
  Update applications.md (keras-team#7428)
  Cast constants in optimizer as floatx.
  Fix stop_gradient inconsistent API (keras-team#7416)
  Simplify static shape management in TF backend.
  Fixed warning showing up when channel axis is 1 (keras-team#7392)
  Throw exception in LSTM layer if timesteps=1 and unroll=True (keras-team#7387)
  Style fix
  Passed the scheduling argument through the `*_generator` function. (keras-team#7236)
  Fix typos. (keras-team#7374)
  Fix ImageDataGenerator.standardize to support batches (keras-team#7360)
  Fix learning phase info being left out in multi-input models (keras-team#7135)
  Fix PEP8
  Fix deserialization bug with layer sharing at heterogenous depths
  Bug fix: Support multiple outputs in Lambda layer (keras-team#7222)
  ...
ahundt added a commit to ahundt/keras that referenced this pull request Aug 1, 2017
…ize_input_data

* commit '01e2148732e4083b4850345e5ce4dd499cb5999e': (87 commits)
  Fix common backend styles (keras-team#7476)
  Allow dynamic shape for repeat_elements (keras-team#7422)
  Fix test style (keras-team#7473)
  Crossentropy backend API consistency cleanup (keras-team#7199)
  Replace the reserved word `input` with `inputs` (keras-team#7474)
  Increase test coverage (keras-team#7264)
  Fix l2_normalize
  Add default value for `l2_normalize`.
  Remove legacy axis handling in TF backend.
  Update save_model function (keras-team#7455)
  Switch to pydot 1.2.x (keras-team#7448)
  Add save, evaluate and predict functionality for example (keras-team#7430)
  Docs fix: `pointwise` instead of `depthwise` for SeparableConv2D (keras-team#7444)
  Fix conv reccurent test
  Style fix in conv recurrent tests.
  Support return_state parameter in ConvRecurrent2D (keras-team#7407)
  Small simplification in ResNet50 architecture
  Update FAQ with info about custom object loading.
  add example for passing in custom objects in load_model (keras-team#7420)
  Update applications.md (keras-team#7428)
  ...

# Conflicts:
#	tests/keras/backend/backend_test.py
ahundt added a commit to ahundt/keras that referenced this pull request Aug 1, 2017
…s_per_epoch

* commit '01e2148732e4083b4850345e5ce4dd499cb5999e': (98 commits)
  Fix common backend styles (keras-team#7476)
  Allow dynamic shape for repeat_elements (keras-team#7422)
  Fix test style (keras-team#7473)
  Crossentropy backend API consistency cleanup (keras-team#7199)
  Replace the reserved word `input` with `inputs` (keras-team#7474)
  Increase test coverage (keras-team#7264)
  Fix l2_normalize
  Add default value for `l2_normalize`.
  Remove legacy axis handling in TF backend.
  Update save_model function (keras-team#7455)
  Switch to pydot 1.2.x (keras-team#7448)
  Add save, evaluate and predict functionality for example (keras-team#7430)
  Docs fix: `pointwise` instead of `depthwise` for SeparableConv2D (keras-team#7444)
  Fix conv reccurent test
  Style fix in conv recurrent tests.
  Support return_state parameter in ConvRecurrent2D (keras-team#7407)
  Small simplification in ResNet50 architecture
  Update FAQ with info about custom object loading.
  add example for passing in custom objects in load_model (keras-team#7420)
  Update applications.md (keras-team#7428)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants