experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix locking of variables in SparseProximalGradientDescent,

Browse Source 
AdagradDA, SparseAdagradDA.

PiperOrigin-RevId: 168252530
This commit is contained in:
A. Unique TensorFlower 2017-09-11 10:51:07 -07:00 committed by TensorFlower Gardener
parent abde008303
commit a6223c01a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tensorflow/core/kernels/training_ops.cc
View File

@ -875,7 +875,7 @@ class SparseApplyProximalGradientDescentOp : public OpKernel {
void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS { void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
auto locks = auto locks =
MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1}); MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0});
Tensor var; Tensor var;
OP_REQUIRES_OK( OP_REQUIRES_OK(
ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var)); ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
@ -1524,8 +1524,8 @@ class ApplyAdagradDAOp : public OpKernel {
} }
void Compute(OpKernelContext* ctx) override { void Compute(OpKernelContext* ctx) override {
auto locks = auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1}); {0, 1, 2});
Tensor var; Tensor var;
OP_REQUIRES_OK( OP_REQUIRES_OK(
ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var)); 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 { void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
auto locks = auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1}); {0, 1, 2});
Tensor var; Tensor var;
OP_REQUIRES_OK( OP_REQUIRES_OK(
ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var)); ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));