Remove tensorflow/contrib/session_bundle as dependency for Tensorflow Serving.

PiperOrigin-RevId: 275281512

Author: shadowdragon89

tensorflow_serving/batching/BUILD

@@ -85,7 +85,6 @@ cc_test(
         "//tensorflow_serving/test_util",
         "@org_tensorflow//tensorflow/cc/saved_model:loader",
         "@org_tensorflow//tensorflow/cc/saved_model:tag_constants",
-        "@org_tensorflow//tensorflow/contrib/session_bundle",
         "@org_tensorflow//tensorflow/core:core_cpu",
         "@org_tensorflow//tensorflow/core:framework",
         "@org_tensorflow//tensorflow/core:lib",

tensorflow_serving/batching/batching_session_test.cc

@@ -18,7 +18,6 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include "tensorflow/cc/saved_model/loader.h"
 #include "tensorflow/cc/saved_model/tag_constants.h"
-#include "tensorflow/contrib/session_bundle/session_bundle.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/tensor_testutil.h"

tensorflow_serving/model_servers/BUILD

@@ -1,5 +1,7 @@
 # Description: Model Server
 
+load("//tensorflow_serving:tensorflow_version.bzl", "if_not_v2", "if_v2")
+
 package(
     default_visibility = [
         "//tensorflow_serving:internal",
@@ -116,6 +118,7 @@ cc_test(
         "//tensorflow_serving/model_servers/test_util:storage_path_error_injecting_source_adapter",
         "//tensorflow_serving/model_servers/test_util:storage_path_error_injecting_source_adapter_proto",
         "//tensorflow_serving/test_util",
+        "//tensorflow_serving/util:oss_or_google",
         "@com_google_protobuf//:cc_wkt_protos",
         "@org_tensorflow//tensorflow/core:lib",
         "@org_tensorflow//tensorflow/core:protos_all_cc",
@@ -162,7 +165,6 @@ cc_test(
         "//tensorflow_serving/test_util",
         "@org_tensorflow//tensorflow/cc/saved_model:loader",
         "@org_tensorflow//tensorflow/cc/saved_model:signature_constants",
-        "@org_tensorflow//tensorflow/contrib/session_bundle",
         "@org_tensorflow//tensorflow/core:test",
     ],
 )
@@ -291,8 +293,6 @@ cc_library(
     ],
 )
 
-load("//tensorflow_serving:tensorflow_version.bzl", "if_v2", "if_not_v2")
-
 SUPPORTED_TENSORFLOW_OPS = if_v2([]) + if_not_v2([
     "@org_tensorflow//tensorflow/contrib:contrib_kernels",
     "@org_tensorflow//tensorflow/contrib:contrib_ops_op_lib",
@@ -412,6 +412,7 @@ py_test(
     deps = [
         "//tensorflow_serving/apis:model_service_proto_py_pb2",
         "//tensorflow_serving/apis:prediction_service_proto_py_pb2",
+        "//tensorflow_serving/model_servers/test_util:tensorflow_model_server_test_base",
         "@org_tensorflow//tensorflow:tensorflow_py",
         "@six_archive//:six",
     ],

tensorflow_serving/model_servers/get_model_status_impl_test.cc

@@ -19,7 +19,6 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include "tensorflow/cc/saved_model/loader.h"
 #include "tensorflow/cc/saved_model/signature_constants.h"
-#include "tensorflow/contrib/session_bundle/session_bundle.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
 #include "tensorflow_serving/apis/model.pb.h"
 #include "tensorflow_serving/core/availability_preserving_policy.h"

tensorflow_serving/model_servers/server_core_test.cc

@@ -36,6 +36,7 @@ limitations under the License.
 #include "tensorflow_serving/model_servers/test_util/storage_path_error_injecting_source_adapter.h"
 #include "tensorflow_serving/model_servers/test_util/storage_path_error_injecting_source_adapter.pb.h"
 #include "tensorflow_serving/test_util/test_util.h"
+#include "tensorflow_serving/util/oss_or_google.h"
 
 namespace tensorflow {
 namespace serving {
@@ -879,7 +880,12 @@ TEST_P(ServerCoreTest, VersionLabelsNotAllowed) {
 INSTANTIATE_TEST_CASE_P(
     TestType, ServerCoreTest,
     ::testing::Combine(
-        ::testing::Range(0, static_cast<int>(ServerCoreTest::NUM_TEST_TYPES)),
+        IsTensorflowServingOSS()
+            ? ::testing::Range(
+                  static_cast<int>(test_util::ServerCoreTest::SAVED_MODEL),
+                  static_cast<int>(test_util::ServerCoreTest::SAVED_MODEL))
+            : ::testing::Range(
+                  0, static_cast<int>(ServerCoreTest::NUM_TEST_TYPES)),
         ::testing::Bool()));
 
 INSTANTIATE_TEST_CASE_P(