Make object layers public in tf.layers.

PiperOrigin-RevId: 165039827

1 files changed, 34 insertions, 3 deletions

diff --git a/tensorflow/python/layers/layers.py b/tensorflow/python/layers/layers.py
index aa46eb5d27..480baa4ea2 100644
--- a/tensorflow/python/layers/layers.py
+++ b/tensorflow/python/layers/layers.py
@@ -41,19 +41,48 @@ from tensorflow.python.util.all_util import remove_undocumented
 
 # pylint: disable=g-bad-import-order,unused-import
 
+# Base objects.
+from tensorflow.python.layers.base import Layer
+from tensorflow.python.layers.base import Network
+from tensorflow.python.layers.base import Input
+from tensorflow.python.layers.base import InputSpec
+
 # Core layers.
+from tensorflow.python.layers.core import Dense
+from tensorflow.python.layers.core import Dropout
+
 from tensorflow.python.layers.core import dense
 from tensorflow.python.layers.core import dropout
 
 # Convolutional layers.
-from tensorflow.python.layers.convolutional import conv1d
-from tensorflow.python.layers.convolutional import conv2d
-from tensorflow.python.layers.convolutional import conv3d
+from tensorflow.python.layers.convolutional import SeparableConv2D
+from tensorflow.python.layers.convolutional import SeparableConvolution2D
+from tensorflow.python.layers.convolutional import Conv2DTranspose
+from tensorflow.python.layers.convolutional import Convolution2DTranspose
+from tensorflow.python.layers.convolutional import Conv3DTranspose
+from tensorflow.python.layers.convolutional import Convolution3DTranspose
+from tensorflow.python.layers.convolutional import Conv1D
+from tensorflow.python.layers.convolutional import Convolution1D
+from tensorflow.python.layers.convolutional import Conv2D
+from tensorflow.python.layers.convolutional import Convolution2D
+from tensorflow.python.layers.convolutional import Conv3D
+from tensorflow.python.layers.convolutional import Convolution3D
+
 from tensorflow.python.layers.convolutional import separable_conv2d
 from tensorflow.python.layers.convolutional import conv2d_transpose
 from tensorflow.python.layers.convolutional import conv3d_transpose
+from tensorflow.python.layers.convolutional import conv1d
+from tensorflow.python.layers.convolutional import conv2d
+from tensorflow.python.layers.convolutional import conv3d
 
 # Pooling layers.
+from tensorflow.python.layers.pooling import AveragePooling1D
+from tensorflow.python.layers.pooling import MaxPooling1D
+from tensorflow.python.layers.pooling import AveragePooling2D
+from tensorflow.python.layers.pooling import MaxPooling2D
+from tensorflow.python.layers.pooling import AveragePooling3D
+from tensorflow.python.layers.pooling import MaxPooling3D
+
 from tensorflow.python.layers.pooling import average_pooling1d
 from tensorflow.python.layers.pooling import max_pooling1d
 from tensorflow.python.layers.pooling import average_pooling2d
@@ -62,6 +91,8 @@ from tensorflow.python.layers.pooling import average_pooling3d
 from tensorflow.python.layers.pooling import max_pooling3d
 
 # Normalization layers.
+from tensorflow.python.layers.normalization import BatchNormalization
+
 from tensorflow.python.layers.normalization import batch_normalization
 
 # pylint: enable=g-bad-import-order,unused-import