diff options
| author |  Yifei Feng <yifeif@google.com> | 2018-04-23 21:19:14 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-04-23 21:21:38 -0700 |
| commit | 22f3a97b8b089202f60bb0c7697feb0c8e0713cc (patch) | |
| tree | d16f95826e4be15bbb3b0f22bed0ca25d3eb5897 /tensorflow/contrib/optimizer_v2 | |
| parent | 24b7c9a800ab5086d45a7d83ebcd6218424dc9e3 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 194031845
Diffstat (limited to 'tensorflow/contrib/optimizer_v2')
| -rw-r--r-- | tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py | 2 | ||||
| -rw-r--r-- | tensorflow/contrib/optimizer_v2/optimizer_v2.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py b/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py index 6ade4ccd52..8ac9b58145 100644 --- a/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py +++ b/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py @@ -456,7 +456,7 @@ class CheckpointingTests(test.TestCase): optimizer.apply_gradients( [(g, v) for g, v in zip(grad, model.vars)]) - @test_util.run_in_graph_and_eager_modes(assert_no_eager_garbage=True) + @test_util.run_in_graph_and_eager_modes() def testDeferredSlotRestoration(self): checkpoint_directory = self.get_temp_dir() diff --git a/tensorflow/contrib/optimizer_v2/optimizer_v2.py b/tensorflow/contrib/optimizer_v2/optimizer_v2.py index dcb5bb6416..46bfbb729f 100644 --- a/tensorflow/contrib/optimizer_v2/optimizer_v2.py +++ b/tensorflow/contrib/optimizer_v2/optimizer_v2.py @@ -564,7 +564,7 @@ class OptimizerV2(optimizer_v1.Optimizer): ### State - Internal methods apre passed a `state` argument with the correct + Internal methods are passed a `state` argument with the correct values to use for the slot and non-slot variables, and the hyper parameters. """ |