From ac79b5c1d28fdca9e3f35783f5f76ef9de5f2fe9 Mon Sep 17 00:00:00 2001 From: Martin Wicke Date: Tue, 13 Nov 2018 16:55:33 -0800 Subject: [PATCH] Remove symbols from the v2 API. Included here: tf.train.NewCheckpointReader tf.train.replica_device_setter tf.train.init_from_checkpoint tf.train.ProfilerHook tf.profiler.* Profiler's API depends on v1 style graphs, so we'll remove this pending replacement. PiperOrigin-RevId: 221359471 --- tensorflow/python/profiler/model_analyzer.py | 6 +- tensorflow/python/profiler/option_builder.py | 2 +- tensorflow/python/profiler/profiler.py | 8 +- tensorflow/python/profiler/tfprof_logger.py | 2 +- .../tools/api/generator/api_init_files.bzl | 1 - .../training/basic_session_run_hooks.py | 2 +- .../python/training/checkpoint_utils.py | 2 +- tensorflow/python/training/device_setter.py | 2 +- tensorflow/python/util/py_checkpoint_reader.i | 1 - .../tools/api/golden/v2/tensorflow.pbtxt | 4 - ...flow.profiler.-advice-proto.-checker.pbtxt | 12 -- ...ofiler.-advice-proto.-checkers-entry.pbtxt | 22 -- .../tensorflow.profiler.-advice-proto.pbtxt | 41 ---- ...graph-node-proto.-input-shapes-entry.pbtxt | 22 -- ...ensorflow.profiler.-graph-node-proto.pbtxt | 191 ------------------ ...low.profiler.-multi-graph-node-proto.pbtxt | 134 ------------ ...er.-op-log-proto.-id-to-string-entry.pbtxt | 21 -- .../tensorflow.profiler.-op-log-proto.pbtxt | 38 ---- ...low.profiler.-profile-option-builder.pbtxt | 93 --------- .../v2/tensorflow.profiler.-profiler.pbtxt | 37 ---- .../api/golden/v2/tensorflow.profiler.pbtxt | 39 ---- .../v2/tensorflow.train.-profiler-hook.pbtxt | 30 --- .../api/golden/v2/tensorflow.train.pbtxt | 16 -- 23 files changed, 12 insertions(+), 714 deletions(-) delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checker.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-multi-graph-node-proto.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-profile-option-builder.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.-profiler.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.profiler.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.train.-profiler-hook.pbtxt diff --git a/tensorflow/python/profiler/model_analyzer.py b/tensorflow/python/profiler/model_analyzer.py index 5f19eac0436..4b2d9052b78 100644 --- a/tensorflow/python/profiler/model_analyzer.py +++ b/tensorflow/python/profiler/model_analyzer.py @@ -122,7 +122,7 @@ def _build_advisor_options(options): return opts -@tf_export('profiler.Profiler') +@tf_export(v1=['profiler.Profiler']) class Profiler(object): """TensorFlow multi-step profiler. @@ -306,7 +306,7 @@ class Profiler(object): print_mdl.WriteProfile(filename) -@tf_export('profiler.profile') +@tf_export(v1=['profiler.profile']) def profile(graph=None, run_meta=None, op_log=None, @@ -381,7 +381,7 @@ def profile(graph=None, return tfprof_node -@tf_export('profiler.advise') +@tf_export(v1=['profiler.advise']) def advise(graph=None, run_meta=None, options=_DEFAULT_ADVISE_OPTIONS): """Auto profile and advise. diff --git a/tensorflow/python/profiler/option_builder.py b/tensorflow/python/profiler/option_builder.py index 2ad7adf7693..9d8f7683a65 100644 --- a/tensorflow/python/profiler/option_builder.py +++ b/tensorflow/python/profiler/option_builder.py @@ -23,7 +23,7 @@ from tensorflow.python.profiler import tfprof_logger from tensorflow.python.util.tf_export import tf_export -@tf_export('profiler.ProfileOptionBuilder') +@tf_export(v1=['profiler.ProfileOptionBuilder']) class ProfileOptionBuilder(object): # pylint: disable=line-too-long """Option Builder for Profiling API. diff --git a/tensorflow/python/profiler/profiler.py b/tensorflow/python/profiler/profiler.py index efbdd1ba684..5f62690b54e 100644 --- a/tensorflow/python/profiler/profiler.py +++ b/tensorflow/python/profiler/profiler.py @@ -49,7 +49,7 @@ _allowed_symbols.extend([ ]) # Export protos -tf_export('profiler.GraphNodeProto')(GraphNodeProto) -tf_export('profiler.MultiGraphNodeProto')(MultiGraphNodeProto) -tf_export('profiler.AdviceProto')(AdviceProto) -tf_export('profiler.OpLogProto')(OpLogProto) +tf_export(v1=['profiler.GraphNodeProto'])(GraphNodeProto) +tf_export(v1=['profiler.MultiGraphNodeProto'])(MultiGraphNodeProto) +tf_export(v1=['profiler.AdviceProto'])(AdviceProto) +tf_export(v1=['profiler.OpLogProto'])(OpLogProto) diff --git a/tensorflow/python/profiler/tfprof_logger.py b/tensorflow/python/profiler/tfprof_logger.py index e651de32ea3..6ccd0e0ff3b 100644 --- a/tensorflow/python/profiler/tfprof_logger.py +++ b/tensorflow/python/profiler/tfprof_logger.py @@ -188,7 +188,7 @@ def merge_default_with_oplog(graph, op_log=None, run_meta=None, return tmp_op_log -@tf_export('profiler.write_op_log') +@tf_export(v1=['profiler.write_op_log']) def write_op_log(graph, log_dir, op_log=None, run_meta=None, add_trace=True): """Log provided 'op_log', and add additional model information below. diff --git a/tensorflow/python/tools/api/generator/api_init_files.bzl b/tensorflow/python/tools/api/generator/api_init_files.bzl index 5699d86e6d5..60a5540b83b 100644 --- a/tensorflow/python/tools/api/generator/api_init_files.bzl +++ b/tensorflow/python/tools/api/generator/api_init_files.bzl @@ -68,7 +68,6 @@ TENSORFLOW_API_INIT_FILES = [ "metrics/__init__.py", "nn/__init__.py", "nn/rnn_cell/__init__.py", - "profiler/__init__.py", "quantization/__init__.py", "random/__init__.py", "saved_model/__init__.py", diff --git a/tensorflow/python/training/basic_session_run_hooks.py b/tensorflow/python/training/basic_session_run_hooks.py index 1efabcd854d..60db654e9cc 100644 --- a/tensorflow/python/training/basic_session_run_hooks.py +++ b/tensorflow/python/training/basic_session_run_hooks.py @@ -976,7 +976,7 @@ class FeedFnHook(session_run_hook.SessionRunHook): fetches=None, feed_dict=self.feed_fn()) -@tf_export("train.ProfilerHook") +@tf_export(v1=["train.ProfilerHook"]) class ProfilerHook(session_run_hook.SessionRunHook): """Captures CPU/GPU profiling information every N steps or seconds. diff --git a/tensorflow/python/training/checkpoint_utils.py b/tensorflow/python/training/checkpoint_utils.py index 857da431db2..2ed7d7f29c9 100644 --- a/tensorflow/python/training/checkpoint_utils.py +++ b/tensorflow/python/training/checkpoint_utils.py @@ -101,7 +101,7 @@ def list_variables(ckpt_dir_or_file): return result -@tf_export("train.init_from_checkpoint") +@tf_export(v1=["train.init_from_checkpoint"]) def init_from_checkpoint(ckpt_dir_or_file, assignment_map): """Replaces `tf.Variable` initializers so they load from a checkpoint file. diff --git a/tensorflow/python/training/device_setter.py b/tensorflow/python/training/device_setter.py index be80c365715..5874a1ff415 100644 --- a/tensorflow/python/training/device_setter.py +++ b/tensorflow/python/training/device_setter.py @@ -130,7 +130,7 @@ class _ReplicaDeviceChooser(object): return worker_device.to_string() -@tf_export("train.replica_device_setter") +@tf_export(v1=["train.replica_device_setter"]) def replica_device_setter(ps_tasks=0, ps_device="/job:ps", worker_device="/job:worker", merge_devices=True, cluster=None, ps_ops=None, ps_strategy=None): diff --git a/tensorflow/python/util/py_checkpoint_reader.i b/tensorflow/python/util/py_checkpoint_reader.i index 1c73f7f06f1..a1b98a2a759 100644 --- a/tensorflow/python/util/py_checkpoint_reader.i +++ b/tensorflow/python/util/py_checkpoint_reader.i @@ -165,7 +165,6 @@ def NewCheckpointReader(filepattern): from tensorflow.python.util import compat return CheckpointReader(compat.as_bytes(filepattern), status) -NewCheckpointReader._tf_api_names = ['train.NewCheckpointReader'] NewCheckpointReader._tf_api_names_v1 = ['train.NewCheckpointReader'] %} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt index 7afff0a0283..018245b879d 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt @@ -328,10 +328,6 @@ tf_module { name: "ones_initializer" mtype: "" } - member { - name: "profiler" - mtype: "" - } member { name: "pywrap_tensorflow" mtype: "" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checker.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checker.pbtxt deleted file mode 100644 index e09c44cc9ce..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checker.pbtxt +++ /dev/null @@ -1,12 +0,0 @@ -path: "tensorflow.profiler.AdviceProto.Checker" -tf_proto { - descriptor { - name: "Checker" - field { - name: "reports" - number: 2 - label: LABEL_REPEATED - type: TYPE_STRING - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt deleted file mode 100644 index 87462435496..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt +++ /dev/null @@ -1,22 +0,0 @@ -path: "tensorflow.profiler.AdviceProto.CheckersEntry" -tf_proto { - descriptor { - name: "CheckersEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.AdviceProto.Checker" - } - options { - map_entry: true - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.pbtxt deleted file mode 100644 index a8a8858ccd5..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-advice-proto.pbtxt +++ /dev/null @@ -1,41 +0,0 @@ -path: "tensorflow.profiler.AdviceProto" -tf_proto { - descriptor { - name: "AdviceProto" - field { - name: "checkers" - number: 1 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.AdviceProto.CheckersEntry" - } - nested_type { - name: "CheckersEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.AdviceProto.Checker" - } - options { - map_entry: true - } - } - nested_type { - name: "Checker" - field { - name: "reports" - number: 2 - label: LABEL_REPEATED - type: TYPE_STRING - } - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt deleted file mode 100644 index afec73f537a..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt +++ /dev/null @@ -1,22 +0,0 @@ -path: "tensorflow.profiler.GraphNodeProto.InputShapesEntry" -tf_proto { - descriptor { - name: "InputShapesEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_INT32 - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".tensorflow.TensorShapeProto" - } - options { - map_entry: true - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.pbtxt deleted file mode 100644 index 3c831770053..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-graph-node-proto.pbtxt +++ /dev/null @@ -1,191 +0,0 @@ -path: "tensorflow.profiler.GraphNodeProto" -tf_proto { - descriptor { - name: "GraphNodeProto" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - } - field { - name: "tensor_value" - number: 15 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.TFProfTensorProto" - } - field { - name: "run_count" - number: 21 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "exec_micros" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "accelerator_exec_micros" - number: 17 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "cpu_exec_micros" - number: 18 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "requested_bytes" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "peak_bytes" - number: 24 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "residual_bytes" - number: 25 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "output_bytes" - number: 26 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "parameters" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "float_ops" - number: 13 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "devices" - number: 10 - label: LABEL_REPEATED - type: TYPE_STRING - } - field { - name: "total_definition_count" - number: 23 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_run_count" - number: 22 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_exec_micros" - number: 6 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_accelerator_exec_micros" - number: 19 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_cpu_exec_micros" - number: 20 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_requested_bytes" - number: 7 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_peak_bytes" - number: 27 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_residual_bytes" - number: 28 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_output_bytes" - number: 29 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_parameters" - number: 8 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_float_ops" - number: 14 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "shapes" - number: 11 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.TensorShapeProto" - } - field { - name: "input_shapes" - number: 16 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.GraphNodeProto.InputShapesEntry" - } - field { - name: "children" - number: 12 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.GraphNodeProto" - } - nested_type { - name: "InputShapesEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_INT32 - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".tensorflow.TensorShapeProto" - } - options { - map_entry: true - } - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-multi-graph-node-proto.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-multi-graph-node-proto.pbtxt deleted file mode 100644 index 2b08a05437f..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-multi-graph-node-proto.pbtxt +++ /dev/null @@ -1,134 +0,0 @@ -path: "tensorflow.profiler.MultiGraphNodeProto" -tf_proto { - descriptor { - name: "MultiGraphNodeProto" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - } - field { - name: "exec_micros" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "accelerator_exec_micros" - number: 12 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "cpu_exec_micros" - number: 13 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "requested_bytes" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "peak_bytes" - number: 16 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "residual_bytes" - number: 17 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "output_bytes" - number: 18 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "parameters" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "float_ops" - number: 5 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_exec_micros" - number: 6 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_accelerator_exec_micros" - number: 14 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_cpu_exec_micros" - number: 15 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_requested_bytes" - number: 7 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_peak_bytes" - number: 19 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_residual_bytes" - number: 20 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_output_bytes" - number: 21 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_parameters" - number: 8 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "total_float_ops" - number: 9 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "graph_nodes" - number: 10 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.GraphNodeProto" - } - field { - name: "children" - number: 11 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.MultiGraphNodeProto" - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt deleted file mode 100644 index b3adc50c7e1..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt +++ /dev/null @@ -1,21 +0,0 @@ -path: "tensorflow.profiler.OpLogProto.IdToStringEntry" -tf_proto { - descriptor { - name: "IdToStringEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - } - options { - map_entry: true - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.pbtxt deleted file mode 100644 index 7510c566ba5..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-op-log-proto.pbtxt +++ /dev/null @@ -1,38 +0,0 @@ -path: "tensorflow.profiler.OpLogProto" -tf_proto { - descriptor { - name: "OpLogProto" - field { - name: "log_entries" - number: 1 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.OpLogEntry" - } - field { - name: "id_to_string" - number: 2 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".tensorflow.tfprof.OpLogProto.IdToStringEntry" - } - nested_type { - name: "IdToStringEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_INT64 - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - } - options { - map_entry: true - } - } - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-profile-option-builder.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-profile-option-builder.pbtxt deleted file mode 100644 index 19ff38a3900..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-profile-option-builder.pbtxt +++ /dev/null @@ -1,93 +0,0 @@ -path: "tensorflow.profiler.ProfileOptionBuilder" -tf_class { - is_instance: "" - is_instance: "" - member_method { - name: "__init__" - argspec: "args=[\'self\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], " - } - member_method { - name: "account_displayed_op_only" - argspec: "args=[\'self\', \'is_true\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "build" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "float_operation" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "order_by" - argspec: "args=[\'self\', \'attribute\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "select" - argspec: "args=[\'self\', \'attributes\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "time_and_memory" - argspec: "args=[\'min_micros\', \'min_bytes\', \'min_accelerator_micros\', \'min_cpu_micros\', \'min_peak_bytes\', \'min_residual_bytes\', \'min_output_bytes\'], varargs=None, keywords=None, defaults=[\'1\', \'1\', \'0\', \'0\', \'0\', \'0\', \'0\'], " - } - member_method { - name: "trainable_variables_parameter" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_accounted_types" - argspec: "args=[\'self\', \'account_type_regexes\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_empty_output" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_file_output" - argspec: "args=[\'self\', \'outfile\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_max_depth" - argspec: "args=[\'self\', \'max_depth\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_min_execution_time" - argspec: "args=[\'self\', \'min_micros\', \'min_accelerator_micros\', \'min_cpu_micros\'], varargs=None, keywords=None, defaults=[\'0\', \'0\', \'0\'], " - } - member_method { - name: "with_min_float_operations" - argspec: "args=[\'self\', \'min_float_ops\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_min_memory" - argspec: "args=[\'self\', \'min_bytes\', \'min_peak_bytes\', \'min_residual_bytes\', \'min_output_bytes\'], varargs=None, keywords=None, defaults=[\'0\', \'0\', \'0\', \'0\'], " - } - member_method { - name: "with_min_occurrence" - argspec: "args=[\'self\', \'min_occurrence\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_min_parameters" - argspec: "args=[\'self\', \'min_params\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_node_names" - argspec: "args=[\'self\', \'start_name_regexes\', \'show_name_regexes\', \'hide_name_regexes\', \'trim_name_regexes\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], " - } - member_method { - name: "with_pprof_output" - argspec: "args=[\'self\', \'pprof_file\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_stdout_output" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_step" - argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "with_timeline_output" - argspec: "args=[\'self\', \'timeline_file\'], varargs=None, keywords=None, defaults=None" - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-profiler.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.-profiler.pbtxt deleted file mode 100644 index acb61dae9f0..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.-profiler.pbtxt +++ /dev/null @@ -1,37 +0,0 @@ -path: "tensorflow.profiler.Profiler" -tf_class { - is_instance: "" - is_instance: "" - member_method { - name: "__init__" - argspec: "args=[\'self\', \'graph\', \'op_log\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], " - } - member_method { - name: "add_step" - argspec: "args=[\'self\', \'step\', \'run_meta\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "advise" - argspec: "args=[\'self\', \'options\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "profile_graph" - argspec: "args=[\'self\', \'options\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "profile_name_scope" - argspec: "args=[\'self\', \'options\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "profile_operations" - argspec: "args=[\'self\', \'options\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "profile_python" - argspec: "args=[\'self\', \'options\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "serialize_to_string" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.profiler.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.profiler.pbtxt deleted file mode 100644 index 7b4d3ac522a..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.profiler.pbtxt +++ /dev/null @@ -1,39 +0,0 @@ -path: "tensorflow.profiler" -tf_module { - member { - name: "AdviceProto" - mtype: "" - } - member { - name: "GraphNodeProto" - mtype: "" - } - member { - name: "MultiGraphNodeProto" - mtype: "" - } - member { - name: "OpLogProto" - mtype: "" - } - member { - name: "ProfileOptionBuilder" - mtype: "" - } - member { - name: "Profiler" - mtype: "" - } - member_method { - name: "advise" - argspec: "args=[\'graph\', \'run_meta\', \'options\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'0\'], " - } - member_method { - name: "profile" - argspec: "args=[\'graph\', \'run_meta\', \'op_log\', \'cmd\', \'options\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'scope\', \'0\'], " - } - member_method { - name: "write_op_log" - argspec: "args=[\'graph\', \'log_dir\', \'op_log\', \'run_meta\', \'add_trace\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], " - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.train.-profiler-hook.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.train.-profiler-hook.pbtxt deleted file mode 100644 index 4df6c4156a8..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.train.-profiler-hook.pbtxt +++ /dev/null @@ -1,30 +0,0 @@ -path: "tensorflow.train.ProfilerHook" -tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - member_method { - name: "__init__" - argspec: "args=[\'self\', \'save_steps\', \'save_secs\', \'output_dir\', \'show_dataflow\', \'show_memory\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\', \'True\', \'False\'], " - } - member_method { - name: "after_create_session" - argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "after_run" - argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "before_run" - argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "begin" - argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "end" - argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None" - } -} diff --git a/tensorflow/tools/api/golden/v2/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.train.pbtxt index a091daa2985..89d9270b276 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.train.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.train.pbtxt @@ -136,10 +136,6 @@ tf_module { name: "Optimizer" mtype: "" } - member { - name: "ProfilerHook" - mtype: "" - } member { name: "ProximalAdagradOptimizer" mtype: "" @@ -224,10 +220,6 @@ tf_module { name: "WorkerSessionCreator" mtype: "" } - member_method { - name: "NewCheckpointReader" - argspec: "args=[\'filepattern\'], varargs=None, keywords=None, defaults=None" - } member_method { name: "cosine_decay" argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'alpha\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'None\'], " @@ -244,10 +236,6 @@ tf_module { name: "get_checkpoint_state" argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], " } - member_method { - name: "init_from_checkpoint" - argspec: "args=[\'ckpt_dir_or_file\', \'assignment_map\'], varargs=None, keywords=None, defaults=None" - } member_method { name: "inverse_time_decay" argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], " @@ -288,10 +276,6 @@ tf_module { name: "polynomial_decay" argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'end_learning_rate\', \'power\', \'cycle\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0001\', \'1.0\', \'False\', \'None\'], " } - member_method { - name: "replica_device_setter" - argspec: "args=[\'ps_tasks\', \'ps_device\', \'worker_device\', \'merge_devices\', \'cluster\', \'ps_ops\', \'ps_strategy\'], varargs=None, keywords=None, defaults=[\'0\', \'/job:ps\', \'/job:worker\', \'True\', \'None\', \'None\', \'None\'], " - } member_method { name: "sdca_fprint" argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "