Refactoring: Used the function normalize_data_format to remove some code.
#10690
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
gabrieldemarmiesse
changed the title
normalize_data_format to remove some code.normalize_data_format to remove some code.
…the implementation to keras/backend/common.py.
fchollet
reviewed
Jul 18, 2018
keras/utils/conv_utils.py
Outdated
| @@ -8,6 +8,9 @@ | |||
| import numpy as np | |||
| from .. import backend as K | |||
|
|
|||
| # Legacy import | |||
| from ..backend import normalize_data_format | |||
There was a problem hiding this comment.
It's not part of the public API, you don't need to import it here.
| @@ -99,6 +99,7 @@ | |||
| 'deserialize', | |||
| 'get', | |||
| 'set_image_dim_ordering', | |||
| 'normalize_data_format', | |||
There was a problem hiding this comment.
It's not part of the public API, it shouldn't be documented.
There was a problem hiding this comment.
Indeed. This is why it's in the EXCLUDE set here.
keras/backend/cntk_backend.py
Outdated
| @@ -4,7 +4,8 @@ | |||
|
|
|||
| import cntk as C | |||
| import numpy as np | |||
| from .common import floatx, epsilon, image_dim_ordering, image_data_format | |||
| from .common import floatx, epsilon | |||
| from .common import image_data_format, normalize_data_format | |||
There was a problem hiding this comment.
Please use one import per line from now on.
keras/backend/common.py
Outdated
| @@ -147,6 +147,37 @@ def set_image_data_format(data_format): | |||
| _IMAGE_DATA_FORMAT = str(data_format) | |||
|
|
|||
|
|
|||
| def normalize_data_format(value): | |||
| """Check that the value correspond to a valid data format. | |||
keras/backend/common.py
Outdated
| """Check that the value correspond to a valid data format. | ||
|
|
||
| # Arguments | ||
| value: string or None. `'channels_first'` or `'channels_last'`. |
There was a problem hiding this comment.
Capitalize start of argument descriptions ("String or...")
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.
Summary
Quite a lot of code can be removed by doing this. Would you want me to split it into multiple smaller PRs?
Related Issues
PR Overview
To solve the issue of cyclical imports, I moved the
normalized_data_formatinbackend/common.py. I think it makes sense for the implementation to be there overall since it's tightly connected to the data_format given by the backend. I left the other implementation to avoid breaking anything.