Properly export recurrent in contrib.

The following symbols are available:
- tf.contrib.recurrent.bidirectional_functional_rnn
- tf.contrib.recurrent.functional_rnn
- tf.contrib.recurrent.Recurrent

PiperOrigin-RevId: 194632138

diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py
index 7f33d46..9f5459f 100644 (file)
--- a/tensorflow/contrib/__init__.py
+++ b/tensorflow/contrib/__init__.py
@@ -69,7 +69,6 @@ from tensorflow.contrib import predictor
 from tensorflow.contrib import proto
 from tensorflow.contrib import quantization
 from tensorflow.contrib import quantize
-from tensorflow.contrib import recurrent
 from tensorflow.contrib import reduce_slice_ops
 from tensorflow.contrib import resampler
 from tensorflow.contrib import rnn
@@ -96,6 +95,7 @@ if os.name != "nt":
   from tensorflow.contrib.lite.python import lite
 from tensorflow.contrib.optimizer_v2 import optimizer_v2_symbols as optimizer_v2
 from tensorflow.contrib.receptive_field import receptive_field_api as receptive_field
+from tensorflow.contrib.recurrent.python import recurrent_api as recurrent
 from tensorflow.contrib.remote_fused_graph import pylib as remote_fused_graph
 from tensorflow.contrib.specs import python as specs
 from tensorflow.contrib.summary import summary

diff --git a/tensorflow/contrib/recurrent/python/recurrent_api.py b/tensorflow/contrib/recurrent/python/recurrent_api.py
index ffe1dcf..f1c9792 100644 (file)
--- a/tensorflow/contrib/recurrent/python/recurrent_api.py
+++ b/tensorflow/contrib/recurrent/python/recurrent_api.py
@@ -19,9 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 # pylint: disable=unused-import
-from tensorflow.contrib.recurrent.python.ops import functional_bidirectional_rnn
-from tensorflow.contrib.recurrent.python.ops import functional_rnn
-from tensorflow.contrib.recurrent.python.ops import Recurrent
+from tensorflow.contrib.recurrent.python.ops.functional_rnn import bidirectional_functional_rnn
+from tensorflow.contrib.recurrent.python.ops.functional_rnn import functional_rnn
+from tensorflow.contrib.recurrent.python.ops.recurrent import Recurrent
 # pylint: enable=unused-import
 
 del absolute_import