Internal change

PiperOrigin-RevId: 299205720

Author: mn-robot

examples/slim/BUILD

@@ -1,6 +1,8 @@
 # Description:
 #   Contains files for loading, training and evaluating TF-Slim-based models.
 
+load("//devtools/python/blaze:python3.bzl", "py2and3_test")
+
 package(
     default_visibility = ["//visibility:public"],
 )
@@ -706,16 +708,16 @@ py_library(
     ],
 )
 
-py_test(
+py2and3_test(
     name = "resnet_v1_test",
     size = "medium",
     srcs = ["nets/resnet_v1_test.py"],
-    python_version = "PY2",
     shard_count = 2,
     srcs_version = "PY2AND3",
     deps = [
         ":resnet_utils",
         ":resnet_v1",
+        "//third_party/py/six",
         # "//numpy",
         # "//tensorflow",
     ],

examples/slim/nets/resnet_v1_test.py

@@ -18,11 +18,12 @@
 from __future__ import division
 from __future__ import print_function
 
-import numpy as np
-import tensorflow as tf
-
 from nets import resnet_utils
 from nets import resnet_v1
+import numpy as np
+from six.moves import range
+from six.moves import zip
+import tensorflow as tf
 
 slim = tf.contrib.slim
 
@@ -185,7 +186,7 @@ def testEndPointsV1(self):
         'tiny/block2/unit_2/bottleneck_v1/conv1',
         'tiny/block2/unit_2/bottleneck_v1/conv2',
         'tiny/block2/unit_2/bottleneck_v1/conv3']
-    self.assertItemsEqual(expected, end_points.keys())
+    self.assertItemsEqual(expected, list(end_points.keys()))
 
   def _stack_blocks_nondense(self, net, blocks):
     """A simplified ResNet Block stacker without output stride control."""
@@ -392,7 +393,7 @@ def testEndpointNames(self):
       expected.append('resnet/block%d' % block)
     expected.extend(['global_pool', 'resnet/logits', 'resnet/spatial_squeeze',
                      'predictions'])
-    self.assertItemsEqual(end_points.keys(), expected)
+    self.assertItemsEqual(list(end_points.keys()), expected)
 
   def testClassificationShapes(self):
     global_pool = True