diff options
Diffstat (limited to 'tensorflow/contrib/keras')
6 files changed, 17 insertions, 9 deletions
diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD index f7f56f6fcf..71ce6540d6 100644 --- a/tensorflow/contrib/keras/BUILD +++ b/tensorflow/contrib/keras/BUILD @@ -311,7 +311,10 @@ py_test( size = "medium", srcs = ["python/keras/layers/convolutional_test.py"], srcs_version = "PY2AND3", - tags = ["notsan"], + tags = [ + "manual", + "notsan", + ], deps = [ ":keras", ":testing_utils", diff --git a/tensorflow/contrib/keras/api/keras/layers/__init__.py b/tensorflow/contrib/keras/api/keras/layers/__init__.py index 8f266df0ad..3c6dce5ee8 100644 --- a/tensorflow/contrib/keras/api/keras/layers/__init__.py +++ b/tensorflow/contrib/keras/api/keras/layers/__init__.py @@ -135,6 +135,11 @@ from tensorflow.contrib.keras.python.keras.layers.recurrent import SimpleRNN from tensorflow.contrib.keras.python.keras.layers.recurrent import GRU from tensorflow.contrib.keras.python.keras.layers.recurrent import LSTM +# Wrapper functions +from tensorflow.contrib.keras.python.keras.layers.wrappers import Wrapper +from tensorflow.contrib.keras.python.keras.layers.wrappers import Bidirectional +from tensorflow.contrib.keras.python.keras.layers.wrappers import TimeDistributed + del absolute_import del division del print_function diff --git a/tensorflow/contrib/keras/python/keras/applications/resnet50.py b/tensorflow/contrib/keras/python/keras/applications/resnet50.py index ce7d0bb046..0de13c9592 100644 --- a/tensorflow/contrib/keras/python/keras/applications/resnet50.py +++ b/tensorflow/contrib/keras/python/keras/applications/resnet50.py @@ -56,7 +56,7 @@ def identity_block(input_tensor, kernel_size, filters, stage, block): Arguments: input_tensor: input tensor - kernel_size: defualt 3, the kernel size of middle conv layer at main path + kernel_size: default 3, the kernel size of middle conv layer at main path filters: list of integers, the filterss of 3 conv layer at main path stage: integer, current stage label, used for generating layer names block: 'a','b'..., current block label, used for generating layer names @@ -95,7 +95,7 @@ def conv_block(input_tensor, kernel_size, filters, stage, block, strides=(2, Arguments: input_tensor: input tensor - kernel_size: defualt 3, the kernel size of middle conv layer at main path + kernel_size: default 3, the kernel size of middle conv layer at main path filters: list of integers, the filterss of 3 conv layer at main path stage: integer, current stage label, used for generating layer names block: 'a','b'..., current block label, used for generating layer names diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py index 84d0dacce9..b7adf9461a 100644 --- a/tensorflow/contrib/keras/python/keras/backend.py +++ b/tensorflow/contrib/keras/python/keras/backend.py @@ -92,7 +92,7 @@ _IMAGE_DATA_FORMAT = 'channels_last' def backend(): """Publicly accessible method for determining the current backend. - Only exists for API compatibily with multi-backend Keras. + Only exists for API compatibility with multi-backend Keras. Returns: The string "tensorflow". @@ -2736,7 +2736,7 @@ def in_train_phase(x, alt, training=None): (tensor or callable that returns a tensor). training: Optional scalar tensor (or Python boolean, or Python integer) - specifing the learning phase. + specifying the learning phase. Returns: Either `x` or `alt` based on the `training` flag. @@ -2779,7 +2779,7 @@ def in_test_phase(x, alt, training=None): (tensor or callable that returns a tensor). training: Optional scalar tensor (or Python boolean, or Python integer) - specifing the learning phase. + specifying the learning phase. Returns: Either `x` or `alt` based on `K.learning_phase`. diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py index 7561ef78f3..07d708ada3 100644 --- a/tensorflow/contrib/keras/python/keras/engine/topology.py +++ b/tensorflow/contrib/keras/python/keras/engine/topology.py @@ -1544,7 +1544,7 @@ class Container(Layer): """Retrieve the model's updates. Will only include updates that are either - inconditional, or conditional on inputs to this model + unconditional, or conditional on inputs to this model (e.g. will not include updates that depend on tensors that aren't inputs to this model). @@ -1571,7 +1571,7 @@ class Container(Layer): """Retrieve the model's losses. Will only include losses that are either - inconditional, or conditional on inputs to this model + unconditional, or conditional on inputs to this model (e.g. will not include losses that depend on tensors that aren't inputs to this model). diff --git a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py index 9f8cea375b..0d04fc120f 100644 --- a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py +++ b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py @@ -109,7 +109,7 @@ class BaseWrapper(object): """Gets parameters for this estimator. Arguments: - **params: ignored (exists for API compatiblity). + **params: ignored (exists for API compatibility). Returns: Dictionary of parameter names mapped to their values. |