Merge branch 'master' into patch-2

object_detection/core/data_decoder.py

@@ -26,9 +26,8 @@ class DataDecoder(object):
   """Interface for data decoders."""
   __metaclass__ = ABCMeta
 
-  # TODO: snake_case this method.
   @abstractmethod
-  def Decode(self, data):
+  def decode(self, data):
     """Return a single image and associated labels.
 
     Args:

object_detection/core/post_processing.py

@@ -131,7 +131,7 @@ def multiclass_non_max_suppression(boxes,
         boxlist_and_class_scores.add_field(fields.BoxListFields.masks,
                                            per_class_masks)
       if additional_fields is not None:
-        for key, tensor in additional_fields.iteritems():
+        for key, tensor in additional_fields.items():
           boxlist_and_class_scores.add_field(key, tensor)
       boxlist_filtered = box_list_ops.filter_greater_than(
           boxlist_and_class_scores, score_thresh)

object_detection/core/prefetcher.py

@@ -45,7 +45,7 @@ def prefetch(tensor_dict, capacity):
   Returns:
     a FIFO prefetcher queue
   """
-  names = tensor_dict.keys()
+  names = list(tensor_dict.keys())
   dtypes = [t.dtype for t in tensor_dict.values()]
   shapes = [t.get_shape() for t in tensor_dict.values()]
   prefetch_queue = tf.PaddingFIFOQueue(capacity, dtypes=dtypes,

object_detection/core/preprocessor.py

@@ -341,7 +341,6 @@ def random_pixel_value_scale(image, minval=0.9, maxval=1.1, seed=None):
 
   Returns:
     image: image which is the same shape as input image.
-    boxes: boxes which is the same shape as input boxes.
   """
   with tf.name_scope('RandomPixelValueScale', values=[image]):
     color_coef = tf.random_uniform(

object_detection/samples/configs/faster_rcnn_inception_resnet_v2_atrous_pets.config

 # Faster R-CNN with Inception Resnet v2, Atrous version;
-# Configured for Oxford-IIT Pets Dataset.
+# Configured for Oxford-IIIT Pets Dataset.
 # Users should configure the fine_tune_checkpoint field in the train config as
 # well as the label_map_path and input_path fields in the train_input_reader and
 # eval_input_reader. Search for "PATH_TO_BE_CONFIGURED" to find the fields that