TensorFlow: upstream changes from the afternoon.

Changes:

- futurize --stage2 changes for Python 3 compatibility by @girving.

- Small updates to documentation by @vrv, schuster and others

- Account for failure of std::thread::hardware_concurrency by @ebrevdo.

- More changes for backwards-compatibility tests by Josh

- Updates to python op doc generation by Josh

- Added support for using the best-fit allocator via ConfigProto by @vrv.

- Rename LocalSession to DirectSession, since local was a bad name for
  it.

- Enable tf.nn.moments() to work with tensors of unknown shape by @mrry.
  GITHUB_ISSUE: 139

- Changes for Android build by Andrew.

Base CL: 107645181

80 files changed, 478 insertions, 62 deletions

diff --git a/tensorflow/python/kernel_tests/argmax_op_test.py b/tensorflow/python/kernel_tests/argmax_op_test.py
index 2cd6101a87..f5f2569f53 100644
--- a/tensorflow/python/kernel_tests/argmax_op_test.py
+++ b/tensorflow/python/kernel_tests/argmax_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.argmax_op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/array_ops_test.py b/tensorflow/python/kernel_tests/array_ops_test.py
index 108cc7599e..bf5e98518d 100644
--- a/tensorflow/python/kernel_tests/array_ops_test.py
+++ b/tensorflow/python/kernel_tests/array_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for array_ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import math
 
 import tensorflow.python.platform
diff --git a/tensorflow/python/kernel_tests/attention_ops_test.py b/tensorflow/python/kernel_tests/attention_ops_test.py
index 5541c541b2..500d85e6d0 100644
--- a/tensorflow/python/kernel_tests/attention_ops_test.py
+++ b/tensorflow/python/kernel_tests/attention_ops_test.py
@@ -1,5 +1,9 @@
 """Tests for tensorflow.ops.attention_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
@@ -80,8 +84,8 @@ class ExtractGlimpseTest(tf.test.TestCase):
     # Check entries.
     min_random_val = 0
     max_random_val = max(rows, cols)
-    for i in range(0, glimpse_sizes[0]):
-      for j in range(0, glimpse_sizes[1]):
+    for i in range(glimpse_sizes[0]):
+      for j in range(glimpse_sizes[1]):
         if expected_rows[i] is None or expected_cols[j] is None:
           self.assertGreaterEqual(value_rows[0][i][j][0], min_random_val)
           self.assertLessEqual(value_rows[0][i][j][0], max_random_val)
@@ -102,15 +106,15 @@ class ExtractGlimpseTest(tf.test.TestCase):
     self._VerifyValues(tensor_in_sizes=[41, 61],
                        glimpse_sizes=[41, 61],
                        offsets=[0.0, 0.0],
-                       expected_rows=range(1, 42),
-                       expected_cols=range(1, 62))
+                       expected_rows=list(range(1, 42)),
+                       expected_cols=list(range(1, 62)))
 
   def testTooLargeCenterGlimpse(self):
     self._VerifyValues(tensor_in_sizes=[41, 61],
                        glimpse_sizes=[43, 63],
                        offsets=[0.0, 0.0],
-                       expected_rows=[None] + range(1, 42) + [None],
-                       expected_cols=[None] + range(1, 62) + [None])
+                       expected_rows=[None] + list(range(1, 42)) + [None],
+                       expected_cols=[None] + list(range(1, 62)) + [None])
 
   def testGlimpseFullOverlap(self):
     self._VerifyValues(tensor_in_sizes=[41, 61],
diff --git a/tensorflow/python/kernel_tests/batch_matmul_op_test.py b/tensorflow/python/kernel_tests/batch_matmul_op_test.py
index 8ae37fec3a..d27b38b40e 100644
--- a/tensorflow/python/kernel_tests/batch_matmul_op_test.py
+++ b/tensorflow/python/kernel_tests/batch_matmul_op_test.py
@@ -1,4 +1,7 @@
 """Tests for tensorflow.ops.tf.BatchMatMul."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow.python.platform
 
diff --git a/tensorflow/python/kernel_tests/bcast_ops_test.py b/tensorflow/python/kernel_tests/bcast_ops_test.py
index c62a910496..640c29a550 100644
--- a/tensorflow/python/kernel_tests/bcast_ops_test.py
+++ b/tensorflow/python/kernel_tests/bcast_ops_test.py
@@ -1,5 +1,9 @@
 """Tests for tensorflow.kernels.bcast_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/bias_op_test.py b/tensorflow/python/kernel_tests/bias_op_test.py
index da706e8259..2badc0f8bc 100644
--- a/tensorflow/python/kernel_tests/bias_op_test.py
+++ b/tensorflow/python/kernel_tests/bias_op_test.py
@@ -1,5 +1,8 @@
 """Functional tests for BiasAdd."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/candidate_sampler_ops_test.py b/tensorflow/python/kernel_tests/candidate_sampler_ops_test.py
index a36b8587d5..48857d7150 100644
--- a/tensorflow/python/kernel_tests/candidate_sampler_ops_test.py
+++ b/tensorflow/python/kernel_tests/candidate_sampler_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for CandidateSamplerOp."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/cast_op_test.py b/tensorflow/python/kernel_tests/cast_op_test.py
index e67b0694c4..b8d9786daa 100644
--- a/tensorflow/python/kernel_tests/cast_op_test.py
+++ b/tensorflow/python/kernel_tests/cast_op_test.py
@@ -1,4 +1,7 @@
 """Tests for tensorflow.ops.tf.cast."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow.python.platform
 
diff --git a/tensorflow/python/kernel_tests/cholesky_op_test.py b/tensorflow/python/kernel_tests/cholesky_op_test.py
index 17e8d116be..aadf47ba73 100644
--- a/tensorflow/python/kernel_tests/cholesky_op_test.py
+++ b/tensorflow/python/kernel_tests/cholesky_op_test.py
@@ -1,7 +1,12 @@
 """Tests for tensorflow.ops.tf.Cholesky."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 
diff --git a/tensorflow/python/kernel_tests/clip_ops_test.py b/tensorflow/python/kernel_tests/clip_ops_test.py
index 46bba7514d..7d4ee20a55 100644
--- a/tensorflow/python/kernel_tests/clip_ops_test.py
+++ b/tensorflow/python/kernel_tests/clip_ops_test.py
@@ -1,5 +1,9 @@
 """Tests for tensorflow.ops.clip_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/concat_op_test.py b/tensorflow/python/kernel_tests/concat_op_test.py
index 3f6c43f0a6..b495948554 100644
--- a/tensorflow/python/kernel_tests/concat_op_test.py
+++ b/tensorflow/python/kernel_tests/concat_op_test.py
@@ -1,4 +1,8 @@
 """Functional tests for Concat Op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/constant_op_test.py b/tensorflow/python/kernel_tests/constant_op_test.py
index 92f9b5fe4a..c02c21250c 100644
--- a/tensorflow/python/kernel_tests/constant_op_test.py
+++ b/tensorflow/python/kernel_tests/constant_op_test.py
@@ -1,4 +1,8 @@
 """Tests for ConstantOp."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
index adf3552739..e293dea581 100644
--- a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
+++ b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
@@ -1,10 +1,15 @@
 # pylint: disable=g-long-lambda
 """Tests for tensorflow.ops.control_flow_ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import math
 
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 from tensorflow.python.ops import control_flow_ops
@@ -29,7 +34,7 @@ def check_consumers(graph):
     for v in op.inputs:
       cnt = consumer_count.get(v, 0)
       consumer_count[v] = cnt + 1
-  for k, v in consumer_count.iteritems():
+  for k, v in consumer_count.items():
     if len(k.consumers()) != v:
       return False
   return True
diff --git a/tensorflow/python/kernel_tests/conv_ops_test.py b/tensorflow/python/kernel_tests/conv_ops_test.py
index 88f37ef952..4d88809c88 100644
--- a/tensorflow/python/kernel_tests/conv_ops_test.py
+++ b/tensorflow/python/kernel_tests/conv_ops_test.py
@@ -1,6 +1,7 @@
 """Functional tests for convolutional operations."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
-import math
 
 import tensorflow.python.platform
 
@@ -372,11 +373,11 @@ class Conv2DTest(tf.test.TestCase):
     filter_shape = [filter_rows, filter_cols, in_depth, out_depth]
     # TODO(yangke): re-factor the computation of output shape.
     if padding == "VALID":
-      output_rows = int(math.ceil((input_rows - filter_rows + 1.0) / stride))
-      output_cols = int(math.ceil((input_cols - filter_cols + 1.0) / stride))
+      output_rows = (input_rows - filter_rows + stride) // stride
+      output_cols = (input_cols - filter_cols + stride) // stride
     else:
-      output_rows = int(math.ceil(float(input_rows) / stride))
-      output_cols = int(math.ceil(float(input_cols) / stride))
+      output_rows = (input_rows + stride - 1) // stride
+      output_cols = (input_cols + stride - 1) // stride
     output_shape = [batch, output_rows, output_cols, out_depth]
     input_size = 1
     for x in input_shape:
diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py
index 22491f231a..a225db20d5 100644
--- a/tensorflow/python/kernel_tests/cwise_ops_test.py
+++ b/tensorflow/python/kernel_tests/cwise_ops_test.py
@@ -1,5 +1,9 @@
 """Functional tests for coefficient-wise operations.
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
@@ -10,7 +14,8 @@ from tensorflow.python.kernel_tests import gradient_checker as gc
 _ADD = lambda x, y: x + y
 _SUB = lambda x, y: x - y
 _MUL = lambda x, y: x * y
-_DIV = lambda x, y: x / y
+_TRUEDIV = lambda x, y: x / y
+_FLOORDIV = lambda x, y: x // y
 _MOD = lambda x, y: x % y
 _NEG = lambda x: -x
 _ABS = abs
@@ -229,9 +234,10 @@ class BinaryOpTest(tf.test.TestCase):
 
   def _compareBoth(self, x, y, np_func, tf_func):
     self._compareCpu(x, y, np_func, tf_func)
-    if x.dtype == np.float32 or x.dtype == np.float64:
-      self._compareGradientX(x, y, np_func, tf_func)
-      self._compareGradientY(x, y, np_func, tf_func)
+    if x.dtype in (np.float32, np.float64):
+      if tf_func not in (_FLOORDIV, tf.floordiv):
+        self._compareGradientX(x, y, np_func, tf_func)
+        self._compareGradientY(x, y, np_func, tf_func)
       self._compareGpu(x, y, np_func, tf_func)
 
   def testFloatBasic(self):
@@ -240,11 +246,13 @@ class BinaryOpTest(tf.test.TestCase):
     self._compareBoth(x, y, np.add, tf.add)
     self._compareBoth(x, y, np.subtract, tf.sub)
     self._compareBoth(x, y, np.multiply, tf.mul)
-    self._compareBoth(x, y + 0.1, np.divide, tf.div)
+    self._compareBoth(x, y + 0.1, np.true_divide, tf.truediv)
+    self._compareBoth(x, y + 0.1, np.floor_divide, tf.floordiv)
     self._compareBoth(x, y, np.add, _ADD)
     self._compareBoth(x, y, np.subtract, _SUB)
     self._compareBoth(x, y, np.multiply, _MUL)
-    self._compareBoth(x, y + 0.1, np.divide, _DIV)
+    self._compareBoth(x, y + 0.1, np.true_divide, _TRUEDIV)
+    self._compareBoth(x, y + 0.1, np.floor_divide, _FLOORDIV)
 
   def testFloatDifferentShapes(self):
     x = np.array([1, 2, 3, 4]).reshape(2, 2).astype(np.float32)
@@ -267,11 +275,13 @@ class BinaryOpTest(tf.test.TestCase):
     self._compareBoth(x, y, np.add, tf.add)
     self._compareBoth(x, y, np.subtract, tf.sub)
     self._compareBoth(x, y, np.multiply, tf.mul)
-    self._compareBoth(x, y + 0.1, np.divide, tf.div)
+    self._compareBoth(x, y + 0.1, np.true_divide, tf.truediv)
+    self._compareBoth(x, y + 0.1, np.floor_divide, tf.floordiv)
     self._compareBoth(x, y, np.add, _ADD)
     self._compareBoth(x, y, np.subtract, _SUB)
     self._compareBoth(x, y, np.multiply, _MUL)
-    self._compareBoth(x, y + 0.1, np.divide, _DIV)
+    self._compareBoth(x, y + 0.1, np.true_divide, _TRUEDIV)
+    self._compareBoth(x, y + 0.1, np.floor_divide, _FLOORDIV)
 
   def testInt8Basic(self):
     x = np.arange(1, 13, 2).reshape(1, 3, 2).astype(np.int8)
@@ -291,14 +301,14 @@ class BinaryOpTest(tf.test.TestCase):
     self._compareBoth(x, y, np.add, tf.add)
     self._compareBoth(x, y, np.subtract, tf.sub)
     self._compareBoth(x, y, np.multiply, tf.mul)
-    # NOTE: int32 division is ill-defined.
-    self._compareBoth(x, y, np.divide, tf.div)
+    self._compareBoth(x, y, np.true_divide, tf.truediv)
+    self._compareBoth(x, y, np.floor_divide, tf.floordiv)
     self._compareBoth(x, y, np.mod, tf.mod)
     self._compareBoth(x, y, np.add, _ADD)
     self._compareBoth(x, y, np.subtract, _SUB)
     self._compareBoth(x, y, np.multiply, _MUL)
-    # NOTE: int32 division is ill-defined.
-    self._compareBoth(x, y, np.divide, _DIV)
+    self._compareBoth(x, y, np.true_divide, _TRUEDIV)
+    self._compareBoth(x, y, np.floor_divide, _FLOORDIV)
     self._compareBoth(x, y, np.mod, _MOD)
 
   def testInt64Basic(self):
@@ -306,13 +316,13 @@ class BinaryOpTest(tf.test.TestCase):
     y = np.arange(1, 7, 1).reshape(1, 3, 2).astype(np.int64)
     self._compareBoth(x, y, np.subtract, tf.sub)
     self._compareBoth(x, y, np.multiply, tf.mul)
-    # NOTE: int64 division is ill-defined.
-    self._compareBoth(x, y, np.divide, tf.div)
+    self._compareBoth(x, y, np.true_divide, tf.truediv)
+    self._compareBoth(x, y, np.floor_divide, tf.floordiv)
     self._compareBoth(x, y, np.mod, tf.mod)
     self._compareBoth(x, y, np.subtract, _SUB)
     self._compareBoth(x, y, np.multiply, _MUL)
-    # NOTE: int64 division is ill-defined.
-    self._compareBoth(x, y, np.divide, _DIV)
+    self._compareBoth(x, y, np.true_divide, _TRUEDIV)
+    self._compareBoth(x, y, np.floor_divide, _FLOORDIV)
     self._compareBoth(x, y, np.mod, _MOD)
 
   def testComplex64Basic(self):
@@ -323,19 +333,20 @@ class BinaryOpTest(tf.test.TestCase):
     self._compareCpu(x, y, np.add, tf.add)
     self._compareCpu(x, y, np.subtract, tf.sub)
     self._compareCpu(x, y, np.multiply, tf.mul)
-    self._compareCpu(x, y + 0.1, np.divide, tf.div)
+    self._compareCpu(x, y + 0.1, np.true_divide, tf.truediv)
     self._compareCpu(x, y, np.add, _ADD)
     self._compareCpu(x, y, np.subtract, _SUB)
     self._compareCpu(x, y, np.multiply, _MUL)
-    self._compareCpu(x, y + 0.1, np.divide, _DIV)
+    self._compareCpu(x, y + 0.1, np.true_divide, _TRUEDIV)
 
   def _compareBCast(self, xs, ys, dtype, np_func, tf_func):
     x = (1 + np.linspace(0, 5, np.prod(xs))).astype(dtype).reshape(xs)
     y = (1 + np.linspace(0, 5, np.prod(ys))).astype(dtype).reshape(ys)
     self._compareCpu(x, y, np_func, tf_func)
-    if x.dtype == np.float32 or x.dtype == np.float64:
-      self._compareGradientX(x, y, np_func, tf_func)
-      self._compareGradientY(x, y, np_func, tf_func)
+    if x.dtype in (np.float32, np.float64):
+      if tf_func not in (_FLOORDIV, tf.floordiv):
+        self._compareGradientX(x, y, np_func, tf_func)
+        self._compareGradientY(x, y, np_func, tf_func)
       self._compareGpu(x, y, np_func, tf_func)
 
   # TODO(josh11b,vrv): Refactor this to use parameterized tests.
@@ -349,6 +360,8 @@ class BinaryOpTest(tf.test.TestCase):
     ]
     for dtype in dtypes:
       for (np_func, tf_func) in funcs:
+        if dtype == np.complex64 and tf_func in (_FLOORDIV, tf.floordiv):
+          continue  # floordiv makes no sense for complex numbers
         self._compareBCast(xs, ys, dtype, np_func, tf_func)
         self._compareBCast(ys, xs, dtype, np_func, tf_func)
 
@@ -376,8 +389,10 @@ class BinaryOpTest(tf.test.TestCase):
 
   def _testBCastD(self, xs, ys):
     funcs = [
-        (np.divide, tf.div),
-        (np.divide, _DIV)
+        (np.true_divide, tf.truediv),
+        (np.floor_divide, tf.floordiv),
+        (np.true_divide, _TRUEDIV),
+        (np.floor_divide, _FLOORDIV),
     ]
     self._testBCastByFunc(funcs, xs, ys)
 
@@ -574,8 +589,8 @@ class BinaryOpTest(tf.test.TestCase):
     self._testBCastD([10, 3, 1, 2], [3, 1, 2])
 
   def testMismatchedDimensions(self):
-    for func in [tf.add, tf.sub, tf.mul, tf.div,
-                 _ADD, _SUB, _MUL, _DIV]:
+    for func in [tf.add, tf.sub, tf.mul, tf.div, _ADD, _SUB, _MUL, _TRUEDIV,
+                 _FLOORDIV]:
       with self.assertRaisesWithPredicateMatch(
           ValueError, lambda e: "Incompatible shapes" in e.message):
         func(tf.convert_to_tensor([10.0, 20.0, 30.0]),
@@ -959,10 +974,13 @@ class MathOpsOverloadTest(tf.test.TestCase):
         (np.add, _ADD),
         (np.subtract, _SUB),
         (np.multiply, _MUL),
-        (np.divide, _DIV)
+        (np.true_divide, _TRUEDIV),
+        (np.floor_divide, _FLOORDIV),
     ]
     for dtype in dtypes:
       for np_func, tf_func in funcs:
+        if dtype == tf.complex64 and tf_func == _FLOORDIV:
+          continue  # floordiv makes no sense for complex
         self._compareBinary(10, 5, dtype, np_func, tf_func)
     # Mod only works for int32 and int64.
     for dtype in [tf.int32, tf.int64]:
diff --git a/tensorflow/python/kernel_tests/decode_csv_op_test.py b/tensorflow/python/kernel_tests/decode_csv_op_test.py
index ae0917f8c4..2a7e2f6625 100644
--- a/tensorflow/python/kernel_tests/decode_csv_op_test.py
+++ b/tensorflow/python/kernel_tests/decode_csv_op_test.py
@@ -1,5 +1,9 @@
 """Tests for DecodeCSV op from parsing_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/decode_raw_op_test.py b/tensorflow/python/kernel_tests/decode_raw_op_test.py
index abd50a7527..2cee3b1484 100644
--- a/tensorflow/python/kernel_tests/decode_raw_op_test.py
+++ b/tensorflow/python/kernel_tests/decode_raw_op_test.py
@@ -1,5 +1,9 @@
 """Tests for DecodeRaw op from parsing_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/dense_update_ops_no_tsan_test.py b/tensorflow/python/kernel_tests/dense_update_ops_no_tsan_test.py
index ad0724931e..4c0caf14af 100644
--- a/tensorflow/python/kernel_tests/dense_update_ops_no_tsan_test.py
+++ b/tensorflow/python/kernel_tests/dense_update_ops_no_tsan_test.py
@@ -1,4 +1,8 @@
 """Tests for state updating ops that may have benign race conditions."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/dense_update_ops_test.py b/tensorflow/python/kernel_tests/dense_update_ops_test.py
index 2e1ea468c3..1051cd56f3 100644
--- a/tensorflow/python/kernel_tests/dense_update_ops_test.py
+++ b/tensorflow/python/kernel_tests/dense_update_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.tf.Assign*."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/determinant_op_test.py b/tensorflow/python/kernel_tests/determinant_op_test.py
index d4e2b88339..a478811af3 100644
--- a/tensorflow/python/kernel_tests/determinant_op_test.py
+++ b/tensorflow/python/kernel_tests/determinant_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.tf.MatrixDeterminant."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/diag_op_test.py b/tensorflow/python/kernel_tests/diag_op_test.py
index 7b53ee26fa..0fd87c7e97 100644
--- a/tensorflow/python/kernel_tests/diag_op_test.py
+++ b/tensorflow/python/kernel_tests/diag_op_test.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy
diff --git a/tensorflow/python/kernel_tests/division_future_test.py b/tensorflow/python/kernel_tests/division_future_test.py
new file mode 100644
index 0000000000..b9b3b13b68
--- /dev/null
+++ b/tensorflow/python/kernel_tests/division_future_test.py
@@ -0,0 +1,50 @@
+"""Tests for division with division imported from __future__.
+
+This file should be exactly the same as division_past_test.py except
+for the __future__ division line.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import tensorflow.python.platform
+
+import numpy as np
+import tensorflow as tf
+
+
+class DivisionTestCase(tf.test.TestCase):
+
+  def testDivision(self):
+    """Test all the different ways to divide."""
+    values = [1, 2, 7, 11]
+    functions = (lambda x: x), tf.constant
+    # TODO(irving): Test int8, int16 once we support casts for those.
+    dtypes = np.int32, np.int64, np.float32, np.float64
+
+    def check(x, y):
+      if isinstance(x, tf.Tensor):
+        x = x.eval()
+      if isinstance(y, tf.Tensor):
+        y = y.eval()
+      self.assertEqual(x.dtype, y.dtype)
+      self.assertEqual(x, y)
+    with self.test_session():
+      for dtype in dtypes:
+        for x in map(dtype, values):
+          for y in map(dtype, values):
+            for fx in functions:
+              for fy in functions:
+                tf_x = fx(x)
+                tf_y = fy(y)
+                div = x / y
+                tf_div = tf_x / tf_y
+                check(div, tf_div)
+                floordiv = x // y
+                tf_floordiv = tf_x // tf_y
+                check(floordiv, tf_floordiv)
+
+
+if __name__ == "__main__":
+  tf.test.main()
diff --git a/tensorflow/python/kernel_tests/division_past_test.py b/tensorflow/python/kernel_tests/division_past_test.py
new file mode 100644
index 0000000000..b65a724f7e
--- /dev/null
+++ b/tensorflow/python/kernel_tests/division_past_test.py
@@ -0,0 +1,50 @@
+"""Tests for division with division imported from __future__.
+
+This file should be exactly the same as division_past_test.py except
+for the __future__ division line.
+"""
+
+from __future__ import absolute_import
+# from __future__ import division  # Intentionally skip this import
+from __future__ import print_function
+
+import tensorflow.python.platform
+
+import numpy as np
+import tensorflow as tf
+
+
+class DivisionTestCase(tf.test.TestCase):
+
+  def testDivision(self):
+    """Test all the different ways to divide."""
+    values = [1, 2, 7, 11]
+    functions = (lambda x: x), tf.constant
+    # TODO(irving): Test int8, int16 once we support casts for those.
+    dtypes = np.int32, np.int64, np.float32, np.float64
+
+    def check(x, y):
+      if isinstance(x, tf.Tensor):
+        x = x.eval()
+      if isinstance(y, tf.Tensor):
+        y = y.eval()
+      self.assertEqual(x.dtype, y.dtype)
+      self.assertEqual(x, y)
+    with self.test_session():
+      for dtype in dtypes:
+        for x in map(dtype, values):
+          for y in map(dtype, values):
+            for fx in functions:
+              for fy in functions:
+                tf_x = fx(x)
+                tf_y = fy(y)
+                div = x / y
+                tf_div = tf_x / tf_y
+                check(div, tf_div)
+                floordiv = x // y
+                tf_floordiv = tf_x // tf_y
+                check(floordiv, tf_floordiv)
+
+
+if __name__ == "__main__":
+  tf.test.main()
diff --git a/tensorflow/python/kernel_tests/dynamic_partition_op_test.py b/tensorflow/python/kernel_tests/dynamic_partition_op_test.py
index a7a276893d..fdb82d5220 100644
--- a/tensorflow/python/kernel_tests/dynamic_partition_op_test.py
+++ b/tensorflow/python/kernel_tests/dynamic_partition_op_test.py
@@ -1,7 +1,12 @@
 """Tests for the DynamicPartition op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 
diff --git a/tensorflow/python/kernel_tests/dynamic_stitch_op_test.py b/tensorflow/python/kernel_tests/dynamic_stitch_op_test.py
index 9ac49390b9..9644b2100d 100644
--- a/tensorflow/python/kernel_tests/dynamic_stitch_op_test.py
+++ b/tensorflow/python/kernel_tests/dynamic_stitch_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.data_flow_ops.dynamic_stitch."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/edit_distance_op_test.py b/tensorflow/python/kernel_tests/edit_distance_op_test.py
index 5919adcfaf..b04720d070 100644
--- a/tensorflow/python/kernel_tests/edit_distance_op_test.py
+++ b/tensorflow/python/kernel_tests/edit_distance_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.kernels.edit_distance_op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/embedding_ops_test.py b/tensorflow/python/kernel_tests/embedding_ops_test.py
index 50755b6c46..03844d6177 100644
--- a/tensorflow/python/kernel_tests/embedding_ops_test.py
+++ b/tensorflow/python/kernel_tests/embedding_ops_test.py
@@ -1,10 +1,14 @@
 """Functional tests for ops used with embeddings."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import itertools
 
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 from tensorflow.python.kernel_tests import gradient_checker as gc
@@ -12,7 +16,7 @@ from tensorflow.python.kernel_tests import gradient_checker as gc
 
 def _AsLong(array):
   """Casts arrays elements to long type. Used to convert from numpy tf."""
-  return [long(x) for x in array]
+  return [int(x) for x in array]
 
 
 class ScatterAddSubTest(tf.test.TestCase):
@@ -104,7 +108,7 @@ def _EmbeddingParams(num_shards, vocab_size,
   feed_dict = {}
   if not shape: shape = [10]
   assert not vocab_size % num_shards
-  shape = [vocab_size / num_shards] + shape
+  shape = [vocab_size // num_shards] + shape
   for i in range(num_shards):
     param_name = _PName(i)
     constant_t = tf.constant(1.0, shape=shape, dtype=dtype,
@@ -130,8 +134,8 @@ def _EmbeddingResult(params, id_vals, num_shards, weight_vals=None):
       ids = [ids]
       wts = [wts]
     for i, wt_val in zip(ids, wts):
-      val = np.copy(params[_PName(i % num_shards) + ":0"]
-                    [i / num_shards, :]) * wt_val
+      val = np.copy(params[_PName(i % num_shards) + ":0"][
+          i // num_shards, :]) * wt_val
       if val_aggr is None:
         assert wt_aggr is None
         val_aggr = val
@@ -258,7 +262,7 @@ class EmbeddingLookupTest(tf.test.TestCase):
           self.assertAllEqual(simple, tf.gather(params, ids).eval())
           # Run a few random sharded versions
           for procs in 1, 2, 3:
-            stride = procs * tf.range(0, params.shape[0] / procs)
+            stride = procs * tf.range(0, params.shape[0] // procs)
             split_params = [tf.gather(params, stride + p)
                             for p in xrange(procs)]
             sharded = tf.nn.embedding_lookup(split_params, ids).eval()
diff --git a/tensorflow/python/kernel_tests/fifo_queue_test.py b/tensorflow/python/kernel_tests/fifo_queue_test.py
index 11b7d46318..fbbea309e1 100644
--- a/tensorflow/python/kernel_tests/fifo_queue_test.py
+++ b/tensorflow/python/kernel_tests/fifo_queue_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.data_flow_ops.FIFOQueue."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import random
 import re
 import time
@@ -6,6 +10,7 @@ import time
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 
@@ -448,7 +453,9 @@ class FIFOQueueTest(tf.test.TestCase):
           elements_enqueued += 1
         else:
           count = random.randint(0, min(20, 250 - elements_enqueued))
-          range_to_enqueue = range(elements_enqueued, elements_enqueued + count)
+          range_to_enqueue = np.arange(elements_enqueued,
+                                       elements_enqueued + count,
+                                       dtype=np.int32)
           enqueuemany_op.run({enqueuemany_placeholder: range_to_enqueue})
           elements_enqueued += count
 
@@ -459,7 +466,7 @@ class FIFOQueueTest(tf.test.TestCase):
   def testMixtureOfDequeueAndDequeueMany(self):
     with self.test_session() as sess:
       q = tf.FIFOQueue(10, tf.int32, shapes=())
-      enqueue_op = q.enqueue_many((range(250),))
+      enqueue_op = q.enqueue_many((np.arange(250, dtype=np.int32),))
       dequeued_t = q.dequeue()
       count_placeholder = tf.placeholder(tf.int32, shape=())
       dequeuemany_t = q.dequeue_many(count_placeholder)
@@ -477,7 +484,9 @@ class FIFOQueueTest(tf.test.TestCase):
           elements_dequeued += 1
         else:
           count = random.randint(0, min(20, 250 - elements_dequeued))
-          expected_range = range(elements_dequeued, elements_dequeued + count)
+          expected_range = np.arange(elements_dequeued,
+                                     elements_dequeued + count,
+                                     dtype=np.int32)
           self.assertAllEqual(
               expected_range, dequeuemany_t.eval({count_placeholder: count}))
           elements_dequeued += count
@@ -1045,7 +1054,7 @@ class FIFOQueueTest(tf.test.TestCase):
   def testBigDequeueMany(self):
     with self.test_session() as sess:
       q = tf.FIFOQueue(2, tf.int32, ((),))
-      elem = range(4)
+      elem = np.arange(4, dtype=np.int32)
       enq_list = [q.enqueue((e,)) for e in elem]
       deq = q.dequeue_many(4)
 
diff --git a/tensorflow/python/kernel_tests/gather_op_test.py b/tensorflow/python/kernel_tests/gather_op_test.py
index 39e97531d2..347b2d501e 100644
--- a/tensorflow/python/kernel_tests/gather_op_test.py
+++ b/tensorflow/python/kernel_tests/gather_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.tf.gather."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/gradient_checker.py b/tensorflow/python/kernel_tests/gradient_checker.py
index fe74768986..1adf22d512 100644
--- a/tensorflow/python/kernel_tests/gradient_checker.py
+++ b/tensorflow/python/kernel_tests/gradient_checker.py
@@ -3,6 +3,10 @@
 The gradient checker verifies numerically that an op/graph properly
 computes the gradients
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/gradient_checker_test.py b/tensorflow/python/kernel_tests/gradient_checker_test.py
index a844b7c637..f303141de9 100644
--- a/tensorflow/python/kernel_tests/gradient_checker_test.py
+++ b/tensorflow/python/kernel_tests/gradient_checker_test.py
@@ -1,4 +1,7 @@
 """Tests for tensorflow.kernels.gradient_checker."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow.python.platform
 
diff --git a/tensorflow/python/kernel_tests/identity_op_py_test.py b/tensorflow/python/kernel_tests/identity_op_py_test.py
index 2209cf08ad..c64b0be950 100644
--- a/tensorflow/python/kernel_tests/identity_op_py_test.py
+++ b/tensorflow/python/kernel_tests/identity_op_py_test.py
@@ -1,4 +1,8 @@
 """Tests for IdentityOp."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/in_topk_op_test.py b/tensorflow/python/kernel_tests/in_topk_op_test.py
index d2a51788c4..c27cfd34f8 100644
--- a/tensorflow/python/kernel_tests/in_topk_op_test.py
+++ b/tensorflow/python/kernel_tests/in_topk_op_test.py
@@ -1,4 +1,8 @@
 """Tests for PrecisionOp."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/init_ops_test.py b/tensorflow/python/kernel_tests/init_ops_test.py
index 4ce6081b7b..1b9f1323e8 100644
--- a/tensorflow/python/kernel_tests/init_ops_test.py
+++ b/tensorflow/python/kernel_tests/init_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/io_ops_test.py b/tensorflow/python/kernel_tests/io_ops_test.py
index 2eb8bdd26f..d1171102cd 100644
--- a/tensorflow/python/kernel_tests/io_ops_test.py
+++ b/tensorflow/python/kernel_tests/io_ops_test.py
@@ -1,6 +1,10 @@
 """Tests for tensorflow.python.ops.io_ops."""
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tempfile
 
 import tensorflow.python.platform
diff --git a/tensorflow/python/kernel_tests/linalg_grad_test.py b/tensorflow/python/kernel_tests/linalg_grad_test.py
index 50e5328c3e..2ec3ebe938 100644
--- a/tensorflow/python/kernel_tests/linalg_grad_test.py
+++ b/tensorflow/python/kernel_tests/linalg_grad_test.py
@@ -1,4 +1,7 @@
 """Tests for tensorflow.ops.linalg_grad."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow.python.platform
 
diff --git a/tensorflow/python/kernel_tests/listdiff_op_test.py b/tensorflow/python/kernel_tests/listdiff_op_test.py
index b4607be1fb..14d657c805 100644
--- a/tensorflow/python/kernel_tests/listdiff_op_test.py
+++ b/tensorflow/python/kernel_tests/listdiff_op_test.py
@@ -1,8 +1,13 @@
 """Tests for tensorflow.kernels.listdiff_op."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 
@@ -69,9 +74,7 @@ class ListDiffTest(tf.test.TestCase):
       y = np.random.randint(int_low, int_high, size=y_size)
       out_idx = [(entry, pos) for pos, entry in enumerate(x) if entry not in y]
       if out_idx:
-        out_idx = map(list, zip(*out_idx))
-        out = out_idx[0]
-        idx = out_idx[1]
+        out, idx = map(list, zip(*out_idx))
       else:
         out = []
         idx = []
@@ -89,7 +92,7 @@ class ListDiffTest(tf.test.TestCase):
     x = [1, 2, 3, 4]
     y = [5, 6]
     out = x
-    idx = range(len(x))
+    idx = np.arange(len(x))
     self._testListDiff(x, y, out, idx)
 
   def testInt32EmptyX(self):
@@ -103,7 +106,7 @@ class ListDiffTest(tf.test.TestCase):
     x = [1, 2, 3, 4]
     y = []
     out = x
-    idx = range(len(x))
+    idx = np.arange(len(x))
     self._testListDiff(x, y, out, idx)
 
   def testInt32EmptyXY(self):
diff --git a/tensorflow/python/kernel_tests/logging_ops_test.py b/tensorflow/python/kernel_tests/logging_ops_test.py
index 50e7422878..e9c461d535 100644
--- a/tensorflow/python/kernel_tests/logging_ops_test.py
+++ b/tensorflow/python/kernel_tests/logging_ops_test.py
@@ -1,5 +1,9 @@
 """Tests for tensorflow.kernels.logging_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/lookup_table_op_test.py b/tensorflow/python/kernel_tests/lookup_table_op_test.py
index a6b91560f1..7b5942cacd 100644
--- a/tensorflow/python/kernel_tests/lookup_table_op_test.py
+++ b/tensorflow/python/kernel_tests/lookup_table_op_test.py
@@ -1,4 +1,8 @@
 """Tests for lookup table ops from tf."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/lrn_op_test.py b/tensorflow/python/kernel_tests/lrn_op_test.py
index 85ef65b653..22da927467 100644
--- a/tensorflow/python/kernel_tests/lrn_op_test.py
+++ b/tensorflow/python/kernel_tests/lrn_op_test.py
@@ -1,5 +1,8 @@
 """Tests for local response normalization."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import copy
 
 import tensorflow.python.platform
diff --git a/tensorflow/python/kernel_tests/matmul_op_test.py b/tensorflow/python/kernel_tests/matmul_op_test.py
index c38a2a91f1..561ab300ef 100644
--- a/tensorflow/python/kernel_tests/matmul_op_test.py
+++ b/tensorflow/python/kernel_tests/matmul_op_test.py
@@ -1,5 +1,8 @@
 """Tests for tensorflow.ops.math_ops.matmul."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/matrix_inverse_op_test.py b/tensorflow/python/kernel_tests/matrix_inverse_op_test.py
index 541a937185..8c1cda5e15 100644
--- a/tensorflow/python/kernel_tests/matrix_inverse_op_test.py
+++ b/tensorflow/python/kernel_tests/matrix_inverse_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.math_ops.matrix_inverse."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/numerics_test.py b/tensorflow/python/kernel_tests/numerics_test.py
index 8cb2fe2f8b..f071eeaeda 100644
--- a/tensorflow/python/kernel_tests/numerics_test.py
+++ b/tensorflow/python/kernel_tests/numerics_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.numerics."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/pack_op_test.py b/tensorflow/python/kernel_tests/pack_op_test.py
index 5f3b1823c0..14359b28c6 100644
--- a/tensorflow/python/kernel_tests/pack_op_test.py
+++ b/tensorflow/python/kernel_tests/pack_op_test.py
@@ -1,4 +1,8 @@
 """Functional tests for Pack Op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/pad_op_test.py b/tensorflow/python/kernel_tests/pad_op_test.py
index cb939a3a9e..95123cf84f 100644
--- a/tensorflow/python/kernel_tests/pad_op_test.py
+++ b/tensorflow/python/kernel_tests/pad_op_test.py
@@ -1,5 +1,9 @@
 """Tests for tensorflow.ops.nn_ops.Pad."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/parsing_ops_test.py b/tensorflow/python/kernel_tests/parsing_ops_test.py
index 529ad81e16..0398037f41 100644
--- a/tensorflow/python/kernel_tests/parsing_ops_test.py
+++ b/tensorflow/python/kernel_tests/parsing_ops_test.py
@@ -1,5 +1,9 @@
 """Tests for tensorflow.ops.parsing_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import itertools
 
 import tensorflow.python.platform
@@ -33,7 +37,7 @@ def _compare_output_to_expected(
   tester.assertEqual(set(dict_tensors.keys()), set(expected_tensors.keys()))
 
   i = 0  # Index into the flattened output of session.run()
-  for k, v in dict_tensors.iteritems():
+  for k, v in dict_tensors.items():
     expected_v = expected_tensors[k]
     tf.logging.info("Comparing key: %s", k)
     if isinstance(v, tf.SparseTensor):
diff --git a/tensorflow/python/kernel_tests/pooling_ops_test.py b/tensorflow/python/kernel_tests/pooling_ops_test.py
index 5a35fd17fc..45779c1661 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_test.py
@@ -1,5 +1,8 @@
 """Functional tests for pooling operations."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/random_ops_test.py b/tensorflow/python/kernel_tests/random_ops_test.py
index aa107a22de..2ba4dac3a1 100644
--- a/tensorflow/python/kernel_tests/random_ops_test.py
+++ b/tensorflow/python/kernel_tests/random_ops_test.py
@@ -1,9 +1,12 @@
 """Tests for tensorflow.ops.random_ops."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 
diff --git a/tensorflow/python/kernel_tests/random_shuffle_queue_test.py b/tensorflow/python/kernel_tests/random_shuffle_queue_test.py
index 343ffdcb76..9078dce6ca 100644
--- a/tensorflow/python/kernel_tests/random_shuffle_queue_test.py
+++ b/tensorflow/python/kernel_tests/random_shuffle_queue_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.data_flow_ops.Queue."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import random
 import re
 import time
@@ -6,6 +10,7 @@ import time
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 
@@ -264,7 +269,7 @@ class RandomShuffleQueueTest(tf.test.TestCase):
       for _ in range(8):
         float_val, int_val = sess.run(dequeued_t)
         results.append((float_val, [int_val[0], int_val[1]]))
-      expected = zip(float_elems, int_elems) + zip(float_elems, int_elems)
+      expected = list(zip(float_elems, int_elems)) * 2
       self.assertItemsEqual(expected, results)
 
   def testDequeueMany(self):
@@ -1028,7 +1033,7 @@ class RandomShuffleQueueTest(tf.test.TestCase):
   def testBigDequeueMany(self):
     with self.test_session() as sess:
       q = tf.RandomShuffleQueue(2, 0, tf.int32, ((),))
-      elem = range(4)
+      elem = np.arange(4, dtype=np.int32)
       enq_list = [q.enqueue((e,)) for e in elem]
       deq = q.dequeue_many(4)
 
diff --git a/tensorflow/python/kernel_tests/reader_ops_test.py b/tensorflow/python/kernel_tests/reader_ops_test.py
index 484e3eca43..a92640fdf9 100644
--- a/tensorflow/python/kernel_tests/reader_ops_test.py
+++ b/tensorflow/python/kernel_tests/reader_ops_test.py
@@ -1,5 +1,9 @@
 """Tests for Reader ops from io_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import os
 import tensorflow.python.platform
 
diff --git a/tensorflow/python/kernel_tests/reduction_ops_test.py b/tensorflow/python/kernel_tests/reduction_ops_test.py
index e5cab62c09..c3b7d7a70d 100644
--- a/tensorflow/python/kernel_tests/reduction_ops_test.py
+++ b/tensorflow/python/kernel_tests/reduction_ops_test.py
@@ -1,4 +1,8 @@
 """Functional tests for reduction ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/relu_op_test.py b/tensorflow/python/kernel_tests/relu_op_test.py
index be79dd40ac..c3f69ee323 100644
--- a/tensorflow/python/kernel_tests/relu_op_test.py
+++ b/tensorflow/python/kernel_tests/relu_op_test.py
@@ -1,5 +1,8 @@
 """Tests for Relu and ReluGrad."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/reshape_op_test.py b/tensorflow/python/kernel_tests/reshape_op_test.py
index 3c91db1221..ef7b8a60ee 100644
--- a/tensorflow/python/kernel_tests/reshape_op_test.py
+++ b/tensorflow/python/kernel_tests/reshape_op_test.py
@@ -1,5 +1,8 @@
 """Tests for tensorflow.ops.reshape_op."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/reverse_sequence_op_test.py b/tensorflow/python/kernel_tests/reverse_sequence_op_test.py
index e7d8e70ae8..bc1f06317b 100644
--- a/tensorflow/python/kernel_tests/reverse_sequence_op_test.py
+++ b/tensorflow/python/kernel_tests/reverse_sequence_op_test.py
@@ -1,5 +1,8 @@
 """Tests for tensorflow.ops.reverse_sequence_op."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/save_restore_ops_test.py b/tensorflow/python/kernel_tests/save_restore_ops_test.py
index d59d76c58f..ed666e9592 100644
--- a/tensorflow/python/kernel_tests/save_restore_ops_test.py
+++ b/tensorflow/python/kernel_tests/save_restore_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.io_ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/scatter_ops_test.py b/tensorflow/python/kernel_tests/scatter_ops_test.py
index dd645819a3..cb2211d6a5 100644
--- a/tensorflow/python/kernel_tests/scatter_ops_test.py
+++ b/tensorflow/python/kernel_tests/scatter_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.tf.scatter."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/segment_reduction_ops_test.py b/tensorflow/python/kernel_tests/segment_reduction_ops_test.py
index 558ce06285..df84519337 100644
--- a/tensorflow/python/kernel_tests/segment_reduction_ops_test.py
+++ b/tensorflow/python/kernel_tests/segment_reduction_ops_test.py
@@ -1,4 +1,8 @@
 """Functional tests for segment reduction ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
@@ -13,9 +17,8 @@ class SegmentReductionHelper(tf.test.TestCase):
     num_elem = 1
     for x in input_shape:
       num_elem *= x
-    values = range(1, num_elem + 1)
-    np_values = np.array(values).reshape(input_shape).astype(
-        dtype.as_numpy_dtype)
+    values = np.arange(1, num_elem + 1)
+    np_values = values.reshape(input_shape).astype(dtype.as_numpy_dtype)
     return tf.constant(values, shape=input_shape,
                                 dtype=dtype), np_values
 
@@ -68,7 +71,7 @@ class SegmentReductionOpTest(SegmentReductionHelper):
 
     n = 10
     shape = [n, 2]
-    indices = [int(i / 3) for i in range(n)]
+    indices = [i // 3 for i in range(n)]
     for dtype in dtypes:
       with self.test_session(use_gpu=False):
         tf_x, np_x = self._input(shape, dtype=dtype)
diff --git a/tensorflow/python/kernel_tests/shape_ops_test.py b/tensorflow/python/kernel_tests/shape_ops_test.py
index ad5425e6b5..89658ce851 100644
--- a/tensorflow/python/kernel_tests/shape_ops_test.py
+++ b/tensorflow/python/kernel_tests/shape_ops_test.py
@@ -1,5 +1,8 @@
 """Tests for various tensorflow.ops.tf."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
@@ -229,7 +232,7 @@ class TileTest(tf.test.TestCase):
         "int64": (tf.int64, int),
         "string": (tf.string, str)
     }
-    for dtype_np, v in types_to_test.iteritems():
+    for dtype_np, v in types_to_test.items():
       with self.test_session():
         dtype_tf = v[0]
         cast = v[1]
diff --git a/tensorflow/python/kernel_tests/slice_op_test.py b/tensorflow/python/kernel_tests/slice_op_test.py
index 62d7e31dfc..d61e6984df 100644
--- a/tensorflow/python/kernel_tests/slice_op_test.py
+++ b/tensorflow/python/kernel_tests/slice_op_test.py
@@ -1,7 +1,12 @@
 """Functional tests for slice op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 
diff --git a/tensorflow/python/kernel_tests/softmax_op_test.py b/tensorflow/python/kernel_tests/softmax_op_test.py
index fd25970093..6cd2cec2e0 100644
--- a/tensorflow/python/kernel_tests/softmax_op_test.py
+++ b/tensorflow/python/kernel_tests/softmax_op_test.py
@@ -1,4 +1,8 @@
 """Tests for SoftmaxOp."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/softplus_op_test.py b/tensorflow/python/kernel_tests/softplus_op_test.py
index 216362340c..da8a2b918b 100644
--- a/tensorflow/python/kernel_tests/softplus_op_test.py
+++ b/tensorflow/python/kernel_tests/softplus_op_test.py
@@ -1,5 +1,8 @@
 """Tests for Softplus and SoftplusGrad."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/sparse_concat_op_test.py b/tensorflow/python/kernel_tests/sparse_concat_op_test.py
index 0f5650b89c..4d5ad7d674 100644
--- a/tensorflow/python/kernel_tests/sparse_concat_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_concat_op_test.py
@@ -1,5 +1,9 @@
 """Tests for SparseConcat."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/sparse_matmul_op_test.py b/tensorflow/python/kernel_tests/sparse_matmul_op_test.py
index 4529be21fc..ff442dfc53 100644
--- a/tensorflow/python/kernel_tests/sparse_matmul_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_matmul_op_test.py
@@ -1,4 +1,6 @@
 """Tests for tensorflow.ops.tf.matmul."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
 import tensorflow.python.platform
diff --git a/tensorflow/python/kernel_tests/sparse_reorder_op_test.py b/tensorflow/python/kernel_tests/sparse_reorder_op_test.py
index c3bcc25311..277cd35de7 100644
--- a/tensorflow/python/kernel_tests/sparse_reorder_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_reorder_op_test.py
@@ -1,5 +1,9 @@
 """Tests for SparseReorder."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/sparse_to_dense_op_py_test.py b/tensorflow/python/kernel_tests/sparse_to_dense_op_py_test.py
index 2bab89923e..315defe0b7 100644
--- a/tensorflow/python/kernel_tests/sparse_to_dense_op_py_test.py
+++ b/tensorflow/python/kernel_tests/sparse_to_dense_op_py_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.kernels.sparse_op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/sparsemask_op_test.py b/tensorflow/python/kernel_tests/sparsemask_op_test.py
index ffde8f7944..8fa4c1ea8c 100644
--- a/tensorflow/python/kernel_tests/sparsemask_op_test.py
+++ b/tensorflow/python/kernel_tests/sparsemask_op_test.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/split_op_test.py b/tensorflow/python/kernel_tests/split_op_test.py
index 19906aa02b..aaa4fdaa55 100644
--- a/tensorflow/python/kernel_tests/split_op_test.py
+++ b/tensorflow/python/kernel_tests/split_op_test.py
@@ -1,4 +1,8 @@
 """Functional tests for Split Op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
@@ -79,7 +83,7 @@ class SplitOpTest(tf.test.TestCase):
       result = sess.run(tf.split(split_dim, num_split, inp))
     slices = [slice(0, x) for x in shape]
     offset = 0
-    length = shape[split_dim] / num_split
+    length = shape[split_dim] // num_split
     for i in range(num_split):
       slices[split_dim] = slice(offset, offset + length)
       offset += length
diff --git a/tensorflow/python/kernel_tests/string_to_hash_bucket_op_test.py b/tensorflow/python/kernel_tests/string_to_hash_bucket_op_test.py
index 8615b271b8..1804b3aeae 100644
--- a/tensorflow/python/kernel_tests/string_to_hash_bucket_op_test.py
+++ b/tensorflow/python/kernel_tests/string_to_hash_bucket_op_test.py
@@ -1,4 +1,8 @@
 """Tests for StringToHashBucket op from string_ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/string_to_number_op_test.py b/tensorflow/python/kernel_tests/string_to_number_op_test.py
index 39505e18ba..2358975549 100644
--- a/tensorflow/python/kernel_tests/string_to_number_op_test.py
+++ b/tensorflow/python/kernel_tests/string_to_number_op_test.py
@@ -1,5 +1,9 @@
 """Tests for StringToNumber op from parsing_ops."""
 
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/summary_image_op_test.py b/tensorflow/python/kernel_tests/summary_image_op_test.py
index dfdb2c8938..d51681b8e8 100644
--- a/tensorflow/python/kernel_tests/summary_image_op_test.py
+++ b/tensorflow/python/kernel_tests/summary_image_op_test.py
@@ -1,7 +1,12 @@
 """Tests for summary image op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 from tensorflow.python.ops import image_ops
@@ -32,7 +37,7 @@ class SummaryImageOpTest(tf.test.TestCase):
             scale = 127 / np.abs(const.reshape(4, -1)).max(axis=1)
             offset = 128
           adjusted = np.floor(scale[:, None, None, None] * const + offset)
-          const[0, 1, 2, depth / 2] = np.nan
+          const[0, 1, 2, depth // 2] = np.nan
 
           # Summarize
           summ = tf.image_summary("img", const)
diff --git a/tensorflow/python/kernel_tests/summary_ops_test.py b/tensorflow/python/kernel_tests/summary_ops_test.py
index 13e5021ccc..9a59c26787 100644
--- a/tensorflow/python/kernel_tests/summary_ops_test.py
+++ b/tensorflow/python/kernel_tests/summary_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for summary ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/topk_op_test.py b/tensorflow/python/kernel_tests/topk_op_test.py
index 497dc9ac1e..6675de31b1 100644
--- a/tensorflow/python/kernel_tests/topk_op_test.py
+++ b/tensorflow/python/kernel_tests/topk_op_test.py
@@ -1,4 +1,8 @@
 """Tests for TopK op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/transpose_op_test.py b/tensorflow/python/kernel_tests/transpose_op_test.py
index 2786eaf37b..e424a4faed 100644
--- a/tensorflow/python/kernel_tests/transpose_op_test.py
+++ b/tensorflow/python/kernel_tests/transpose_op_test.py
@@ -1,4 +1,8 @@
 """Functional tests for Transpose op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import itertools
 import tensorflow.python.platform
 
diff --git a/tensorflow/python/kernel_tests/unique_op_test.py b/tensorflow/python/kernel_tests/unique_op_test.py
index 4d6543a206..3585152b06 100644
--- a/tensorflow/python/kernel_tests/unique_op_test.py
+++ b/tensorflow/python/kernel_tests/unique_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.kernels.unique_op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/unpack_op_test.py b/tensorflow/python/kernel_tests/unpack_op_test.py
index 4929af035f..7f5ed77a0d 100644
--- a/tensorflow/python/kernel_tests/unpack_op_test.py
+++ b/tensorflow/python/kernel_tests/unpack_op_test.py
@@ -1,7 +1,12 @@
 """Functional tests for Unpack Op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
+from six.moves import xrange  # pylint: disable=redefined-builtin
 import tensorflow as tf
 
 from tensorflow.python.kernel_tests import gradient_checker
diff --git a/tensorflow/python/kernel_tests/variable_ops_test.py b/tensorflow/python/kernel_tests/variable_ops_test.py
index 6185b2256e..e4c9849729 100644
--- a/tensorflow/python/kernel_tests/variable_ops_test.py
+++ b/tensorflow/python/kernel_tests/variable_ops_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.tf.variable_op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/variable_scope_test.py b/tensorflow/python/kernel_tests/variable_scope_test.py
index bb538198ea..f3521d41af 100644
--- a/tensorflow/python/kernel_tests/variable_scope_test.py
+++ b/tensorflow/python/kernel_tests/variable_scope_test.py
@@ -1,4 +1,8 @@
 """Tests for variable store."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import tensorflow as tf
diff --git a/tensorflow/python/kernel_tests/variables_test.py b/tensorflow/python/kernel_tests/variables_test.py
index f2a7ea0af8..0b17ffa82d 100644
--- a/tensorflow/python/kernel_tests/variables_test.py
+++ b/tensorflow/python/kernel_tests/variables_test.py
@@ -1,4 +1,8 @@
 """Tests for tf.py."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import operator
 
 import tensorflow.python.platform
diff --git a/tensorflow/python/kernel_tests/where_op_test.py b/tensorflow/python/kernel_tests/where_op_test.py
index 263f98f622..ebb0a6d881 100644
--- a/tensorflow/python/kernel_tests/where_op_test.py
+++ b/tensorflow/python/kernel_tests/where_op_test.py
@@ -1,4 +1,8 @@
 """Tests for tensorflow.ops.reverse_sequence_op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np
diff --git a/tensorflow/python/kernel_tests/xent_op_test.py b/tensorflow/python/kernel_tests/xent_op_test.py
index c6ecaff799..7d1c2d5a22 100644
--- a/tensorflow/python/kernel_tests/xent_op_test.py
+++ b/tensorflow/python/kernel_tests/xent_op_test.py
@@ -1,5 +1,8 @@
 """Tests for SoftmaxCrossEntropyWithLogits op."""
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import tensorflow.python.platform
 
 import numpy as np