diff options
| author |  Yifei Feng <yifeif@google.com> | 2017-11-22 13:42:21 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-11-22 13:50:02 -0800 |
| commit | b1d8c59e9b014b527fb2fbef9ce9afc14dbc4938 (patch) | |
| tree | af207d5a90f3176bdd3fbffbe1e98258125bf389 /tensorflow/contrib/nn | |
| parent | e219aeb542779d90a582ffe16f8602cd1b275b22 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 176695926
Diffstat (limited to 'tensorflow/contrib/nn')
| -rw-r--r-- | tensorflow/contrib/nn/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tensorflow/contrib/nn/__init__.py b/tensorflow/contrib/nn/__init__.py index 3bf795d19a..0bc133a00e 100644 --- a/tensorflow/contrib/nn/__init__.py +++ b/tensorflow/contrib/nn/__init__.py @@ -15,6 +15,7 @@ """Module for variants of ops in tf.nn. @@alpha_dropout +@@conv1d_transpose @@deprecated_flipped_softmax_cross_entropy_with_logits @@deprecated_flipped_sparse_softmax_cross_entropy_with_logits @@deprecated_flipped_sigmoid_cross_entropy_with_logits @@ -32,6 +33,7 @@ from tensorflow.contrib.nn.python.ops.alpha_dropout import * from tensorflow.contrib.nn.python.ops.cross_entropy import * from tensorflow.contrib.nn.python.ops.sampling_ops import * from tensorflow.contrib.nn.python.ops.scaled_softplus import * +from tensorflow.python.ops.nn_ops import conv1d_transpose from tensorflow.python.ops.nn_ops import nth_element # pylint: enable=unused-import,wildcard-import |