Mark SessionBundle targets as no longer supported.

PiperOrigin-RevId: 161616162

5 files changed, 50 insertions, 35 deletions

diff --git a/tensorflow/contrib/session_bundle/BUILD b/tensorflow/contrib/session_bundle/BUILD
index bd1e100a54..6cd9aee049 100644
--- a/tensorflow/contrib/session_bundle/BUILD
+++ b/tensorflow/contrib/session_bundle/BUILD
@@ -96,19 +96,19 @@ py_test(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 py_library(
     name = "constants",
     srcs = ["constants.py"],
-    deprecation = "Use SavedModel constants instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     srcs_version = "PY2AND3",
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 py_library(
     name = "exporter",
     srcs = ["exporter.py"],
-    deprecation = "Use SavedModel Builder instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     srcs_version = "PY2AND3",
     deps = [
         ":constants",
@@ -148,11 +148,11 @@ py_test(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 py_library(
     name = "gc",
     srcs = ["gc.py"],
-    deprecation = "Use SavedModel instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/python:framework",
@@ -191,11 +191,11 @@ filegroup(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 cc_library(
     name = "session_bundle",
     hdrs = ["session_bundle.h"],
-    deprecation = "Use SavedModel Loader instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     visibility = ["//visibility:public"],
     deps = [
         ":manifest_proto_cc",
@@ -207,7 +207,7 @@ cc_library(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 # 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.
@@ -216,7 +216,7 @@ cc_library(
     srcs = ["session_bundle.cc"],
     hdrs = ["session_bundle.h"],
     copts = if_ios(["-DGOOGLE_LOGGING"]),
-    deprecation = "Use SavedModel Loader instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     visibility = ["//visibility:public"],
     deps = [
         ":signature_lite",
@@ -254,11 +254,11 @@ cc_test(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 py_library(
     name = "session_bundle_py",
     srcs = ["session_bundle.py"],
-    deprecation = "Use SavedModel Loader instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
@@ -299,7 +299,7 @@ py_test(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 # 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.
@@ -307,7 +307,7 @@ cc_library(
     name = "signature_lite",
     srcs = ["signature.cc"],
     hdrs = ["signature.h"],
-    deprecation = "Use SavedModel instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     visibility = ["//visibility:public"],
     deps = if_not_mobile([
         ":manifest_proto_cc",
@@ -318,11 +318,11 @@ cc_library(
     ]),
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 cc_library(
     name = "signature",
     hdrs = ["signature.h"],
-    deprecation = "Use SavedModel instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     visibility = ["//visibility:public"],
     deps = [
         ":manifest_proto_cc",
@@ -355,13 +355,13 @@ cc_test(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 cc_library(
     name = "test_util",
     testonly = 1,
     srcs = ["test_util.cc"],
     hdrs = ["test_util.h"],
-    deprecation = "Use SavedModel instead.",
+    deprecation = "No longer supported. Switch to SavedModel immediately.",
     visibility = ["//visibility:private"],
     deps = [
         "//tensorflow/core:lib",
@@ -417,7 +417,7 @@ cc_test(
     ],
 )
 
-# DEPRECATED: Use SavedModel instead.
+# DEPRECATED: No longer supported. Switch to SavedModel immediately.
 tf_proto_library(
     name = "manifest_proto",
     srcs = ["manifest.proto"],
diff --git a/tensorflow/contrib/session_bundle/README.md b/tensorflow/contrib/session_bundle/README.md
index 5bcc8fab70..e3a87a0eb9 100644
--- a/tensorflow/contrib/session_bundle/README.md
+++ b/tensorflow/contrib/session_bundle/README.md
@@ -1,7 +1,8 @@
 # TensorFlow Inference Model Format
 
-WARNING: SessionBundle has been deprecated. Please use
-[SavedModel](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/saved_model/README.md) instead.
+WARNING: SessionBundle has been deprecated and is no longer supported. Switch to
+[SavedModel](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/saved_model/README.md)
+immediately.
 
 [TOC]
 
diff --git a/tensorflow/contrib/session_bundle/exporter.py b/tensorflow/contrib/session_bundle/exporter.py
index efeb808ee7..dcc7fbaa2d 100644
--- a/tensorflow/contrib/session_bundle/exporter.py
+++ b/tensorflow/contrib/session_bundle/exporter.py
@@ -41,7 +41,8 @@ from tensorflow.python.util import compat
 from tensorflow.python.util.deprecation import deprecated
 
 
-@deprecated("2017-06-30", "Please use SavedModel instead.")
+@deprecated("2017-06-30",
+            "No longer supported. Switch to SavedModel immediately.")
 def gfile_copy_callback(files_to_copy, export_dir_path):
   """Callback to copy files using `gfile.Copy` to an export directory.
 
@@ -71,7 +72,8 @@ def gfile_copy_callback(files_to_copy, export_dir_path):
     gfile.Copy(source_filepath, new_path)
 
 
-@deprecated("2017-06-30", "Please use SavedModel instead.")
+@deprecated("2017-06-30",
+            "No longer supported. Switch to SavedModel immediately.")
 def regression_signature(input_tensor, output_tensor):
   """Creates a regression signature.
 
@@ -88,7 +90,8 @@ def regression_signature(input_tensor, output_tensor):
   return signature
 
 
-@deprecated("2017-06-30", "Please use SavedModel instead.")
+@deprecated("2017-06-30",
+            "No longer supported. Switch to SavedModel immediately.")
 def classification_signature(input_tensor,
                              classes_tensor=None,
                              scores_tensor=None):
@@ -111,7 +114,8 @@ def classification_signature(input_tensor,
   return signature
 
 
-@deprecated("2017-06-30", "Please use SavedModel instead.")
+@deprecated("2017-06-30",
+            "No longer supported. Switch to SavedModel immediately.")
 def generic_signature(name_tensor_map):
   """Creates a generic signature of name to Tensor name.
 
@@ -145,7 +149,8 @@ class Exporter(object):
     self._has_init = False
     self._assets_to_copy = {}
 
-  @deprecated("2017-06-30", "Please use SavedModel instead.")
+  @deprecated("2017-06-30",
+              "No longer supported. Switch to SavedModel immediately.")
   def init(self,
            graph_def=None,
            init_op=None,
@@ -227,7 +232,8 @@ class Exporter(object):
 
     self._assets_callback = assets_callback
 
-  @deprecated("2017-06-30", "Please use SavedModel instead.")
+  @deprecated("2017-06-30",
+              "No longer supported. Switch to SavedModel immediately.")
   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 885b888e27..fb9e0743a1 100644
--- a/tensorflow/contrib/session_bundle/gc.py
+++ b/tensorflow/contrib/session_bundle/gc.py
@@ -77,7 +77,8 @@ from tensorflow.python.util.deprecation import deprecated
 Path = collections.namedtuple('Path', 'path export_version')
 
 
-@deprecated('2017-06-30', 'Please use SavedModel instead.')
+@deprecated('2017-06-30',
+            'No longer supported. Switch to SavedModel immediately.')
 def largest_export_versions(n):
   """Creates a filter that keeps the largest n export versions.
 
@@ -98,7 +99,8 @@ def largest_export_versions(n):
   return keep
 
 
-@deprecated('2017-06-30', 'Please use SavedModel instead.')
+@deprecated('2017-06-30',
+            'No longer supported. Switch to SavedModel immediately.')
 def one_of_every_n_export_versions(n):
   r"""Creates a filter that keeps one of every n export versions.
 
@@ -128,7 +130,8 @@ def one_of_every_n_export_versions(n):
   return keep
 
 
-@deprecated('2017-06-30', 'Please use SavedModel instead.')
+@deprecated('2017-06-30',
+            'No longer supported. Switch to SavedModel immediately.')
 def mod_export_version(n):
   """Creates a filter that keeps every export that is a multiple of n.
 
@@ -147,7 +150,8 @@ def mod_export_version(n):
   return keep
 
 
-@deprecated('2017-06-30', 'Please use SavedModel instead.')
+@deprecated('2017-06-30',
+            'No longer supported. Switch to SavedModel immediately.')
 def union(lf, rf):
   """Creates a filter that keeps the union of two filters.
 
@@ -165,7 +169,8 @@ def union(lf, rf):
   return keep
 
 
-@deprecated('2017-06-30', 'Please use SavedModel instead.')
+@deprecated('2017-06-30',
+            'No longer supported. Switch to SavedModel immediately.')
 def negation(f):
   """Negate a filter.
 
@@ -182,7 +187,8 @@ def negation(f):
   return keep
 
 
-@deprecated('2017-06-30', 'Please use SavedModel instead.')
+@deprecated('2017-06-30',
+            'No longer supported. Switch to SavedModel immediately.')
 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 37407f9042..66f2e32f58 100644
--- a/tensorflow/contrib/session_bundle/session_bundle.py
+++ b/tensorflow/contrib/session_bundle/session_bundle.py
@@ -34,7 +34,8 @@ from tensorflow.python.training import saver as saver_lib
 from tensorflow.python.util.deprecation import deprecated
 
 
-@deprecated("2017-06-30", "Please use SavedModel instead.")
+@deprecated("2017-06-30",
+            "No longer supported. Switch to SavedModel immediately.")
 def maybe_session_bundle_dir(export_dir):
   """Checks if the model path contains session bundle model.
 
@@ -50,7 +51,8 @@ def maybe_session_bundle_dir(export_dir):
   return file_io.file_exists(meta_graph_filename)
 
 
-@deprecated("2017-06-30", "Please use SavedModel instead.")
+@deprecated("2017-06-30",
+            "No longer supported. Switch to SavedModel immediately.")
 def load_session_bundle_from_path(export_dir,
                                   target="",
                                   config=None,