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

name and read_value arguments to tf.Variable.assign*

Browse Source 
PiperOrigin-RevId: 209828610
This commit is contained in:
Alexandre Passos 2018-08-22 14:18:59 -07:00 committed by TensorFlower Gardener
parent 77aa0e0392
commit c21e14a133
3 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tensorflow/python/ops/variables.py
View File

@ -459,7 +459,7 @@ class Variable(six.with_metaclass(VariableMetaclass,
""" """
raise NotImplementedError raise NotImplementedError
def assign(self, value, use_locking=False): def assign(self, value, use_locking=False, name=None, read_value=True):
"""Assigns a new value to the variable. """Assigns a new value to the variable.
This is essentially a shortcut for `assign(self, value)`. This is essentially a shortcut for `assign(self, value)`.
@ -467,6 +467,9 @@ class Variable(six.with_metaclass(VariableMetaclass,
Args: Args:
value: A `Tensor`. The new value for this variable. value: A `Tensor`. The new value for this variable.
use_locking: If `True`, use locking during the assignment. use_locking: If `True`, use locking during the assignment.
name: The name of the operation to be created
read_value: if True, will return something which evaluates to the
new value of the variable; if False will return the assign op.
Returns: Returns:
A `Tensor` that will hold the new value of this variable after A `Tensor` that will hold the new value of this variable after
@ -474,7 +477,7 @@ class Variable(six.with_metaclass(VariableMetaclass,
""" """
raise NotImplementedError raise NotImplementedError
def assign_add(self, delta, use_locking=False): def assign_add(self, delta, use_locking=False, name=None, read_value=True):
"""Adds a value to this variable. """Adds a value to this variable.
This is essentially a shortcut for `assign_add(self, delta)`. This is essentially a shortcut for `assign_add(self, delta)`.
@ -482,6 +485,9 @@ class Variable(six.with_metaclass(VariableMetaclass,
Args: Args:
delta: A `Tensor`. The value to add to this variable. delta: A `Tensor`. The value to add to this variable.
use_locking: If `True`, use locking during the operation. use_locking: If `True`, use locking during the operation.
name: The name of the operation to be created
read_value: if True, will return something which evaluates to the
new value of the variable; if False will return the assign op.
Returns: Returns:
A `Tensor` that will hold the new value of this variable after A `Tensor` that will hold the new value of this variable after
@ -489,7 +495,7 @@ class Variable(six.with_metaclass(VariableMetaclass,
""" """
raise NotImplementedError raise NotImplementedError
def assign_sub(self, delta, use_locking=False): def assign_sub(self, delta, use_locking=False, name=None, read_value=True):
"""Subtracts a value from this variable. """Subtracts a value from this variable.
This is essentially a shortcut for `assign_sub(self, delta)`. This is essentially a shortcut for `assign_sub(self, delta)`.
@ -497,6 +503,9 @@ class Variable(six.with_metaclass(VariableMetaclass,
Args: Args:
delta: A `Tensor`. The value to subtract from this variable. delta: A `Tensor`. The value to subtract from this variable.
use_locking: If `True`, use locking during the operation. use_locking: If `True`, use locking during the operation.
name: The name of the operation to be created
read_value: if True, will return something which evaluates to the
new value of the variable; if False will return the assign op.
Returns: Returns:
A `Tensor` that will hold the new value of this variable after A `Tensor` that will hold the new value of this variable after
@ -1450,7 +1459,7 @@ class RefVariable(Variable):
""" """
return self._constraint return self._constraint
def assign(self, value, use_locking=False): def assign(self, value, use_locking=False, name=None, read_value=True):
"""Assigns a new value to the variable. """Assigns a new value to the variable.
This is essentially a shortcut for `assign(self, value)`. This is essentially a shortcut for `assign(self, value)`.
@ -1458,14 +1467,21 @@ class RefVariable(Variable):
Args: Args:
value: A `Tensor`. The new value for this variable. value: A `Tensor`. The new value for this variable.
use_locking: If `True`, use locking during the assignment. use_locking: If `True`, use locking during the assignment.
name: The name of the operation to be created
read_value: if True, will return something which evaluates to the
new value of the variable; if False will return the assign op.
Returns: Returns:
A `Tensor` that will hold the new value of this variable after A `Tensor` that will hold the new value of this variable after
the assignment has completed. the assignment has completed.
""" """
return state_ops.assign(self._variable, value, use_locking=use_locking) assign = state_ops.assign(self._variable, value, use_locking=use_locking,
name=name)
if read_value:
return assign
return assign.op
def assign_add(self, delta, use_locking=False): def assign_add(self, delta, use_locking=False, name=None, read_value=True):
"""Adds a value to this variable. """Adds a value to this variable.
This is essentially a shortcut for `assign_add(self, delta)`. This is essentially a shortcut for `assign_add(self, delta)`.
@ -1473,14 +1489,21 @@ class RefVariable(Variable):
Args: Args:
delta: A `Tensor`. The value to add to this variable. delta: A `Tensor`. The value to add to this variable.
use_locking: If `True`, use locking during the operation. use_locking: If `True`, use locking during the operation.
name: The name of the operation to be created
read_value: if True, will return something which evaluates to the
new value of the variable; if False will return the assign op.
Returns: Returns:
A `Tensor` that will hold the new value of this variable after A `Tensor` that will hold the new value of this variable after
the addition has completed. the addition has completed.
""" """
return state_ops.assign_add(self._variable, delta, use_locking=use_locking) assign = state_ops.assign_add(
self._variable, delta, use_locking=use_locking, name=name)
if read_value:
return assign
return assign.op
def assign_sub(self, delta, use_locking=False): def assign_sub(self, delta, use_locking=False, name=None, read_value=True):
"""Subtracts a value from this variable. """Subtracts a value from this variable.
This is essentially a shortcut for `assign_sub(self, delta)`. This is essentially a shortcut for `assign_sub(self, delta)`.
@ -1488,12 +1511,19 @@ class RefVariable(Variable):
Args: Args:
delta: A `Tensor`. The value to subtract from this variable. delta: A `Tensor`. The value to subtract from this variable.
use_locking: If `True`, use locking during the operation. use_locking: If `True`, use locking during the operation.
name: The name of the operation to be created
read_value: if True, will return something which evaluates to the
new value of the variable; if False will return the assign op.
Returns: Returns:
A `Tensor` that will hold the new value of this variable after A `Tensor` that will hold the new value of this variable after
the subtraction has completed. the subtraction has completed.
""" """
return state_ops.assign_sub(self._variable, delta, use_locking=use_locking) assign = state_ops.assign_sub(
self._variable, delta, use_locking=use_locking, name=name)
if read_value:
return assign
return assign.op
def scatter_sub(self, sparse_delta, use_locking=False, name=None): def scatter_sub(self, sparse_delta, use_locking=False, name=None):
"""Subtracts `IndexedSlices` from this variable. """Subtracts `IndexedSlices` from this variable.

6
tensorflow/tools/api/golden/v1/tensorflow.-variable.pbtxt
View File

@ -53,15 +53,15 @@ tf_class {
} }
member_method { member_method {
name: "assign" name: "assign"
argspec: "args=[\'self\', \'value\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], " argspec: "args=[\'self\', \'value\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
} }
member_method { member_method {
name: "assign_add" name: "assign_add"
argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], " argspec: "args=[\'self\', \'delta\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
} }
member_method { member_method {
name: "assign_sub" name: "assign_sub"
argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], " argspec: "args=[\'self\', \'delta\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
} }
member_method { member_method {
name: "count_up_to" name: "count_up_to"

6
tensorflow/tools/api/golden/v2/tensorflow.-variable.pbtxt
View File

@ -53,15 +53,15 @@ tf_class {
} }
member_method { member_method {
name: "assign" name: "assign"
argspec: "args=[\'self\', \'value\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], " argspec: "args=[\'self\', \'value\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
} }
member_method { member_method {
name: "assign_add" name: "assign_add"
argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], " argspec: "args=[\'self\', \'delta\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
} }
member_method { member_method {
name: "assign_sub" name: "assign_sub"
argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], " argspec: "args=[\'self\', \'delta\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
} }
member_method { member_method {
name: "count_up_to" name: "count_up_to"