From a6223c01a6ef252e23fd6c2c26d41d3b40483710 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 11 Sep 2017 10:51:07 -0700
Subject: [PATCH] Fix locking of variables in SparseProximalGradientDescent,
 AdagradDA, SparseAdagradDA.

PiperOrigin-RevId: 168252530
---
 tensorflow/core/kernels/training_ops.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index 771be3cea10..2aa3c1eea55 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -875,7 +875,7 @@ class SparseApplyProximalGradientDescentOp : public OpKernel {
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
     auto locks =
-        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0});
     Tensor var;
     OP_REQUIRES_OK(
         ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
@@ -1524,8 +1524,8 @@ class ApplyAdagradDAOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks =
-        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2});
     Tensor var;
     OP_REQUIRES_OK(
         ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
@@ -1626,8 +1626,8 @@ class SparseApplyAdagradDAOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks =
-        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2});
     Tensor var;
     OP_REQUIRES_OK(
         ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));