aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/specs
diff options
context:
space:
mode:
authorGravatar Andrew Harp <andrewharp@google.com>2016-12-08 20:05:49 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-12-08 20:21:45 -0800
commit1cb96893a64f59b7265f9def9968f7bed1e57662 (patch)
tree0e6d595a0806028f5f92e64c84342ae9659ca108 /tensorflow/contrib/specs
parent90b72f4b2f07a0126efb110d8d4cc96386fcc968 (diff)
Merge changes from github.
Additionally: - change single quotes to double quotes to make path rewriting easier - guard windows lib reference with PLATFORM_WINDOWS - fixed failing kmeans test Change: 141515942
Diffstat (limited to 'tensorflow/contrib/specs')
-rw-r--r--tensorflow/contrib/specs/python/specs_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/contrib/specs/python/specs_test.py b/tensorflow/contrib/specs/python/specs_test.py
index d0e650bc5f..67e4a559a9 100644
--- a/tensorflow/contrib/specs/python/specs_test.py
+++ b/tensorflow/contrib/specs/python/specs_test.py
@@ -197,7 +197,7 @@ class SpecsTest(tf.test.TestCase):
initializer=tf.constant_initializer(42.0))
inputs = tf.constant(_rand(10, 100))
outputs = v.funcall(inputs)
- self.assertEqual(len(tf.all_variables()), 1)
+ self.assertEqual(len(tf.global_variables()), 1)
sess.run([outputs.initializer])
outputs_value = outputs.eval()
self.assertEqual(outputs_value.shape, (2, 2))
@@ -211,7 +211,7 @@ class SpecsTest(tf.test.TestCase):
g = f | f | f | f
inputs = tf.constant(_rand(10, 100))
_ = g.funcall(inputs)
- self.assertEqual(len(tf.all_variables()), 2)
+ self.assertEqual(len(tf.global_variables()), 2)
def testAutoFunction(self):
with self.test_session():