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

Fix TF 2.0 variable API exporting.

Browse Source 
Apparently @tf_export(v2=[...]) isn't a thing, the correct incantation
is @tf_export(..., v1=[]). Which makes sense since we want the symbol to
continue to exist in v3.

PiperOrigin-RevId: 217331254
This commit is contained in:
A. Unique TensorFlower 2018-10-16 09:36:20 -07:00 committed by TensorFlower Gardener
parent 5f741287b9
commit 64a4cf11f6
5 changed files with 157 additions and 2 deletions

2
tensorflow/python/ops/variable_scope.py
View File

@ -2558,7 +2558,7 @@ def variable_creator_scope_v1(variable_creator):
# Note: only the docstrings differ between this and v1.
@tf_export(v2=["variable_creator_scope"])
@tf_export("variable_creator_scope", v1=[])
@tf_contextlib.contextmanager
def variable_creator_scope(variable_creator):
"""Scope which defines a variable creation function to be used by variable().

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

@ -187,7 +187,7 @@ class VariableMetaclass(type):
return super(VariableMetaclass, cls).__call__(*args, **kwargs)
@tf_export(v2=["Variable"])
@tf_export("Variable", v1=[])
class Variable(six.with_metaclass(VariableMetaclass,
checkpointable.CheckpointableBase)):
"""See the [Variables Guide](https://tensorflow.org/guide/variables).

17
tensorflow/tools/api/golden/v2/tensorflow.-variable.-save-slice-info.pbtxt Normal file
View File

@ -0,0 +1,17 @@
path: "tensorflow.Variable.SaveSliceInfo"
tf_class {
is_instance: "<class \'tensorflow.python.ops.variables.SaveSliceInfo\'>"
is_instance: "<type \'object\'>"
member {
name: "spec"
mtype: "<type \'property\'>"
}
member_method {
name: "__init__"
argspec: "args=[\'self\', \'full_name\', \'full_shape\', \'var_offset\', \'var_shape\', \'save_slice_info_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
}
member_method {
name: "to_proto"
argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
}

130
tensorflow/tools/api/golden/v2/tensorflow.-variable.pbtxt Normal file
View File

@ -0,0 +1,130 @@
path: "tensorflow.Variable"
tf_class {
is_instance: "<class \'tensorflow.python.ops.variables.Variable\'>"
is_instance: "<class \'tensorflow.python.training.checkpointable.base.CheckpointableBase\'>"
is_instance: "<type \'object\'>"
member {
name: "SaveSliceInfo"
mtype: "<type \'type\'>"
}
member {
name: "constraint"
mtype: "<type \'property\'>"
}
member {
name: "device"
mtype: "<type \'property\'>"
}
member {
name: "dtype"
mtype: "<type \'property\'>"
}
member {
name: "graph"
mtype: "<type \'property\'>"
}
member {
name: "initial_value"
mtype: "<type \'property\'>"
}
member {
name: "initializer"
mtype: "<type \'property\'>"
}
member {
name: "name"
mtype: "<type \'property\'>"
}
member {
name: "op"
mtype: "<type \'property\'>"
}
member {
name: "shape"
mtype: "<type \'property\'>"
}
member {
name: "trainable"
mtype: "<type \'property\'>"
}
member_method {
name: "__init__"
argspec: "args=[\'self\', \'initial_value\', \'trainable\', \'validate_shape\', \'caching_device\', \'name\', \'variable_def\', \'dtype\', \'import_scope\', \'constraint\', \'synchronization\', \'aggregation\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'True\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'VariableSynchronization.AUTO\', \'VariableAggregation.NONE\'], "
}
member_method {
name: "assign"
argspec: "args=[\'self\', \'value\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
}
member_method {
name: "assign_add"
argspec: "args=[\'self\', \'delta\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
}
member_method {
name: "assign_sub"
argspec: "args=[\'self\', \'delta\', \'use_locking\', \'name\', \'read_value\'], varargs=None, keywords=None, defaults=[\'False\', \'None\', \'True\'], "
}
member_method {
name: "count_up_to"
argspec: "args=[\'self\', \'limit\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "eval"
argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
member_method {
name: "from_proto"
argspec: "args=[\'variable_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
member_method {
name: "get_shape"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "initialized_value"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "load"
argspec: "args=[\'self\', \'value\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
member_method {
name: "read_value"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "scatter_add"
argspec: "args=[\'self\', \'sparse_delta\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
}
member_method {
name: "scatter_nd_add"
argspec: "args=[\'self\', \'indices\', \'updates\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
member_method {
name: "scatter_nd_sub"
argspec: "args=[\'self\', \'indices\', \'updates\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
member_method {
name: "scatter_nd_update"
argspec: "args=[\'self\', \'indices\', \'updates\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
member_method {
name: "scatter_sub"
argspec: "args=[\'self\', \'sparse_delta\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
}
member_method {
name: "scatter_update"
argspec: "args=[\'self\', \'sparse_delta\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
}
member_method {
name: "set_shape"
argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "to_proto"
argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
}
member_method {
name: "value"
argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
}
}

8
tensorflow/tools/api/golden/v2/tensorflow.pbtxt
View File

@ -176,6 +176,10 @@ tf_module {
name: "VarLenFeature"
mtype: "<type \'type\'>"
}
member {
name: "Variable"
mtype: "<class \'tensorflow.python.ops.variables.VariableMetaclass\'>"
}
member {
name: "VariableAggregation"
mtype: "<class \'enum.EnumMeta\'>"
@ -1700,6 +1704,10 @@ tf_module {
name: "variable_axis_size_partitioner"
argspec: "args=[\'max_shard_bytes\', \'axis\', \'bytes_per_string_element\', \'max_shards\'], varargs=None, keywords=None, defaults=[\'0\', \'16\', \'None\'], "
}
member_method {
name: "variable_creator_scope"
argspec: "args=[\'variable_creator\'], varargs=None, keywords=None, defaults=None"
}
member_method {
name: "where"
argspec: "args=[\'condition\', \'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "