diff options
| author |  Allen Lavoie <allenl@google.com> | 2018-05-16 13:52:54 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-05-16 13:55:34 -0700 |
| commit | da600975c13b00e5bc5fa64bb358bddb21baea2d (patch) | |
| tree | ff16cc0c49a2210a53bb82d2ff46ba9bb24ce7b6 /tensorflow/contrib/optimizer_v2 | |
| parent | 41af9782f4b0ffc19aad4bfc9652c4e910152459 (diff) | |
Checkpointable: move python/training/checkpointable_* to python/training/checkpointable/
Need to add some new checkpointable files in core (specifically I had some checkpointable data structures in mind), and prefixing more files with "checkpointable_" in python/training/ seems dirty.
No functional changes, just some branching and build/import fiddling.
PiperOrigin-RevId: 196883136
Diffstat (limited to 'tensorflow/contrib/optimizer_v2')
| -rw-r--r-- | tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py | 4 | ||||
| -rw-r--r-- | tensorflow/contrib/optimizer_v2/optimizer_v2.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py b/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py index 20316ec0e3..548b494bf1 100644 --- a/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py +++ b/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py @@ -41,10 +41,10 @@ from tensorflow.python.ops import resource_variable_ops from tensorflow.python.ops import state_ops from tensorflow.python.ops import template from tensorflow.python.ops import variable_scope -from tensorflow.python.training import checkpointable -from tensorflow.python.training import checkpointable_utils from tensorflow.python.training import saver as core_saver from tensorflow.python.training import training_util +from tensorflow.python.training.checkpointable import base as checkpointable +from tensorflow.python.training.checkpointable import util as checkpointable_utils class NonLayerCheckpointable(checkpointable.Checkpointable): diff --git a/tensorflow/contrib/optimizer_v2/optimizer_v2.py b/tensorflow/contrib/optimizer_v2/optimizer_v2.py index 694a3cebd6..f537318b32 100644 --- a/tensorflow/contrib/optimizer_v2/optimizer_v2.py +++ b/tensorflow/contrib/optimizer_v2/optimizer_v2.py @@ -33,10 +33,10 @@ from tensorflow.python.ops import resource_variable_ops from tensorflow.python.ops import state_ops from tensorflow.python.ops import variable_scope from tensorflow.python.ops import variables -from tensorflow.python.training import checkpointable from tensorflow.python.training import distribute as distribute_lib from tensorflow.python.training import optimizer as optimizer_v1 from tensorflow.python.training import slot_creator +from tensorflow.python.training.checkpointable import base as checkpointable from tensorflow.python.util import nest |