Merge commit for internal changes

Author: kirilg

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "tensorflow"]
 	path = tensorflow
 	url = https://github.com/tensorflow/tensorflow.git
+[submodule "tf_models"]
+	path = tf_models
+	url = https://github.com/tensorflow/models.git

WORKSPACE

@@ -3,6 +3,11 @@ local_repository(
   path = __workspace_dir__ + "/tensorflow",
 )
 
+local_repository(
+  name = "inception_model",
+  path = __workspace_dir__ + "/tf_models/inception",
+)
+
 load('//tensorflow/tensorflow:workspace.bzl', 'tf_workspace')
 tf_workspace("tensorflow/", "@tf")
 

tensorflow_serving/example/BUILD

@@ -12,6 +12,8 @@ licenses(["notice"])  # Apache 2.0
 
 exports_files(["LICENSE"])
 
+load("//tensorflow_serving:serving.bzl", "serving_proto_library")
+
 filegroup(
     name = "all_files",
     srcs = glob(
@@ -23,19 +25,12 @@ filegroup(
     ),
 )
 
-cc_library(
-    name = "mnist_grpc_cc",
-    srcs = [
-        "mnist_inference.grpc.pb.cc",
-        "mnist_inference.pb.cc",
-    ],
-    hdrs = [
-        "mnist_inference.grpc.pb.h",
-        "mnist_inference.pb.h",
-    ],
-    deps = [
-        "@grpc//:grpc++",
-    ],
+serving_proto_library(
+    name = "mnist_inference_proto",
+    srcs = ["mnist_inference.proto"],
+    has_services = 1,
+    cc_api_version = 2,
+    cc_grpc_version = 1,
 )
 
 py_library(
@@ -68,7 +63,7 @@ cc_binary(
         "@tf//tensorflow/core:lib",
         "@tf//tensorflow/core:protos_all_cc",
         "@tf//tensorflow/core:tensorflow",
-        ":mnist_grpc_cc",
+        ":mnist_inference_proto",
         "//tensorflow_serving/session_bundle",
         "//tensorflow_serving/session_bundle:manifest_proto",
         "//tensorflow_serving/session_bundle:signature",
@@ -87,7 +82,7 @@ cc_binary(
         "@tf//tensorflow/core:lib",
         "@tf//tensorflow/core:protos_all_cc",
         "@tf//tensorflow/core:tensorflow",
-        ":mnist_grpc_cc",
+        ":mnist_inference_proto",
         "//tensorflow_serving/batching:batch_scheduler",
         "//tensorflow_serving/batching:batch_scheduler_retrier",
         "//tensorflow_serving/batching:streaming_batch_scheduler",
@@ -113,3 +108,63 @@ py_binary(
         ":mnist_input_data",
     ],
 )
+
+serving_proto_library(
+    name = "inception_inference_proto",
+    srcs = ["inception_inference.proto"],
+    has_services = 1,
+    cc_api_version = 2,
+    cc_grpc_version = 1,
+)
+
+py_binary(
+    name = "inception_export",
+    srcs = [
+        "inception_export.py",
+    ],
+    deps = [
+        "@inception_model//inception",
+        "@tf//tensorflow:tensorflow_py",
+        "//tensorflow_serving/session_bundle:exporter",
+    ],
+)
+
+cc_binary(
+    name = "inception_inference",
+    srcs = [
+        "inception_inference.cc",
+    ],
+    linkopts = ["-lm"],
+    deps = [
+        "@grpc//:grpc",
+        "@tf//tensorflow/core:framework",
+        "@tf//tensorflow/core:lib",
+        "@tf//tensorflow/core:protos_all_cc",
+        "@tf//tensorflow/core:tensorflow",
+        ":inception_inference_proto",
+        "//tensorflow_serving/batching:batch_scheduler",
+        "//tensorflow_serving/batching:batch_scheduler_retrier",
+        "//tensorflow_serving/batching:streaming_batch_scheduler",
+        "//tensorflow_serving/core:manager",
+        "//tensorflow_serving/core:servable_handle",
+        "//tensorflow_serving/core:servable_id",
+        "//tensorflow_serving/servables/tensorflow:simple_servers",
+        "//tensorflow_serving/session_bundle",
+        "//tensorflow_serving/session_bundle:manifest_proto",
+        "//tensorflow_serving/session_bundle:signature",
+        "//tensorflow_serving/util:unique_ptr_with_deps",
+    ],
+)
+
+py_binary(
+    name = "inception_client",
+    srcs = [
+        "inception_client.py",
+        "inception_inference_pb2.py",
+    ],
+    data = [
+        "imagenet_lsvrc_2015_synsets.txt",
+        "imagenet_metadata.txt",
+    ],
+    deps = ["@tf//tensorflow:tensorflow_py"],
+)