diff options
author | 2018-09-27 13:18:33 -0700 | |
---|---|---|
committer | 2018-09-27 13:23:04 -0700 | |
commit | 4cedc8b6e738b7a188c9c091cf667bacafae44b7 (patch) | |
tree | 56de35940e5f9daedd5f39a82d2cd90cf374e4e4 /tensorflow/tools | |
parent | c898e63d07fc63315be98f0772736e5d7f2fb44c (diff) |
Updating the V2 variables API.
PiperOrigin-RevId: 214824023
Diffstat (limited to 'tensorflow/tools')
8 files changed, 5 insertions, 365 deletions
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.-variable.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.-variable.pbtxt index 05698b03ee..af7fc9d4ef 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.-variable.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.-variable.pbtxt @@ -1,5 +1,6 @@ path: "tensorflow.Variable" tf_class { + is_instance: "<class \'tensorflow.python.ops.variables.VariableV1\'>" is_instance: "<class \'tensorflow.python.ops.variables.Variable\'>" is_instance: "<class \'tensorflow.python.training.checkpointable.base.CheckpointableBase\'>" is_instance: "<type \'object\'>" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt index 503e145a91..509ceff9df 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt @@ -2221,6 +2221,10 @@ tf_module { 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: "variable_op_scope" argspec: "args=[\'values\', \'name_or_scope\', \'default_name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'reuse\', \'dtype\', \'use_resource\', \'constraint\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], " } diff --git a/tensorflow/tools/api/golden/v2/tensorflow.-variable-scope.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.-variable-scope.pbtxt deleted file mode 100644 index c13eb7b8bb..0000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.-variable-scope.pbtxt +++ /dev/null @@ -1,105 +0,0 @@ -path: "tensorflow.VariableScope" -tf_class { - is_instance: "<class \'tensorflow.python.ops.variable_scope.VariableScope\'>" - is_instance: "<type \'object\'>" - member { - name: "caching_device" - mtype: "<type \'property\'>" - } - member { - name: "constraint" - mtype: "<type \'property\'>" - } - member { - name: "custom_getter" - mtype: "<type \'property\'>" - } - member { - name: "dtype" - mtype: "<type \'property\'>" - } - member { - name: "initializer" - mtype: "<type \'property\'>" - } - member { - name: "name" - mtype: "<type \'property\'>" - } - member { - name: "original_name_scope" - mtype: "<type \'property\'>" - } - member { - name: "partitioner" - mtype: "<type \'property\'>" - } - member { - name: "regularizer" - mtype: "<type \'property\'>" - } - member { - name: "reuse" - mtype: "<type \'property\'>" - } - member { - name: "use_resource" - mtype: "<type \'property\'>" - } - member_method { - name: "__init__" - argspec: "args=[\'self\', \'reuse\', \'name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'name_scope\', \'dtype\', \'use_resource\', \'constraint\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\', \'None\', \'None\', \'None\', \'\', \"<dtype: \'float32\'>\", \'None\', \'None\'], " - } - member_method { - name: "get_collection" - argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "get_variable" - argspec: "args=[\'self\', \'var_store\', \'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'reuse\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\', \'constraint\', \'synchronization\', \'aggregation\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'VariableSynchronization.AUTO\', \'VariableAggregation.NONE\'], " - } - member_method { - name: "global_variables" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "local_variables" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "reuse_variables" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "set_caching_device" - argspec: "args=[\'self\', \'caching_device\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "set_custom_getter" - argspec: "args=[\'self\', \'custom_getter\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "set_dtype" - argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "set_initializer" - argspec: "args=[\'self\', \'initializer\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "set_partitioner" - argspec: "args=[\'self\', \'partitioner\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "set_regularizer" - argspec: "args=[\'self\', \'regularizer\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "set_use_resource" - argspec: "args=[\'self\', \'use_resource\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "trainable_variables" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.-variable.-save-slice-info.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.-variable.-save-slice-info.pbtxt deleted file mode 100644 index ac3ccd468b..0000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.-variable.-save-slice-info.pbtxt +++ /dev/null @@ -1,17 +0,0 @@ -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\'], " - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.-variable.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.-variable.pbtxt deleted file mode 100644 index 05698b03ee..0000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.-variable.pbtxt +++ /dev/null @@ -1,130 +0,0 @@ -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\', \'collections\', \'validate_shape\', \'caching_device\', \'name\', \'variable_def\', \'dtype\', \'expected_shape\', \'import_scope\', \'constraint\', \'use_resource\', \'synchronization\', \'aggregation\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'True\', \'None\', \'None\', \'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" - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.initializers.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.initializers.pbtxt index d499c67d89..e3c63fe737 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.initializers.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.initializers.pbtxt @@ -49,10 +49,6 @@ tf_module { mtype: "<type \'type\'>" } member_method { - name: "global_variables" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { name: "he_normal" argspec: "args=[\'seed\'], varargs=None, keywords=None, defaults=[\'None\'], " } @@ -68,12 +64,4 @@ tf_module { name: "lecun_uniform" argspec: "args=[\'seed\'], varargs=None, keywords=None, defaults=[\'None\'], " } - member_method { - name: "local_variables" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "variables" - argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], " - } } diff --git a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt index 96212f5528..d2dc8bc85f 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt @@ -1,10 +1,6 @@ path: "tensorflow" tf_module { member { - name: "AUTO_REUSE" - mtype: "<enum \'_ReuseMode\'>" - } - member { name: "AggregationMethod" mtype: "<type \'type\'>" } @@ -233,18 +229,10 @@ tf_module { mtype: "<type \'type\'>" } member { - name: "Variable" - mtype: "<class \'tensorflow.python.ops.variables.VariableMetaclass\'>" - } - member { name: "VariableAggregation" mtype: "<class \'enum.EnumMeta\'>" } member { - name: "VariableScope" - mtype: "<type \'type\'>" - } - member { name: "VariableSynchronization" mtype: "<class \'enum.EnumMeta\'>" } @@ -553,10 +541,6 @@ tf_module { mtype: "<type \'module\'>" } member { - name: "variable_scope" - mtype: "<type \'type\'>" - } - member { name: "variance_scaling_initializer" mtype: "<type \'type\'>" } @@ -617,10 +601,6 @@ tf_module { argspec: "args=[\'names\', \'value\'], varargs=None, keywords=None, defaults=None" } member_method { - name: "all_variables" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { name: "angle" argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } @@ -733,10 +713,6 @@ tf_module { argspec: "args=[\'tensor\', \'tf_type\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], " } member_method { - name: "assert_variables_initialized" - argspec: "args=[\'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], " - } - member_method { name: "atan" argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } @@ -1137,10 +1113,6 @@ tf_module { argspec: "args=[], varargs=None, keywords=None, defaults=None" } member_method { - name: "get_local_variable" - argspec: "args=[\'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\', \'constraint\', \'synchronization\', \'aggregation\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'VariableSynchronization.AUTO\', \'VariableAggregation.NONE\'], " - } - member_method { name: "get_seed" argspec: "args=[\'op_seed\'], varargs=None, keywords=None, defaults=None" } @@ -1153,26 +1125,10 @@ tf_module { argspec: "args=[\'handle\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } member_method { - name: "get_variable" - argspec: "args=[\'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\', \'constraint\', \'synchronization\', \'aggregation\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'VariableSynchronization.AUTO\', \'VariableAggregation.NONE\'], " - } - member_method { - name: "get_variable_scope" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { name: "global_norm" argspec: "args=[\'t_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } member_method { - name: "global_variables" - argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], " - } - member_method { - name: "global_variables_initializer" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { name: "gradients" argspec: "args=[\'ys\', \'xs\', \'grad_ys\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\', \'stop_gradients\'], varargs=None, keywords=None, defaults=[\'None\', \'gradients\', \'False\', \'False\', \'None\', \'None\'], " } @@ -1249,18 +1205,6 @@ tf_module { argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'init_all_tables\'], " } member_method { - name: "initialize_all_variables" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "initialize_local_variables" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "initialize_variables" - argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], " - } - member_method { name: "invert_permutation" argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } @@ -1289,10 +1233,6 @@ tf_module { argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } member_method { - name: "is_variable_initialized" - argspec: "args=[\'variable\'], varargs=None, keywords=None, defaults=None" - } - member_method { name: "lbeta" argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } @@ -1329,14 +1269,6 @@ tf_module { argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None" } member_method { - name: "local_variables" - argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], " - } - member_method { - name: "local_variables_initializer" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { name: "log" argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } @@ -1449,14 +1381,6 @@ tf_module { argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } member_method { - name: "model_variables" - argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], " - } - member_method { - name: "moving_average_variables" - argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], " - } - member_method { name: "multinomial" argspec: "args=[\'logits\', \'num_samples\', \'seed\', \'name\', \'output_dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], " } @@ -1657,10 +1581,6 @@ tf_module { argspec: "args=[\'base_type\', \'conversion_func\', \'priority\'], varargs=None, keywords=None, defaults=[\'100\'], " } member_method { - name: "report_uninitialized_variables" - argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'report_uninitialized_variables\'], " - } - member_method { name: "required_space_to_batch_paddings" argspec: "args=[\'input_shape\', \'block_shape\', \'base_paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], " } @@ -2069,10 +1989,6 @@ tf_module { argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } member_method { - name: "trainable_variables" - argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], " - } - member_method { name: "transpose" argspec: "args=[\'a\', \'perm\', \'name\', \'conjugate\'], varargs=None, keywords=None, defaults=[\'None\', \'transpose\', \'False\'], " } @@ -2141,14 +2057,6 @@ tf_module { argspec: "args=[\'max_shard_bytes\', \'axis\', \'bytes_per_string_element\', \'max_shards\'], varargs=None, keywords=None, defaults=[\'0\', \'16\', \'None\'], " } member_method { - name: "variable_op_scope" - argspec: "args=[\'values\', \'name_or_scope\', \'default_name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'reuse\', \'dtype\', \'use_resource\', \'constraint\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], " - } - member_method { - name: "variables_initializer" - argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], " - } - member_method { name: "verify_tensor_all_finite" argspec: "args=[\'t\', \'msg\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " } diff --git a/tensorflow/tools/api/golden/v2/tensorflow.variable_scope.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.variable_scope.pbtxt deleted file mode 100644 index e62dec93e6..0000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.variable_scope.pbtxt +++ /dev/null @@ -1,9 +0,0 @@ -path: "tensorflow.variable_scope" -tf_class { - is_instance: "<class \'tensorflow.python.ops.variable_scope.variable_scope\'>" - is_instance: "<type \'object\'>" - member_method { - name: "__init__" - argspec: "args=[\'self\', \'name_or_scope\', \'default_name\', \'values\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'reuse\', \'dtype\', \'use_resource\', \'constraint\', \'auxiliary_name_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'True\'], " - } -} |