Fixes making specs and ndlstm accessible through tf.contrib

Change: 136781876

tensorflow/contrib/BUILD

@@ -29,12 +29,14 @@ py_library(
         "//tensorflow/contrib/lookup:lookup_py",
         "//tensorflow/contrib/losses:losses_py",
         "//tensorflow/contrib/metrics:metrics_py",
+        "//tensorflow/contrib/ndlstm",
         "//tensorflow/contrib/opt:opt_py",
         "//tensorflow/contrib/quantization:quantization_py",
         "//tensorflow/contrib/rnn:rnn_py",
         "//tensorflow/contrib/seq2seq:seq2seq_py",
         "//tensorflow/contrib/slim",
         "//tensorflow/contrib/slim:nets",
+        "//tensorflow/contrib/specs",
         "//tensorflow/contrib/tensor_forest:tensor_forest_py",
         "//tensorflow/contrib/tensor_forest/hybrid:ops_lib",
         "//tensorflow/contrib/tensorboard",

tensorflow/contrib/__init__.py

@@ -45,3 +45,5 @@ from tensorflow.contrib import testing
 from tensorflow.contrib import tfprof
 from tensorflow.contrib import training
 from tensorflow.contrib import util
+from tensorflow.contrib.ndlstm import python as ndlstm
+from tensorflow.contrib.specs import python as specs

tensorflow/contrib/ndlstm/BUILD

@@ -13,6 +13,7 @@ load("//tensorflow:tensorflow.bzl", "tf_py_test")
 py_library(
     name = "ndlstm",
     srcs = [
+        "__init__.py",
         "python/__init__.py",
         "python/lstm1d.py",
         "python/lstm2d.py",

tensorflow/contrib/ndlstm/python/lstm1d_test.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import numpy as np
 import tensorflow as tf
-from tensorflow.contrib.ndlstm.python import lstm1d
+lstm1d = tf.contrib.ndlstm.lstm1d
 
 
 def _rand(*size):

tensorflow/contrib/ndlstm/python/lstm2d_test.py

@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 import tensorflow as tf
-from tensorflow.contrib.ndlstm.python import lstm2d
 from tensorflow.python.framework import test_util
+lstm2d = tf.contrib.ndlstm.lstm2d
 
 
 def _rand(*size):

tensorflow/contrib/ndlstm/python/misc_test.py

@@ -19,8 +19,8 @@ from __future__ import print_function
 
 import numpy as np
 import tensorflow as tf
-from tensorflow.contrib.ndlstm.python import misc
 from tensorflow.python.framework import test_util
+misc = tf.contrib.ndlstm.misc
 
 
 def _rand(*size):

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",

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 *

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):