commit a827c0690bdf3f861b32cd103af8b1660ab5ebba
author Amit Patankar <amitpatankar@google.com> Wed Dec 18 15:18:14 2019 -0800
committer TensorFlower Gardener <gardener@tensorflow.org> Wed Dec 18 15:22:09 2019 -0800
tree 59d3b837bbdb11e2633dec323c5f774344cf6d52
parent d89ac9989022e81bbfabf4864fc5994509f06880

This fixes an issue we are seeing with benchmarks.

PiperOrigin-RevId: 286275744
Change-Id: Ie82e11c606bb65a0853c1432d1336cca290b636c

tensorflow/python/eager/context.py

diff --git a/tensorflow/python/eager/context.py b/tensorflow/python/eager/context.py
index c7c3551..540ee87 100644
--- a/tensorflow/python/eager/context.py
+++ b/tensorflow/python/eager/context.py
@@ -1458,7 +1458,7 @@
     if policy is None:
       policy = MIRRORING_NONE
 
-    if self._mirroring_policy != policy:
+    if self._mirroring_policy is not None or self._mirroring_policy != policy:
       self._mirroring_policy = policy
 
       # Only set the policy if the context has already been initialized