Merge remote-tracking branch 'upstream/master' into fasterrcnn_fpn_keras_feature_extractor

research/object_detection/builders/input_reader_builder_test.py → research/object_detection/builders/input_reader_builder_tf1_test.py

@@ -16,6 +16,7 @@
 """Tests for input_reader_builder."""
 
 import os
+import unittest
 import numpy as np
 import tensorflow.compat.v1 as tf
 
@@ -26,6 +27,7 @@ from object_detection.core import standard_fields as fields
 from object_detection.dataset_tools import seq_example_util
 from object_detection.protos import input_reader_pb2
 from object_detection.utils import dataset_util
+from object_detection.utils import tf_version
 
 
 def _get_labelmap_path():
@@ -35,6 +37,7 @@ def _get_labelmap_path():
                       'pet_label_map.pbtxt')
 
 
+@unittest.skipIf(tf_version.is_tf2(), 'Skipping TF1.X only test.')
 class InputReaderBuilderTest(tf.test.TestCase):
 
   def create_tf_record(self):