Fixes making specs and ndlstm accessible through tf.contrib

Change: 136781876

4 files changed, 28 insertions, 1 deletions

diff --git a/tensorflow/contrib/specs/BUILD b/tensorflow/contrib/specs/BUILD
index 517fe4784c..9c9e99b793 100644
--- a/tensorflow/contrib/specs/BUILD
+++ b/tensorflow/contrib/specs/BUILD
@@ -12,6 +12,7 @@ load("//tensorflow:tensorflow.bzl", "tf_py_test")
 py_library(
     name = "specs",
     srcs = [
+        "__init__.py",
         "python/__init__.py",
         "python/params_ops.py",
         "python/specs.py",
diff --git a/tensorflow/contrib/specs/__init__.py b/tensorflow/contrib/specs/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tensorflow/contrib/specs/__init__.py
diff --git a/tensorflow/contrib/specs/python/__init__.py b/tensorflow/contrib/specs/python/__init__.py
index e69de29bb2..1e063e5d31 100644
--- a/tensorflow/contrib/specs/python/__init__.py
+++ b/tensorflow/contrib/specs/python/__init__.py
@@ -0,0 +1,26 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Init file, giving convenient access to all specs ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+# pylint: disable=wildcard-import,g-importing-member
+from tensorflow.contrib.specs.python.params_ops import *
+from tensorflow.contrib.specs.python.specs import *
+from tensorflow.contrib.specs.python.specs_lib import *
+from tensorflow.contrib.specs.python.specs_ops import *
+from tensorflow.contrib.specs.python.summaries import *
diff --git a/tensorflow/contrib/specs/python/specs_test.py b/tensorflow/contrib/specs/python/specs_test.py
index 71e160f092..ce13c9f924 100644
--- a/tensorflow/contrib/specs/python/specs_test.py
+++ b/tensorflow/contrib/specs/python/specs_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 import tensorflow as tf
-from tensorflow.contrib.specs.python import specs
 from tensorflow.contrib.specs.python import summaries
+specs = tf.contrib.specs
 
 
 def _rand(*size):