diff options
| author |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-07-31 14:22:44 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-07-31 14:22:44 -0700 |
| commit | 48f486b4b4ad23dbfddbd9527f184ef25bdc2421 (patch) | |
| tree | b9bd8f67ef63a3347588893dbe904108be3e3b9a /tensorflow/contrib/layers | |
| parent | 3d933cdd00986202feba99b922cdb132caaf9fb3 (diff) | |
| parent | ee3e9d13d561c536837e2007cade57c51e78747d (diff) | |
Merge pull request #20554 from yongtang:20551-contrib.layers.conv1d
PiperOrigin-RevId: 206825546
Diffstat (limited to 'tensorflow/contrib/layers')
| -rw-r--r-- | tensorflow/contrib/layers/__init__.py | 1 | ||||
| -rw-r--r-- | tensorflow/contrib/layers/python/layers/layers.py | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tensorflow/contrib/layers/__init__.py b/tensorflow/contrib/layers/__init__.py index bc33596935..a7b41b714f 100644 --- a/tensorflow/contrib/layers/__init__.py +++ b/tensorflow/contrib/layers/__init__.py @@ -121,6 +121,7 @@ from tensorflow.contrib.layers.python.layers import * from tensorflow.python.util.all_util import remove_undocumented _allowed_symbols = ['bias_add', + 'conv1d', 'conv2d', 'conv3d', 'elu', diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py index dd602cf3a9..fa334070ad 100644 --- a/tensorflow/contrib/layers/python/layers/layers.py +++ b/tensorflow/contrib/layers/python/layers/layers.py @@ -55,9 +55,9 @@ from tensorflow.python.training import moving_averages # TODO(b/28426988): Replace legacy_* fns migrated from slim. # TODO(b/28426988): Remove legacy_* when all uses have migrated to new API. __all__ = [ - 'avg_pool2d', 'avg_pool3d', 'batch_norm', 'bias_add', 'conv2d', 'conv3d', - 'conv2d_in_plane', 'conv2d_transpose', 'conv3d_transpose', 'convolution', - 'convolution1d', 'convolution2d', 'convolution2d_in_plane', + 'avg_pool2d', 'avg_pool3d', 'batch_norm', 'bias_add', 'conv1d', 'conv2d', + 'conv3d', 'conv2d_in_plane', 'conv2d_transpose', 'conv3d_transpose', + 'convolution', 'convolution1d', 'convolution2d', 'convolution2d_in_plane', 'convolution2d_transpose', 'convolution3d', 'convolution3d_transpose', 'dense_to_sparse', 'dropout', 'elu', 'flatten', 'fully_connected', 'GDN', 'gdn', 'images_to_sequence', 'layer_norm', 'linear', 'pool', 'max_pool2d', @@ -3320,6 +3320,7 @@ relu6 = functools.partial(fully_connected, activation_fn=nn.relu6) linear = functools.partial(fully_connected, activation_fn=None) # Simple alias. +conv1d = convolution1d conv2d = convolution2d conv3d = convolution3d conv2d_transpose = convolution2d_transpose |