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.

Sign up for GitHub

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

Jump to bottom

Expose tf.contrib.layers.conv1d like conv2d/conv3d #20554

Merged
merged 3 commits into from
Jul 31, 2018
Merged

Expose tf.contrib.layers.conv1d like conv2d/conv3d #20554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
911b141
Expose `tf.contrib.layers.conv1d` like conv2d/conv3d
yongtang Jul 5, 2018
1804b48
Alias convolution1d with conv1d in tf.contrib.layers
yongtang Jul 5, 2018
ee3e9d1
Expose conv1d in allowed symbol.
yongtang Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions tensorflow/contrib/layers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
from tensorflow.python.util.all_util import remove_undocumented

_allowed_symbols = ['bias_add',
'conv1d',
'conv2d',
'conv3d',
'elu',
Expand Down
7 changes: 4 additions & 3 deletions tensorflow/contrib/layers/python/layers/layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
# 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',
Expand Down Expand Up @@ -3315,6 +3315,7 @@ def legacy_fully_connected(x,
linear = functools.partial(fully_connected, activation_fn=None)

# Simple alias.
conv1d = convolution1d
conv2d = convolution2d
conv3d = convolution3d
conv2d_transpose = convolution2d_transpose
Expand Down