Colocate the constant initializer of the adagrad accumulator with the variable

A. Unique TensorFlower · Vijay Vasudevan · commit f89ba4869abe · 2016-01-29T20:16:23.000-08:00
and the accumulator.
Change: 113391069
diff --git a/tensorflow/examples/android/BUILD b/tensorflow/examples/android/BUILD
@@ -58,7 +58,11 @@ cc_binary(
 
 cc_library(
     name = "tensorflow_native_libs",
-    srcs = [
+    tags = [
+        "manual",
+        "notap",
+    ],
+    deps = [
         ":libpthread.so",
         ":libtensorflow_demo.so",
     ],
diff --git a/tensorflow/python/training/adagrad.py b/tensorflow/python/training/adagrad.py
@@ -60,8 +60,9 @@ def __init__(self, learning_rate, initial_accumulator_value=0.1,
 
   def _create_slots(self, var_list):
     for v in var_list:
-      val = constant_op.constant(self._initial_accumulator_value,
-                                 shape=v.get_shape())
+      with ops.device(v.device):
+        val = constant_op.constant(self._initial_accumulator_value,
+                                   shape=v.get_shape())
       self._get_or_make_slot(v, val, "accumulator", self._name)
 
   def _prepare(self):
