Skip to content

Commit 3943431

Browse files
tf-transform-teamtfx-copybara
authored andcommitted
Fix TensorFlow checkpoint and trackable imports.
PiperOrigin-RevId: 457415636
1 parent 55d1c8b commit 3943431

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

tensorflow_transform/annotators.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@
2727
# pylint: disable=g-direct-tensorflow-import
2828
from tensorflow.python.framework import func_graph
2929
from tensorflow.python.framework import ops
30-
from tensorflow.python.training.tracking import base
31-
# pylint: enable=g-direct-tensorflow-import
30+
# pylint: disable=g-import-not-at-top
31+
try:
32+
# Moved in TensorFlow 2.10.
33+
from tensorflow.python.trackable import base
34+
except ImportError:
35+
from tensorflow.python.training.tracking import base
36+
# pylint: enable=g-direct-tensorflow-import, g-import-not-at-top
3237

3338
__all__ = ['annotate_asset', 'make_and_track_object']
3439

tensorflow_transform/annotators_test.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@
1717
from tensorflow_transform import annotators
1818
from tensorflow_transform import test_case
1919

20-
from tensorflow.python.training.tracking import base # pylint: disable=g-direct-tensorflow-import
20+
# pylint: disable=g-direct-tensorflow-import, g-import-not-at-top
21+
try:
22+
# Moved in TensorFlow 2.10.
23+
from tensorflow.python.trackable import base
24+
except ImportError:
25+
from tensorflow.python.training.tracking import base
26+
# pylint: enable=g-direct-tensorflow-import, g-import-not-at-top
2127

2228

2329
class AnnotatorsTest(test_case.TransformTestCase):

tensorflow_transform/saved/saved_transform_io_v2.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,16 @@
3030
from tensorflow.python.eager import wrap_function
3131
from tensorflow.python.framework import composite_tensor
3232
from tensorflow.python.ops import lookup_ops
33-
from tensorflow.python.training.tracking import tracking
3433
from tensorflow.python.util import object_identity
35-
# pylint: enable=g-direct-tensorflow-import
34+
35+
# pylint: disable=g-import-not-at-top
36+
try:
37+
# Moved in TensorFlow 2.10.
38+
from tensorflow.python.trackable import resource as tracking
39+
except ImportError:
40+
from tensorflow.python.training.tracking import tracking
41+
42+
# pylint: enable=g-direct-tensorflow-import, g-import-not-at-top
3643

3744

3845
def _restore_from_v1_saved_model(

0 commit comments

Comments
 (0)