Merge pull request #39525 from tensorflow/mm-fix-major-api-version

Fix tests when `tf._major_api_version` does not exist
This commit is contained in:
Mihai Maruseac 2020-05-14 02:17:30 +00:00 committed by GitHub
commit 3ffdb91f12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -74,20 +74,22 @@ class ModuleTest(test.TestCase):
tf.summary.image
# If we use v2 API, check for create_file_writer,
# otherwise check for FileWriter.
if hasattr(tf, '_major_api_version') and tf._major_api_version == 2:
tf.summary.create_file_writer
else:
tf.summary.FileWriter
if hasattr(tf, '_major_api_version'):
if tf._major_api_version == 2:
tf.summary.create_file_writer
else:
tf.summary.FileWriter
# pylint: enable=pointless-statement
def testInternalKerasImport(self):
normalization_parent = layers.BatchNormalization.__module__.split('.')[-1]
if tf._major_api_version == 2:
self.assertEqual('normalization_v2', normalization_parent)
self.assertTrue(layers.BatchNormalization._USE_V2_BEHAVIOR)
else:
self.assertEqual('normalization', normalization_parent)
self.assertFalse(layers.BatchNormalization._USE_V2_BEHAVIOR)
if hasattr(tf, '_major_api_version'):
if tf._major_api_version == 2:
self.assertEqual('normalization_v2', normalization_parent)
self.assertTrue(layers.BatchNormalization._USE_V2_BEHAVIOR)
else:
self.assertEqual('normalization', normalization_parent)
self.assertFalse(layers.BatchNormalization._USE_V2_BEHAVIOR)
if __name__ == '__main__':