From 7e511f2db8713cc7a96e1ca458348401ecf3c60c Mon Sep 17 00:00:00 2001 From: Alexandre Passos Date: Mon, 12 Nov 2018 07:55:27 -0800 Subject: [PATCH] Retrying to remove resource_loader, now with oss fix. PiperOrigin-RevId: 221091607 --- .../python_api/api_def_SerializeTensor.pbtxt | 10 ++++++++ tensorflow/python/platform/resource_loader.py | 10 ++++---- .../tools/api/generator/api_init_files.bzl | 1 - .../tools/api/golden/v1/tensorflow.io.pbtxt | 4 ++++ .../tools/api/golden/v2/tensorflow.io.pbtxt | 4 ++++ .../tools/api/golden/v2/tensorflow.pbtxt | 8 ------- .../v2/tensorflow.resource_loader.pbtxt | 23 ------------------- 7 files changed, 23 insertions(+), 37 deletions(-) create mode 100644 tensorflow/core/api_def/python_api/api_def_SerializeTensor.pbtxt delete mode 100644 tensorflow/tools/api/golden/v2/tensorflow.resource_loader.pbtxt diff --git a/tensorflow/core/api_def/python_api/api_def_SerializeTensor.pbtxt b/tensorflow/core/api_def/python_api/api_def_SerializeTensor.pbtxt new file mode 100644 index 00000000000..219b125da3d --- /dev/null +++ b/tensorflow/core/api_def/python_api/api_def_SerializeTensor.pbtxt @@ -0,0 +1,10 @@ +op { + graph_op_name: "SerializeTensor" + endpoint { + name: "io.serialize_tensor" + } + endpoint { + name: "serialize_tensor" + deprecation_version: 2 + } +} diff --git a/tensorflow/python/platform/resource_loader.py b/tensorflow/python/platform/resource_loader.py index b2d95518552..8f4c5c190cc 100644 --- a/tensorflow/python/platform/resource_loader.py +++ b/tensorflow/python/platform/resource_loader.py @@ -24,7 +24,7 @@ from tensorflow.python.util import tf_inspect as _inspect from tensorflow.python.util.tf_export import tf_export -@tf_export('resource_loader.load_resource') +@tf_export(v1=['resource_loader.load_resource']) def load_resource(path): """Load the resource at given path, where path is relative to tensorflow/. @@ -46,7 +46,7 @@ def load_resource(path): # pylint: disable=protected-access -@tf_export('resource_loader.get_data_files_path') +@tf_export(v1=['resource_loader.get_data_files_path']) def get_data_files_path(): """Get a direct path to the data files colocated with the script. @@ -57,7 +57,7 @@ def get_data_files_path(): return _os.path.dirname(_inspect.getfile(_sys._getframe(1))) -@tf_export('resource_loader.get_root_dir_with_all_resources') +@tf_export(v1=['resource_loader.get_root_dir_with_all_resources']) def get_root_dir_with_all_resources(): """Get a root directory containing all the data attributes in the build rule. @@ -97,7 +97,7 @@ def get_root_dir_with_all_resources(): return data_files_dir or script_dir -@tf_export('resource_loader.get_path_to_datafile') +@tf_export(v1=['resource_loader.get_path_to_datafile']) def get_path_to_datafile(path): """Get the path to the specified file in the data dependencies. @@ -117,7 +117,7 @@ def get_path_to_datafile(path): return _os.path.join(data_files_path, path) -@tf_export('resource_loader.readahead_file_path') +@tf_export(v1=['resource_loader.readahead_file_path']) def readahead_file_path(path, readahead='128M'): # pylint: disable=unused-argument """Readahead files not implemented; simply returns given path.""" return path diff --git a/tensorflow/python/tools/api/generator/api_init_files.bzl b/tensorflow/python/tools/api/generator/api_init_files.bzl index f1d1ae290c7..17122a77ebf 100644 --- a/tensorflow/python/tools/api/generator/api_init_files.bzl +++ b/tensorflow/python/tools/api/generator/api_init_files.bzl @@ -71,7 +71,6 @@ TENSORFLOW_API_INIT_FILES = [ "profiler/__init__.py", "quantization/__init__.py", "random/__init__.py", - "resource_loader/__init__.py", "strings/__init__.py", "saved_model/__init__.py", "sets/__init__.py", diff --git a/tensorflow/tools/api/golden/v1/tensorflow.io.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.io.pbtxt index dccf136788d..64b63ed1a4a 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.io.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.io.pbtxt @@ -112,6 +112,10 @@ tf_module { name: "serialize_sparse" argspec: "args=[\'sp_input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"\"], " } + member_method { + name: "serialize_tensor" + argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " + } member_method { name: "tf_record_iterator" argspec: "args=[\'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], " diff --git a/tensorflow/tools/api/golden/v2/tensorflow.io.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.io.pbtxt index dccf136788d..64b63ed1a4a 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.io.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.io.pbtxt @@ -112,6 +112,10 @@ tf_module { name: "serialize_sparse" argspec: "args=[\'sp_input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"\"], " } + member_method { + name: "serialize_tensor" + argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " + } member_method { name: "tf_record_iterator" argspec: "args=[\'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], " diff --git a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt index b0da08988a8..90b77bfd863 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt @@ -376,10 +376,6 @@ tf_module { name: "resource" mtype: "" } - member { - name: "resource_loader" - mtype: "" - } member { name: "saved_model" mtype: "" @@ -1116,10 +1112,6 @@ tf_module { name: "sequence_mask" argspec: "args=[\'lengths\', \'maxlen\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"\", \'None\'], " } - member_method { - name: "serialize_tensor" - argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " - } member_method { name: "set_random_seed" argspec: "args=[\'seed\'], varargs=None, keywords=None, defaults=None" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.resource_loader.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.resource_loader.pbtxt deleted file mode 100644 index 288b78b4cd0..00000000000 --- a/tensorflow/tools/api/golden/v2/tensorflow.resource_loader.pbtxt +++ /dev/null @@ -1,23 +0,0 @@ -path: "tensorflow.resource_loader" -tf_module { - member_method { - name: "get_data_files_path" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "get_path_to_datafile" - argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "get_root_dir_with_all_resources" - argspec: "args=[], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "load_resource" - argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None" - } - member_method { - name: "readahead_file_path" - argspec: "args=[\'path\', \'readahead\'], varargs=None, keywords=None, defaults=[\'128M\'], " - } -}