Make the return value of read_var consistently a tensor instead of

tensorflower-gardener · tensorflower-gardener · commit b0a15f21d200 · 2018-06-12T09:56:39.000-07:00
sometimes a variable.

PiperOrigin-RevId: 200231463
diff --git a/tensorflow/contrib/distribute/python/mirrored_strategy.py b/tensorflow/contrib/distribute/python/mirrored_strategy.py
@@ -349,7 +349,7 @@ def read_var(self, tower_local_var):
     if isinstance(tower_local_var, values.TowerLocalVariable):
       return math_ops.add_n(self.unwrap(tower_local_var))
     assert isinstance(tower_local_var, values.Mirrored)
-    return tower_local_var.get()
+    return array_ops.identity(tower_local_var.get())
 
   def _fetch(self, val, destination, fn):
     """Return a copy of `val` or `fn(val)` on `destination`."""
diff --git a/tensorflow/contrib/distribute/python/one_device_strategy.py b/tensorflow/contrib/distribute/python/one_device_strategy.py
@@ -104,7 +104,7 @@ def _update_non_slot(self, colocate_with, fn, *args, **kwargs):
 
   def read_var(self, tower_local_var):
     """Read the aggregate value of a tower-local variable."""
-    return tower_local_var
+    return array_ops.identity(tower_local_var)
 
   def _fetch(self, val, destination, fn):
     """Return a copy of `val` or `fn(val)` on `destination`."""
diff --git a/tensorflow/python/training/distribute.py b/tensorflow/python/training/distribute.py
@@ -652,7 +652,7 @@ def read_var(self, v):
     """Reads the value of a variable.
 
     Returns the aggregate value of a tower-local variable, or the
-    (possibly read-only) value of any other variable.
+    (read-only) value of any other variable.
 
     Args:
       v: A variable allocated within the scope of this `DistributionStrategy`.
@@ -1217,7 +1217,7 @@ def _update_non_slot(self, colocate_with, fn, *args, **kwargs):
       return fn(*args, **kwargs)
 
   def read_var(self, tower_local_var):
-    return tower_local_var
+    return array_ops.identity(tower_local_var)
 
   def _fetch(self, var, destination, fn):
     with ops.colocate_with(var):
