Skip to content

Commit 7b0a3d0

Browse files
varshaantfx-copybara
authored andcommitted
Fixes to version parsing in tests.
PiperOrigin-RevId: 439402049
1 parent f07a117 commit 7b0a3d0

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

examples/census_example_v2_test.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import os
1717
import shutil
18+
from packaging import version
1819

1920
import tensorflow.compat.v2 as tf
2021
import census_example_common
@@ -100,8 +101,8 @@ class CensusExampleV2Test(tft_test_case.TransformTestCase):
100101

101102
def setUp(self):
102103
super().setUp()
103-
if (not tf2.enabled() or
104-
tft_test_case.is_external_environment() and tf.version.VERSION < '2.3'):
104+
if (not tf2.enabled() or tft_test_case.is_external_environment() and
105+
version.parse(tf.version.VERSION) < version.parse('2.3')):
105106
raise tft_test_case.SkipTest('This test requires TF version >= 2.3')
106107

107108
def _get_data_dir(self):
@@ -113,7 +114,7 @@ def _get_working_dir(self):
113114
self._testMethodName)
114115

115116
def _should_saved_model_load_work(self):
116-
return tf.__version__ >= '2.2'
117+
return version.parse(tf.__version__) >= version.parse('2.2')
117118

118119
@tft_test_case.named_parameters([
119120
dict(

tensorflow_transform/impl_helper_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import os
1818

1919
import numpy as np
20+
from packaging import version
2021
import pyarrow as pa
2122
import tensorflow as tf
2223
from tensorflow_transform import analyzers
@@ -659,7 +660,7 @@ def test_batched_placeholders_from_feature_spec(self):
659660
[None, None])
660661
self.assertEqual(type(features['sparse_1d']), tf.SparseTensor)
661662
self.assertEqual(type(features['sparse_2d']), tf.SparseTensor)
662-
if tf.__version__ >= '2':
663+
if version.parse(tf.__version__) >= version.parse('2'):
663664
self.assertEqual(features['sparse_1d'].get_shape().as_list(), [None, 7])
664665
self.assertEqual(features['sparse_2d'].get_shape().as_list(),
665666
[None, 2, 17])

tensorflow_transform/tf_utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import enum
1818
from typing import Callable, Optional, Tuple, Union
1919

20+
from packaging import version
2021
import tensorflow as tf
2122
from tensorflow_transform import annotators
2223
from tensorflow_transform import common_types
@@ -543,7 +544,7 @@ def is_vocabulary_tfrecord_supported() -> bool:
543544
return False
544545
return ((hasattr(tf.data.experimental, 'DatasetInitializer') or
545546
hasattr(tf.lookup.experimental, 'DatasetInitializer')) and
546-
tf.version.VERSION >= '2.4')
547+
version.parse(tf.version.VERSION) >= version.parse('2.4'))
547548

548549

549550
# Used to decide which bucket boundary index to assign to a value.

tensorflow_transform/tf_utils_test.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import os
1717

1818
import numpy as np
19+
from packaging import version
1920
import tensorflow as tf
2021
from tensorflow_transform import analyzers
2122
from tensorflow_transform import annotators
@@ -1583,9 +1584,10 @@ def _reduce_batch_count_mean_and_var_per_key(x, key):
15831584
x=[[np.nan, np.nan, np.nan]],
15841585
# Output of `tf.reduce_max` if all inputs are NaNs for older
15851586
# versions of TF is -inf.
1586-
expected_x_minus_min=(-np.inf
1587-
if tf.__version__ < '2.4' else np.nan),
1588-
expected_x_max=-np.inf if tf.__version__ < '2.4' else np.nan,
1587+
expected_x_minus_min=(-np.inf if version.parse(tf.__version__) <
1588+
version.parse('2.4') else np.nan),
1589+
expected_x_max=(-np.inf if version.parse(tf.__version__) <
1590+
version.parse('2.4') else np.nan),
15891591
reduce_instance_dims=True,
15901592
input_signature=[tf.TensorSpec([None, None], tf.float32)]),
15911593
dict(

0 commit comments

Comments
 (0)