Mark Exporter and SessionBundle as deprecated. Add recommendation to switch to

SavedModel.
Change: 149158386

4 files changed, 38 insertions, 2 deletions

diff --git a/tensorflow/contrib/session_bundle/BUILD b/tensorflow/contrib/session_bundle/BUILD
index 5e99b378ee..93b6a1a609 100644
--- a/tensorflow/contrib/session_bundle/BUILD
+++ b/tensorflow/contrib/session_bundle/BUILD
@@ -85,15 +85,19 @@ py_test(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 py_library(
     name = "constants",
     srcs = ["constants.py"],
+    deprecation = "Use SavedModel constants instead.",
     srcs_version = "PY2AND3",
 )
 
+# DEPRECATED: Use SavedModel instead.
 py_library(
     name = "exporter",
     srcs = ["exporter.py"],
+    deprecation = "Use SavedModel Builder instead.",
     srcs_version = "PY2AND3",
     deps = [
         ":constants",
@@ -134,9 +138,11 @@ py_test(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 py_library(
     name = "gc",
     srcs = ["gc.py"],
+    deprecation = "Use SavedModel instead.",
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/python:framework",
@@ -175,9 +181,11 @@ filegroup(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 cc_library(
     name = "session_bundle",
     hdrs = ["session_bundle.h"],
+    deprecation = "Use SavedModel Loader instead.",
     visibility = ["//visibility:public"],
     deps = [
         ":session_bundle_lite",
@@ -185,6 +193,7 @@ cc_library(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 # This is a lite version of the session_bundle target that does not link in any
 # Tensorflow ops in order to minimize its size. Clients using this should link
 # any required ops manually.
@@ -193,6 +202,7 @@ cc_library(
     srcs = ["session_bundle.cc"],
     hdrs = ["session_bundle.h"],
     copts = if_ios(["-DGOOGLE_LOGGING"]),
+    deprecation = "Use SavedModel Loader instead.",
     visibility = ["//visibility:public"],
     deps = [
         ":signature_lite",
@@ -227,9 +237,11 @@ cc_test(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 py_library(
     name = "session_bundle_py",
     srcs = ["session_bundle.py"],
+    deprecation = "Use SavedModel Loader instead.",
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
@@ -269,6 +281,7 @@ py_test(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 # This is a lite version of the signature target that does not link in any
 # Tensorflow ops in order to minimize its size. Clients using this should
 # link any required ops manually.
@@ -276,6 +289,7 @@ cc_library(
     name = "signature_lite",
     srcs = ["signature.cc"],
     hdrs = ["signature.h"],
+    deprecation = "Use SavedModel instead.",
     visibility = ["//visibility:public"],
     deps = if_not_mobile([
         ":manifest_proto_cc",
@@ -286,9 +300,11 @@ cc_library(
     ]),
 )
 
+# DEPRECATED: Use SavedModel instead.
 cc_library(
     name = "signature",
     hdrs = ["signature.h"],
+    deprecation = "Use SavedModel instead.",
     visibility = ["//visibility:public"],
     deps = [
         ":signature_lite",
@@ -317,11 +333,13 @@ cc_test(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 cc_library(
     name = "test_util",
     testonly = 1,
     srcs = ["test_util.cc"],
     hdrs = ["test_util.h"],
+    deprecation = "Use SavedModel instead.",
     visibility = ["//visibility:private"],
     deps = [
         "//tensorflow/core",
@@ -378,6 +396,7 @@ cc_test(
     ],
 )
 
+# DEPRECATED: Use SavedModel instead.
 tf_proto_library(
     name = "manifest_proto",
     srcs = ["manifest.proto"],
diff --git a/tensorflow/contrib/session_bundle/exporter.py b/tensorflow/contrib/session_bundle/exporter.py
index 7d68523dec..efeb808ee7 100644
--- a/tensorflow/contrib/session_bundle/exporter.py
+++ b/tensorflow/contrib/session_bundle/exporter.py
@@ -38,8 +38,10 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import saver as tf_saver
 from tensorflow.python.training import training_util
 from tensorflow.python.util import compat
+from tensorflow.python.util.deprecation import deprecated
 
 
+@deprecated("2017-06-30", "Please use SavedModel instead.")
 def gfile_copy_callback(files_to_copy, export_dir_path):
   """Callback to copy files using `gfile.Copy` to an export directory.
 
@@ -69,6 +71,7 @@ def gfile_copy_callback(files_to_copy, export_dir_path):
     gfile.Copy(source_filepath, new_path)
 
 
+@deprecated("2017-06-30", "Please use SavedModel instead.")
 def regression_signature(input_tensor, output_tensor):
   """Creates a regression signature.
 
@@ -85,6 +88,7 @@ def regression_signature(input_tensor, output_tensor):
   return signature
 
 
+@deprecated("2017-06-30", "Please use SavedModel instead.")
 def classification_signature(input_tensor,
                              classes_tensor=None,
                              scores_tensor=None):
@@ -107,6 +111,7 @@ def classification_signature(input_tensor,
   return signature
 
 
+@deprecated("2017-06-30", "Please use SavedModel instead.")
 def generic_signature(name_tensor_map):
   """Creates a generic signature of name to Tensor name.
 
@@ -140,6 +145,7 @@ class Exporter(object):
     self._has_init = False
     self._assets_to_copy = {}
 
+  @deprecated("2017-06-30", "Please use SavedModel instead.")
   def init(self,
            graph_def=None,
            init_op=None,
@@ -221,6 +227,7 @@ class Exporter(object):
 
     self._assets_callback = assets_callback
 
+  @deprecated("2017-06-30", "Please use SavedModel instead.")
   def export(self,
              export_dir_base,
              global_step_tensor,
diff --git a/tensorflow/contrib/session_bundle/gc.py b/tensorflow/contrib/session_bundle/gc.py
index 91155f0fe7..885b888e27 100644
--- a/tensorflow/contrib/session_bundle/gc.py
+++ b/tensorflow/contrib/session_bundle/gc.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-"""System for specifying garbage collection (GC) of path based data.
+r"""System for specifying garbage collection (GC) of path based data.
 
 This framework allows for GC of data specified by path names, for example files
 on disk.  gc.Path objects each represent a single item stored at a path and may
@@ -72,10 +72,12 @@ import os
 
 from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensorflow.python.platform import gfile
+from tensorflow.python.util.deprecation import deprecated
 
 Path = collections.namedtuple('Path', 'path export_version')
 
 
+@deprecated('2017-06-30', 'Please use SavedModel instead.')
 def largest_export_versions(n):
   """Creates a filter that keeps the largest n export versions.
 
@@ -96,8 +98,9 @@ def largest_export_versions(n):
   return keep
 
 
+@deprecated('2017-06-30', 'Please use SavedModel instead.')
 def one_of_every_n_export_versions(n):
-  """Creates a filter that keeps one of every n export versions.
+  r"""Creates a filter that keeps one of every n export versions.
 
   Args:
     n: interval size.
@@ -125,6 +128,7 @@ def one_of_every_n_export_versions(n):
   return keep
 
 
+@deprecated('2017-06-30', 'Please use SavedModel instead.')
 def mod_export_version(n):
   """Creates a filter that keeps every export that is a multiple of n.
 
@@ -143,6 +147,7 @@ def mod_export_version(n):
   return keep
 
 
+@deprecated('2017-06-30', 'Please use SavedModel instead.')
 def union(lf, rf):
   """Creates a filter that keeps the union of two filters.
 
@@ -160,6 +165,7 @@ def union(lf, rf):
   return keep
 
 
+@deprecated('2017-06-30', 'Please use SavedModel instead.')
 def negation(f):
   """Negate a filter.
 
@@ -176,6 +182,7 @@ def negation(f):
   return keep
 
 
+@deprecated('2017-06-30', 'Please use SavedModel instead.')
 def get_paths(base_dir, parser):
   """Gets a list of Paths in a given directory.
 
diff --git a/tensorflow/contrib/session_bundle/session_bundle.py b/tensorflow/contrib/session_bundle/session_bundle.py
index b0c2fb266e..37407f9042 100644
--- a/tensorflow/contrib/session_bundle/session_bundle.py
+++ b/tensorflow/contrib/session_bundle/session_bundle.py
@@ -31,8 +31,10 @@ from tensorflow.python.client import session
 from tensorflow.python.framework import ops
 from tensorflow.python.lib.io import file_io
 from tensorflow.python.training import saver as saver_lib
+from tensorflow.python.util.deprecation import deprecated
 
 
+@deprecated("2017-06-30", "Please use SavedModel instead.")
 def maybe_session_bundle_dir(export_dir):
   """Checks if the model path contains session bundle model.
 
@@ -48,6 +50,7 @@ def maybe_session_bundle_dir(export_dir):
   return file_io.file_exists(meta_graph_filename)
 
 
+@deprecated("2017-06-30", "Please use SavedModel instead.")
 def load_session_bundle_from_path(export_dir,
                                   target="",
                                   config=None,