From 1cb96893a64f59b7265f9def9968f7bed1e57662 Mon Sep 17 00:00:00 2001 From: Andrew Harp Date: Thu, 8 Dec 2016 20:05:49 -0800 Subject: 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 --- tensorflow/contrib/framework/python/ops/prettyprint_ops_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tensorflow/contrib/framework/python/ops/prettyprint_ops_test.py') diff --git a/tensorflow/contrib/framework/python/ops/prettyprint_ops_test.py b/tensorflow/contrib/framework/python/ops/prettyprint_ops_test.py index 5db9cef58b..dfaaafd88e 100644 --- a/tensorflow/contrib/framework/python/ops/prettyprint_ops_test.py +++ b/tensorflow/contrib/framework/python/ops/prettyprint_ops_test.py @@ -52,7 +52,7 @@ class PrettyPrintOpsTest(tf.test.TestCase): a = tf.Variable(1.0) a = tf.contrib.framework.print_op(a) with self.test_session(): - tf.initialize_all_variables().run() + tf.global_variables_initializer().run() a.eval() if __name__ == "__main__": -- cgit v1.2.3